From ce4e4de6ed6e37ace2e9112732eed418074e74e8 Mon Sep 17 00:00:00 2001 From: Jackson Abney Date: Sat, 15 Jun 2024 13:41:55 -0800 Subject: [PATCH] Renamed to oc2r (OpenComputers II: Reimagined) this includes changing the mod id from oc2 to oc2r. --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- README.md | 37 +++-- build.gradle | 28 ++-- gradle.properties | 2 +- settings.gradle | 2 +- .../bus/device/vm/context/package-info.java | 9 -- .../api/bus/device/vm/event/package-info.java | 9 -- .../oc2/client/gui/terminal/package-info.java | 9 -- .../cil/oc2/client/gui/util/package-info.java | 9 -- .../oc2/client/gui/widget/package-info.java | 9 -- .../li/cil/oc2/client/item/package-info.java | 9 -- .../cil/oc2/client/manual/package-info.java | 9 -- .../li/cil/oc2/client/model/package-info.java | 9 -- .../renderer/blockentity/package-info.java | 9 -- .../client/renderer/color/package-info.java | 9 -- .../renderer/entity/model/package-info.java | 9 -- .../client/renderer/entity/package-info.java | 9 -- .../client/renderer/font/package-info.java | 9 -- .../cil/oc2/client/renderer/package-info.java | 9 -- .../li/cil/oc2/common/block/package-info.java | 9 -- .../oc2/common/blockentity/package-info.java | 9 -- .../bus/device/BlockDeviceBusElement.java | 8 - .../common/bus/device/data/package-info.java | 9 -- .../oc2/common/bus/device/package-info.java | 9 -- .../device/provider/block/package-info.java | 9 -- .../device/provider/item/package-info.java | 9 -- .../bus/device/provider/package-info.java | 9 -- .../device/provider/util/package-info.java | 9 -- .../bus/device/rpc/block/package-info.java | 9 -- .../bus/device/rpc/item/package-info.java | 9 -- .../common/bus/device/rpc/package-info.java | 9 -- .../common/bus/device/util/package-info.java | 9 -- .../bus/device/vm/block/package-info.java | 9 -- .../bus/device/vm/item/package-info.java | 9 -- .../common/bus/device/vm/package-info.java | 9 -- .../li/cil/oc2/common/bus/package-info.java | 9 -- .../oc2/common/capabilities/package-info.java | 9 -- .../oc2/common/container/package-info.java | 9 -- .../cil/oc2/common/energy/package-info.java | 9 -- .../cil/oc2/common/entity/package-info.java | 9 -- .../oc2/common/entity/robot/package-info.java | 9 -- .../li/cil/oc2/common/ext/package-info.java | 9 -- .../common/integration/jei/package-info.java | 9 -- .../oc2/common/integration/package-info.java | 9 -- .../common/item/crafting/package-info.java | 9 -- .../li/cil/oc2/common/item/package-info.java | 9 -- .../li/cil/oc2/common/mixin/package-info.java | 9 -- .../common/network/message/package-info.java | 9 -- .../cil/oc2/common/network/package-info.java | 9 -- .../java/li/cil/oc2/common/package-info.java | 9 -- .../serialization/ceres/package-info.java | 9 -- .../serialization/gson/package-info.java | 9 -- .../common/serialization/package-info.java | 9 -- .../li/cil/oc2/common/tags/package-info.java | 9 -- .../li/cil/oc2/common/util/package-info.java | 9 -- .../vm/context/global/package-info.java | 9 -- .../vm/context/managed/package-info.java | 9 -- .../oc2/common/vm/context/package-info.java | 9 -- .../li/cil/oc2/common/vm/fs/package-info.java | 9 -- .../li/cil/oc2/common/vm/package-info.java | 9 -- .../java/li/cil/{oc2 => oc2r}/api/API.java | 10 +- .../java/li/cil/{oc2 => oc2r}/api/README.md | 44 +++--- .../api/bus/BlockDeviceBusElement.java | 2 +- .../cil/{oc2 => oc2r}/api/bus/DeviceBus.java | 4 +- .../api/bus/DeviceBusController.java | 4 +- .../api/bus/DeviceBusElement.java | 6 +- .../{oc2 => oc2r}/api/bus/device/Device.java | 6 +- .../api/bus/device/DeviceType.java | 4 +- .../api/bus/device/DeviceTypes.java | 20 +-- .../api/bus/device/ItemDevice.java | 4 +- .../api/bus/device/data/BlockDeviceData.java | 8 +- .../api/bus/device/data/Firmware.java | 6 +- .../api/bus/device/data/package-info.java | 9 ++ .../api/bus/device/object/Callback.java | 6 +- .../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 +- .../api/bus/device/object/Parameter.java | 2 +- .../api/bus/device/object/package-info.java | 9 ++ .../cil/oc2r/api/bus/device/package-info.java | 9 ++ .../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 | 9 ++ .../api/bus/device/rpc/AbstractRPCMethod.java | 2 +- .../api/bus/device/rpc/RPCDevice.java | 12 +- .../api/bus/device/rpc/RPCInvocation.java | 2 +- .../api/bus/device/rpc/RPCMethod.java | 6 +- .../api/bus/device/rpc/RPCMethodGroup.java | 4 +- .../api/bus/device/rpc/RPCParameter.java | 2 +- .../api/bus/device/rpc}/package-info.java | 2 +- .../api/bus/device/vm/FirmwareLoader.java | 2 +- .../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 | 9 ++ .../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 | 9 ++ .../api/bus/device/vm}/package-info.java | 2 +- .../{oc2 => oc2r}/api/bus/package-info.java | 16 +- .../api/capabilities/NetworkInterface.java | 4 +- .../api/capabilities/RedstoneEmitter.java | 2 +- .../{oc2 => oc2r}/api/capabilities/Robot.java | 2 +- .../capabilities/TerminalUserProvider.java | 6 +- .../api/capabilities}/package-info.java | 2 +- .../imc/RPCMethodParameterTypeAdapter.java | 4 +- .../util => oc2r/api/imc}/package-info.java | 2 +- .../cil/{oc2 => oc2r}/api/package-info.java | 2 +- .../{oc2 => oc2r}/api/util/Invalidatable.java | 6 +- .../{oc2 => oc2r}/api/util/Registries.java | 12 +- .../api/util/RobotOperationSide.java | 2 +- .../li/cil/{oc2 => oc2r}/api/util/Side.java | 4 +- .../li/cil/oc2r/api/util/package-info.java | 9 ++ .../cil/{oc2 => oc2r}/client/ClientSetup.java | 32 ++-- .../client/audio/LoopingBlockEntitySound.java | 4 +- .../client/audio/LoopingSoundManager.java | 2 +- .../cil/oc2r/client/audio/package-info.java | 9 ++ .../gui/AbstractMachineInventoryScreen.java | 18 +-- .../gui/AbstractMachineTerminalScreen.java | 14 +- .../gui/AbstractModContainerScreen.java | 2 +- .../gui/AbstractMonitorDisplayScreen.java | 14 +- .../client/gui/BusInterfaceScreen.java | 16 +- .../client/gui/ComputerContainerScreen.java | 4 +- .../client/gui/ComputerTerminalScreen.java | 4 +- .../client/gui/FileChooserScreen.java | 5 +- .../client/gui/KeyCodeMapping.java | 2 +- .../client/gui/KeyboardScreen.java | 12 +- .../client/gui/MachineTerminalWidget.java | 8 +- .../client/gui/MonitorDisplayScreen.java | 4 +- .../client/gui/MonitorDisplayWidget.java | 14 +- .../gui/NetworkInterfaceCardScreen.java | 18 +-- .../client/gui/NetworkTunnelScreen.java | 12 +- .../client/gui/RobotContainerScreen.java | 4 +- .../client/gui/RobotTerminalScreen.java | 4 +- .../cil/{oc2 => oc2r}/client/gui/Sprites.java | 6 +- .../{oc2 => oc2r}/client/gui/Textures.java | 4 +- .../li/cil/oc2r/client/gui/package-info.java | 9 ++ .../client/gui/terminal/TerminalInput.java | 2 +- .../client/gui/terminal/package-info.java | 9 ++ .../client/gui/util/GuiUtils.java | 14 +- .../client/gui/util}/package-info.java | 2 +- .../client/gui/widget/ImageButton.java | 4 +- .../client/gui/widget/Sprite.java | 2 +- .../client/gui/widget/Texture.java | 4 +- .../client/gui/widget/ToggleImageButton.java | 2 +- .../oc2r/client/gui/widget/package-info.java | 9 ++ .../client/item/CustomItemColors.java | 4 +- .../item/CustomItemModelProperties.java | 6 +- .../client/item}/package-info.java | 2 +- .../{oc2 => oc2r}/client/manual/Manuals.java | 8 +- .../client/manual/ModManualScreenStyle.java | 4 +- .../client/manual/ModManualStyle.java | 4 +- .../client/manual}/package-info.java | 2 +- .../client/model/BusCableBakedModel.java | 10 +- .../client/model/BusCableModel.java | 4 +- .../client/model/BusCableModelLoader.java | 2 +- .../cil/oc2r/client/model/package-info.java | 9 ++ .../{oc2 => oc2r}/client/package-info.java | 2 +- .../renderer/BusInterfaceNameRenderer.java | 8 +- .../client/renderer/ModRenderType.java | 4 +- .../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 | 9 ++ .../renderer/color/BusCableBlockColor.java | 6 +- .../client/renderer/color/package-info.java | 9 ++ .../client/renderer/entity/RobotRenderer.java | 6 +- .../entity/RobotWithoutLevelRenderer.java | 4 +- .../renderer/entity/model/RobotModel.java | 6 +- .../renderer/entity/model/package-info.java | 9 ++ .../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 | 9 ++ .../cil/{oc2 => oc2r}/common/CommonSetup.java | 12 +- .../li/cil/{oc2 => oc2r}/common/Config.java | 4 +- .../{oc2 => oc2r}/common/ConfigManager.java | 4 +- .../cil/{oc2 => oc2r}/common/Constants.java | 6 +- .../li/cil/{oc2 => oc2r}/common/Main.java | 42 ++--- .../{oc2 => oc2r}/common/block/Blocks.java | 4 +- .../common/block/BusCableBlock.java | 20 +-- .../common/block/ChargerBlock.java | 6 +- .../common/block/ComputerBlock.java | 34 ++-- .../common/block/CreativeEnergyBlock.java | 6 +- .../common/block/DiskDriveBlock.java | 6 +- .../common/block/EnergyConsumingBlock.java | 2 +- .../common/block/FlashMemoryFlasherBlock.java | 6 +- .../block/ImmutableHorizontalBlock.java | 2 +- .../common/block/KeyboardBlock.java | 10 +- .../common/block/MonitorBlock.java | 20 +-- .../common/block/NetworkConnectorBlock.java | 8 +- .../common/block/NetworkHubBlock.java | 6 +- .../common/block/NetworkSwitchBlock.java | 6 +- .../common/block/PciCardCageBlock.java | 10 +- .../common/block/ProjectorBlock.java | 10 +- .../common/block/RedstoneInterfaceBlock.java | 6 +- .../common/block/VxlanBlock.java | 8 +- .../cil/oc2r/common/block/package-info.java | 9 ++ .../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 | 16 +- .../blockentity/TickableBlockEntity.java | 4 +- .../common/blockentity/VxlanBlockEntity.java | 16 +- .../oc2r/common/blockentity/package-info.java | 9 ++ .../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 +- .../common/bus/RPCDeviceBusAdapter.java | 18 +-- .../bus/device/BlockDeviceBusElement.java | 8 + .../common/bus/device/DeviceGroup.java | 6 +- .../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 | 9 ++ .../oc2r/common/bus/device/package-info.java | 9 ++ .../bus/device/provider/ProviderRegistry.java | 16 +- .../common/bus/device/provider/Providers.java | 6 +- .../BlockEntityCapabilityDeviceProvider.java | 12 +- .../device/provider/block/package-info.java | 9 ++ ...ractItemStackCapabilityDeviceProvider.java | 8 +- .../BlockOperationsModuleDeviceProvider.java | 16 +- .../provider/item/CPUItemDeviceProvider.java | 12 +- .../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 | 9 ++ .../bus/device/provider/package-info.java | 9 ++ .../util/AbstractBlockDeviceProvider.java | 4 +- ...ctBlockEntityCapabilityDeviceProvider.java | 10 +- .../AbstractBlockEntityDeviceProvider.java | 8 +- .../util/AbstractItemDeviceProvider.java | 8 +- .../device/provider/util/package-info.java | 9 ++ .../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 | 9 ++ .../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 | 9 ++ .../common/bus/device/rpc/package-info.java | 9 ++ .../bus/device/util/AbstractDeviceInfo.java | 4 +- .../bus/device/util/BlockDeviceInfo.java | 6 +- .../bus/device/util/DeviceTypeImpl.java | 4 +- .../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 | 9 ++ .../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 | 9 ++ .../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 | 9 ++ .../common/bus/device/vm/package-info.java | 9 ++ .../li/cil/oc2r/common/bus/package-info.java | 9 ++ .../common/capabilities/Capabilities.java | 14 +- .../capabilities/CapabilityRegistry.java | 16 +- .../common/capabilities/package-info.java | 9 ++ .../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 +- .../common/container/Containers.java | 4 +- .../common/container/DeviceTypeSlot.java | 4 +- .../container/DeviceTypeSlotItemHandler.java | 4 +- .../container/FixedSizeItemStackHandler.java | 4 +- .../container/IntPrecisionContainerData.java | 2 +- .../common/container/LockedSlot.java | 2 +- .../container/MonitorDisplayContainer.java | 4 +- .../container/NetworkTunnelContainer.java | 8 +- .../container/RobotInventoryContainer.java | 12 +- .../common/container/RobotSlot.java | 2 +- .../container/RobotTerminalContainer.java | 10 +- .../container/TypedItemStackHandler.java | 2 +- .../oc2r/common/container/package-info.java | 9 ++ .../common/energy/EnergyStorageItemStack.java | 6 +- .../common/energy/FixedEnergyStorage.java | 2 +- .../cil/oc2r/common/energy/package-info.java | 9 ++ .../{oc2 => oc2r}/common/entity/Entities.java | 4 +- .../{oc2 => oc2r}/common/entity/Robot.java | 62 ++++---- .../cil/oc2r/common/entity/package-info.java | 9 ++ .../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 | 9 ++ .../common/ext/MinecraftExt.java | 2 +- .../li/cil/oc2r/common/ext/package-info.java | 9 ++ .../{oc2 => oc2r}/common/integration/IMC.java | 8 +- .../common/integration/Wrenches.java | 4 +- .../jei/ExtraGuiAreasJEIPlugin.java | 10 +- .../integration/jei/ExtraItemsJEIPlugin.java | 16 +- .../common/integration/jei/package-info.java | 9 ++ .../oc2r/common/integration/package-info.java | 9 ++ .../common/item/AbstractBlockDeviceItem.java | 8 +- .../common/item/AbstractStorageItem.java | 8 +- .../common/item/BlockOperationsModule.java | 2 +- .../common/item/BusCableItem.java | 10 +- .../common/item/BusInterfaceItem.java | 14 +- .../{oc2 => oc2r}/common/item/CPUItem.java | 2 +- .../common/item/ChargerItem.java | 2 +- .../common/item/FlashMemoryItem.java | 8 +- .../item/FlashMemoryWithExternalDataItem.java | 8 +- .../{oc2 => oc2r}/common/item/FloppyItem.java | 2 +- .../common/item/HardDriveItem.java | 6 +- .../item/HardDriveWithExternalDataItem.java | 6 +- .../{oc2 => oc2r}/common/item/ItemGroup.java | 6 +- .../common/item/ItemRenameHandler.java | 4 +- .../cil/{oc2 => oc2r}/common/item/Items.java | 12 +- .../{oc2 => oc2r}/common/item/ManualItem.java | 10 +- .../{oc2 => oc2r}/common/item/MemoryItem.java | 4 +- .../common/item/ModBlockItem.java | 4 +- .../{oc2 => oc2r}/common/item/ModItem.java | 4 +- .../common/item/NetworkCableItem.java | 10 +- .../common/item/NetworkInterfaceCardItem.java | 14 +- .../common/item/NetworkTunnelItem.java | 10 +- .../{oc2 => oc2r}/common/item/RobotItem.java | 30 ++-- .../{oc2 => oc2r}/common/item/WrenchItem.java | 4 +- .../item/crafting/RecipeSerializers.java | 4 +- .../common/item/crafting/WrenchRecipe.java | 4 +- .../common/item/crafting/package-info.java | 9 ++ .../li/cil/oc2r/common/item/package-info.java | 9 ++ .../common/mixin/FrustumMixin.java | 4 +- .../common/mixin/LevelRendererMixin.java | 4 +- .../common/mixin/MinecraftMixin.java | 6 +- .../common/mixin/ServerChunkCacheMixin.java | 4 +- .../cil/oc2r/common/mixin/package-info.java | 9 ++ .../common/network/MessageUtils.java | 4 +- .../common/network/MonitorLoadBalancer.java | 10 +- .../{oc2 => 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 | 7 +- .../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 | 9 ++ .../cil/oc2r/common/network/package-info.java | 9 ++ .../api/imc => 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 | 9 ++ .../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 | 9 ++ .../common/serialization/package-info.java | 9 ++ .../{oc2 => oc2r}/common/tags/BlockTags.java | 4 +- .../{oc2 => oc2r}/common/tags/ItemTags.java | 4 +- .../li/cil/oc2r/common/tags/package-info.java | 9 ++ .../common/util/BlockEntityUtils.java | 2 +- .../common/util/BlockLocation.java | 2 +- .../common/util/ChainableVertexConsumer.java | 2 +- .../common/util/ChunkLocation.java | 2 +- .../{oc2 => oc2r}/common/util/ChunkUtils.java | 6 +- .../{oc2 => oc2r}/common/util/ColorUtils.java | 2 +- .../cil/{oc2 => oc2r}/common/util/Event.java | 2 +- .../common/util/FakePlayerUtils.java | 6 +- .../common/util/HorizontalBlockUtils.java | 4 +- .../common/util/ItemDeviceUtils.java | 2 +- .../common/util/ItemStackUtils.java | 4 +- .../common/util/LazyOptionalUtils.java | 2 +- .../{oc2 => oc2r}/common/util/LevelUtils.java | 2 +- .../common/util/LocationSupplierUtils.java | 6 +- .../{oc2 => oc2r}/common/util/NBTTagIds.java | 2 +- .../{oc2 => oc2r}/common/util/NBTUtils.java | 2 +- .../common/util/ParameterizedEvent.java | 2 +- .../common/util/RegistryUtils.java | 12 +- .../common/util/RunnableUtils.java | 2 +- .../common/util/ServerScheduler.java | 2 +- .../common/util/SoundEvents.java | 4 +- .../common/util/TerminalUtils.java | 4 +- .../common/util/TextFormatUtils.java | 2 +- .../common/util/ThrottledSoundEmitter.java | 2 +- .../{oc2 => oc2r}/common/util/TickUtils.java | 4 +- .../common/util/TooltipUtils.java | 20 +-- .../common/util/TranslationUtils.java | 4 +- .../{oc2 => oc2r}/common/util/Vec3Utils.java | 2 +- .../common/util/VoxelShapeUtils.java | 2 +- .../li/cil/oc2r/common/util/package-info.java | 9 ++ .../common/vm/AbstractTerminalVMRunner.java | 2 +- .../vm/AbstractVMItemStackHandlers.java | 20 +-- .../common/vm/AbstractVirtualMachine.java | 26 +-- .../{oc2 => oc2r}/common/vm/Allocator.java | 6 +- .../common/vm/BaseAddressProvider.java | 4 +- .../common/vm/BuiltinDevices.java | 6 +- .../common/vm/MinecraftRealTimeCounter.java | 2 +- .../cil/{oc2 => oc2r}/common/vm/Terminal.java | 4 +- .../common/vm/VMDeviceBusAdapter.java | 12 +- .../common/vm/VMItemStackHandlers.java | 4 +- .../{oc2 => oc2r}/common/vm/VMRunState.java | 2 +- .../cil/{oc2 => oc2r}/common/vm/VMRunner.java | 16 +- .../common/vm/VirtualMachine.java | 4 +- .../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 | 9 ++ .../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 | 9 ++ .../oc2r/common/vm/context/package-info.java | 9 ++ .../common/vm/device/PciRootPortDevice.java | 2 +- .../vm/device/SimpleFramebufferDevice.java | 6 +- .../common/vm/fs/LayeredFileSystem.java | 2 +- .../cil/oc2r/common/vm/fs/package-info.java | 9 ++ .../gui => oc2r/common/vm}/package-info.java | 2 +- .../vm/provider/DeviceTreeProviders.java | 6 +- .../provider/PciRootPortDeviceProvider.java | 4 +- .../SimpleFramebufferDeviceProvider.java | 4 +- .../common/vxlan/TunnelManager.java | 6 +- .../{oc2 => oc2r}/data/DataGenerators.java | 4 +- .../data/ModBlockStateProvider.java | 10 +- .../data/ModBlockTagsProvider.java | 8 +- .../data/ModItemModelProvider.java | 8 +- .../data/ModItemTagsProvider.java | 8 +- .../data/ModLootTableProvider.java | 6 +- .../data/ModRecipesProvider.java | 4 +- .../data/WrenchRecipeBuilder.java | 6 +- .../cil/{oc2 => oc2r}/data/package-info.java | 2 +- .../jcodec/codecs/common/biari/MConst.java | 2 +- .../jcodec/codecs/common/biari/MDecoder.java | 2 +- .../jcodec/codecs/h264/H264Const.java | 12 +- .../jcodec/codecs/h264/H264Decoder.java | 26 +-- .../jcodec/codecs/h264/H264Encoder.java | 26 +-- .../jcodec/codecs/h264/H264Utils.java | 2 +- .../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 +- .../jcodec/codecs/h264/io/CABAC.java | 18 +-- .../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 +- .../jcodec/common/ArrayUtil.java | 2 +- .../jcodec/common/IntArrayList.java | 2 +- .../jcodec/common/IntObjectMap.java | 2 +- .../jcodec/common/VideoDecoder.java | 4 +- .../jcodec/common/VideoEncoder.java | 6 +- .../jcodec/common/io/BitReader.java | 2 +- .../jcodec/common/io/BitWriter.java | 2 +- .../{oc2 => oc2r}/jcodec/common/io/VLC.java | 4 +- .../jcodec/common/io/VLCBuilder.java | 4 +- .../jcodec/common/model/ColorSpace.java | 2 +- .../jcodec/common/model/Picture.java | 2 +- .../jcodec/common/model/Size.java | 2 +- .../jcodec/common/tools/MathUtil.java | 2 +- .../jcodec/scale/RgbToYuv420j.java | 6 +- .../{oc2 => oc2r}/jcodec/scale/Transform.java | 4 +- .../jcodec/scale/Yuv420jToRgb.java | 6 +- src/main/resources/META-INF/mods.toml | 20 +-- .../assets/oc2/blockstates/computer.json | 19 --- .../oc2/blockstates/creative_energy.json | 7 - .../oc2/blockstates/flash_memory_flasher.json | 19 --- .../oc2/blockstates/redstone_interface.json | 19 --- src/main/resources/assets/oc2/lang/en_us.json | 148 ------------------ src/main/resources/assets/oc2/lang/ru_ru.json | 132 ---------------- src/main/resources/assets/oc2/lang/zh_cn.json | 132 ---------------- .../assets/oc2/models/block/cable_base.json | 1 - .../assets/oc2/models/block/cable_link.json | 1 - .../assets/oc2/models/block/cable_plug.json | 1 - .../oc2/models/block/cable_straight.json | 1 - .../oc2/models/block/cable_support.json | 1 - .../assets/oc2/models/block/charger.json | 1 - .../assets/oc2/models/block/computer.json | 1 - .../assets/oc2/models/block/disk_drive.json | 1 - .../models/block/flash_memory_flasher.json | 1 - .../assets/oc2/models/block/keyboard.json | 1 - .../assets/oc2/models/block/monitor.json | 9 -- .../oc2/models/block/network_connector.json | 1 - .../assets/oc2/models/block/network_hub.json | 1 - .../oc2/models/block/pci_card_cage.json | 1 - .../assets/oc2/models/block/projector.json | 1 - .../oc2/models/block/redstone_interface.json | 1 - .../models/item/block_operations_module.json | 6 - .../assets/oc2/models/item/charger.json | 3 - .../assets/oc2/models/item/circuit_board.json | 6 - .../assets/oc2/models/item/computer.json | 3 - .../oc2/models/item/creative_energy.json | 3 - .../assets/oc2/models/item/disk_drive.json | 3 - .../models/item/file_import_export_card.json | 6 - .../assets/oc2/models/item/flash_memory.json | 6 - .../oc2/models/item/flash_memory_flasher.json | 3 - .../assets/oc2/models/item/floppy.json | 7 - .../assets/oc2/models/item/floppy_modern.json | 7 - .../oc2/models/item/hard_drive_custom.json | 7 - .../models/item/hard_drive_extra_large.json | 7 - .../oc2/models/item/hard_drive_large.json | 7 - .../oc2/models/item/hard_drive_medium.json | 7 - .../oc2/models/item/hard_drive_small.json | 7 - .../item/inventory_operations_module.json | 6 - .../assets/oc2/models/item/keyboard.json | 3 - .../assets/oc2/models/item/manual.json | 6 - .../assets/oc2/models/item/memory_large.json | 6 - .../assets/oc2/models/item/memory_medium.json | 6 - .../assets/oc2/models/item/memory_small.json | 6 - .../assets/oc2/models/item/monitor.json | 3 - .../assets/oc2/models/item/network_cable.json | 6 - .../assets/oc2/models/item/network_hub.json | 3 - .../models/item/network_interface_card.json | 6 - .../oc2/models/item/network_switch.json | 3 - .../oc2/models/item/network_tunnel_card.json | 6 - .../models/item/network_tunnel_module.json | 6 - .../assets/oc2/models/item/pci_card_cage.json | 3 - .../assets/oc2/models/item/projector.json | 3 - .../oc2/models/item/redstone_interface.json | 3 - .../models/item/redstone_interface_card.json | 6 - .../assets/oc2/models/item/sound_card.json | 6 - .../assets/oc2/models/item/transistor.json | 6 - .../assets/oc2/models/item/vxlan_hub.json | 3 - .../assets/oc2/models/item/wrench.json | 6 - src/main/resources/assets/oc2/sounds.json | 52 ------ .../{oc2 => oc2r}/blockstates/bus_cable.json | 28 ++-- .../{oc2 => oc2r}/blockstates/charger.json | 10 +- .../blockstates/computer.json} | 8 +- .../oc2r/blockstates/creative_energy.json | 7 + .../assets/oc2r/blockstates/disk_drive.json | 19 +++ .../blockstates/flash_memory_flasher.json | 19 +++ .../{oc2 => oc2r}/blockstates/keyboard.json | 10 +- .../{oc2 => oc2r}/blockstates/monitor.json | 8 +- .../blockstates/network_connector.json | 26 +-- .../blockstates/network_hub.json | 10 +- .../blockstates/network_switch.json | 8 +- .../blockstates/pci_card_cage.json | 16 +- .../{oc2 => oc2r}/blockstates/projector.json | 18 +-- .../oc2r/blockstates/redstone_interface.json | 19 +++ .../blockstates/vxlan_hub.json} | 10 +- .../assets/{oc2 => oc2r}/doc/en_us/basics.md | 0 .../doc/en_us/block/bus_cable.md | 2 +- .../doc/en_us/block/bus_interface.md | 2 +- .../{oc2 => oc2r}/doc/en_us/block/charger.md | 4 +- .../{oc2 => oc2r}/doc/en_us/block/computer.md | 2 +- .../doc/en_us/block/disk_drive.md | 2 +- .../doc/en_us/block/flash_memory_flasher.md | 2 +- .../{oc2 => oc2r}/doc/en_us/block/index.md | 0 .../{oc2 => oc2r}/doc/en_us/block/keyboard.md | 2 +- .../{oc2 => oc2r}/doc/en_us/block/monitor.md | 2 +- .../doc/en_us/block/network_connector.md | 4 +- .../doc/en_us/block/network_hub.md | 4 +- .../doc/en_us/block/projector.md | 2 +- .../doc/en_us/block/redstone_interface.md | 4 +- .../doc/en_us/getting_started.md | 0 .../assets/{oc2 => oc2r}/doc/en_us/index.md | 0 .../doc/en_us/item/block_operations_module.md | 4 +- .../doc/en_us/item/file_import_export_card.md | 4 +- .../doc/en_us/item/flash_memory.md | 4 +- .../{oc2 => oc2r}/doc/en_us/item/floppy.md | 4 +- .../doc/en_us/item/hard_drive.md | 4 +- .../{oc2 => oc2r}/doc/en_us/item/index.md | 0 .../en_us/item/inventory_operations_module.md | 4 +- .../{oc2 => oc2r}/doc/en_us/item/manual.md | 4 +- .../{oc2 => oc2r}/doc/en_us/item/memory.md | 4 +- .../doc/en_us/item/network_cable.md | 4 +- .../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 | 4 +- .../{oc2 => oc2r}/doc/en_us/item/robot.md | 4 +- .../doc/en_us/item/sound_card.md | 4 +- .../{oc2 => oc2r}/doc/en_us/item/wrench.md | 4 +- .../{oc2 => oc2r}/doc/en_us/networking.md | 0 .../{oc2 => oc2r}/doc/en_us/robotics.md | 0 .../{oc2 => oc2r}/doc/en_us/scripting.md | 0 .../doc/img/getting_started_basics.png | Bin .../doc/img/getting_started_energy.png | Bin .../doc/img/getting_started_inventory.png | Bin .../doc/img/getting_started_login.png | Bin .../{oc2 => oc2r}/doc/img/scripting_lamp.png | Bin .../doc/img/scripting_lua_interactive.png | Bin .../doc/img/scripting_redstone_interface.png | Bin .../assets/{oc2 => oc2r}/doc/ru_ru/basics.md | 0 .../doc/ru_ru/block/bus_cable.md | 4 +- .../doc/ru_ru/block/bus_interface.md | 2 +- .../{oc2 => oc2r}/doc/ru_ru/block/charger.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/block/computer.md | 4 +- .../doc/ru_ru/block/disk_drive.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/block/index.md | 0 .../{oc2 => oc2r}/doc/ru_ru/block/keyboard.md | 4 +- .../doc/ru_ru/block/network_connector.md | 4 +- .../doc/ru_ru/block/network_hub.md | 4 +- .../doc/ru_ru/block/projector.md | 4 +- .../doc/ru_ru/block/redstone_interface.md | 4 +- .../doc/ru_ru/getting_started.md | 0 .../assets/{oc2 => oc2r}/doc/ru_ru/index.md | 0 .../doc/ru_ru/item/block_operations_module.md | 4 +- .../doc/ru_ru/item/file_import_export_card.md | 4 +- .../doc/ru_ru/item/flash_memory.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/item/floppy.md | 4 +- .../doc/ru_ru/item/hard_drive.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/item/index.md | 0 .../ru_ru/item/inventory_operations_module.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/item/manual.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/item/memory.md | 4 +- .../doc/ru_ru/item/network_cable.md | 4 +- .../doc/ru_ru/item/network_interface_card.md | 4 +- .../doc/ru_ru/item/network_tunnel_card.md | 4 +- .../doc/ru_ru/item/network_tunnel_module.md | 4 +- .../doc/ru_ru/item/redstone_interface_card.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/item/robot.md | 4 +- .../doc/ru_ru/item/sound_card.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/item/wrench.md | 4 +- .../{oc2 => oc2r}/doc/ru_ru/networking.md | 0 .../{oc2 => oc2r}/doc/ru_ru/robotics.md | 0 .../{oc2 => oc2r}/doc/ru_ru/scripting.md | 0 .../resources/assets/oc2r/lang/en_us.json | 148 ++++++++++++++++++ .../resources/assets/oc2r/lang/ru_ru.json | 132 ++++++++++++++++ .../resources/assets/oc2r/lang/zh_cn.json | 132 ++++++++++++++++ .../assets/oc2r/models/block/cable_base.json | 1 + .../assets/oc2r/models/block/cable_link.json | 1 + .../assets/oc2r/models/block/cable_plug.json | 1 + .../oc2r/models/block/cable_straight.json | 1 + .../oc2r/models/block/cable_support.json | 1 + .../assets/oc2r/models/block/charger.json | 1 + .../assets/oc2r/models/block/computer.json | 1 + .../models/block/creative_energy.json | 4 +- .../assets/oc2r/models/block/disk_drive.json | 1 + .../models/block/flash_memory_flasher.json | 1 + .../assets/oc2r/models/block/keyboard.json | 1 + .../assets/oc2r/models/block/monitor.json | 9 ++ .../{oc2 => oc2r}/models/block/monitor.mtl | 0 .../{oc2 => oc2r}/models/block/monitor.obj | 0 .../oc2r/models/block/network_connector.json | 1 + .../assets/oc2r/models/block/network_hub.json | 1 + .../models/block/network_switch.json | 10 +- .../oc2r/models/block/pci_card_cage.json | 1 + .../assets/oc2r/models/block/projector.json | 1 + .../oc2r/models/block/redstone_interface.json | 1 + .../{oc2 => oc2r}/models/block/vxlan_hub.json | 10 +- .../models/item/block_operations_module.json | 6 + .../{oc2 => oc2r}/models/item/bus_cable.json | 4 +- .../models/item/bus_interface.json | 4 +- .../assets/oc2r/models/item/charger.json | 3 + .../oc2r/models/item/circuit_board.json | 6 + .../assets/oc2r/models/item/computer.json | 3 + .../{oc2 => oc2r}/models/item/cpu_tier_1.json | 2 +- .../assets/oc2r/models/item/cpu_tier_2.json | 6 + .../assets/oc2r/models/item/cpu_tier_3.json | 6 + .../{oc2 => oc2r}/models/item/cpu_tier_4.json | 2 +- .../oc2r/models/item/creative_energy.json | 3 + .../assets/oc2r/models/item/disk_drive.json | 3 + .../models/item/file_import_export_card.json | 6 + .../assets/oc2r/models/item/flash_memory.json | 6 + .../models/item/flash_memory_custom.json | 2 +- .../models/item/flash_memory_flasher.json | 3 + .../assets/oc2r/models/item/floppy.json | 7 + .../oc2r/models/item/floppy_modern.json | 7 + .../oc2r/models/item/hard_drive_custom.json | 7 + .../models/item/hard_drive_extra_large.json | 7 + .../oc2r/models/item/hard_drive_large.json | 7 + .../oc2r/models/item/hard_drive_medium.json | 7 + .../oc2r/models/item/hard_drive_small.json | 7 + .../item/inventory_operations_module.json | 6 + .../assets/oc2r/models/item/keyboard.json | 3 + .../models/item/manual.json} | 2 +- .../models/item/memory_extra_large.json | 2 +- .../assets/oc2r/models/item/memory_large.json | 6 + .../oc2r/models/item/memory_medium.json | 6 + .../assets/oc2r/models/item/memory_small.json | 6 + .../assets/oc2r/models/item/monitor.json | 3 + .../oc2r/models/item/network_cable.json | 6 + .../models/item/network_connector.json | 4 +- .../assets/oc2r/models/item/network_hub.json | 3 + .../models/item/network_interface_card.json | 6 + .../oc2r/models/item/network_switch.json | 3 + .../oc2r/models/item/network_tunnel_card.json | 6 + .../models/item/network_tunnel_module.json | 6 + .../oc2r/models/item/pci_card_cage.json | 3 + .../assets/oc2r/models/item/projector.json | 3 + .../oc2r/models/item/redstone_interface.json | 3 + .../models/item/redstone_interface_card.json | 6 + .../{oc2 => oc2r}/models/item/robot.json | 0 .../assets/oc2r/models/item/sound_card.json | 6 + .../assets/oc2r/models/item/transistor.json | 6 + .../assets/oc2r/models/item/vxlan_hub.json | 3 + .../models/item/wrench.json} | 2 +- .../{oc2 => oc2r}/shaders/core/projectors.fsh | 0 .../shaders/core/projectors.json | 4 +- .../{oc2 => oc2r}/shaders/core/projectors.vsh | 0 src/main/resources/assets/oc2r/sounds.json | 52 ++++++ .../{oc2 => oc2r}/sounds/computer_running.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_access1.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_access2.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_access3.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_access4.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_access5.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_access6.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_eject.ogg | Bin .../{oc2 => oc2r}/sounds/floppy_insert.ogg | Bin .../{oc2 => oc2r}/sounds/hdd_access1.ogg | Bin .../{oc2 => oc2r}/sounds/hdd_access2.ogg | Bin .../{oc2 => oc2r}/sounds/hdd_access3.ogg | Bin .../{oc2 => oc2r}/sounds/hdd_access4.ogg | Bin .../{oc2 => oc2r}/sounds/hdd_access5.ogg | Bin .../{oc2 => oc2r}/sounds/hdd_access6.ogg | Bin .../{oc2 => oc2r}/sounds/hdd_access7.ogg | Bin .../block/cable_base/cable_base_atlas0.png | Bin .../block/cable_link/cable_link_atlas0.png | Bin .../block/cable_plug/cable_plug_atlas0.png | Bin .../cable_straight/cable_straight_atlas0.png | Bin .../cable_support/cable_support_atlas0.png | Bin .../textures/block/charger/charger_atlas0.png | Bin .../textures/block/charger/charger_atlas1.png | Bin .../textures/block/charger/charger_atlas2.png | Bin .../textures/block/charger/charger_atlas3.png | Bin .../textures/block/charger/effect.png | Bin .../block/computer/computer_atlas0.png | Bin .../block/computer/computer_atlas1.png | Bin .../block/computer/computer_atlas2.png | Bin .../block/computer/computer_atlas3.png | Bin .../block/computer/computer_atlas4.png | Bin .../block/computer/computer_overlay_power.png | Bin .../computer/computer_overlay_status.png | Bin .../computer/computer_overlay_terminal.png | Bin .../textures/block/creative_energy.png | Bin .../block/disk_drive/disk_drive_atlas0.png | Bin .../block/disk_drive/disk_drive_atlas1.png | Bin .../block/disk_drive/disk_drive_atlas2.png | Bin .../block/disk_drive/disk_drive_atlas3.png | Bin .../block/keyboard/keyboard_atlas0.png | Bin .../block/keyboard/keyboard_atlas1.png | Bin .../textures/block/monitor/monitor.png | Bin .../block/monitor/monitor_overlay_power.png | Bin .../network_connector_atlas0.png | Bin .../block/network_hub/network_hub_atlas0.png | Bin .../block/network_hub/network_hub_atlas1.png | Bin .../block/network_hub/network_hub_atlas2.png | Bin .../block/network_hub/network_hub_atlas3.png | Bin .../network_switch/network_switch_atlas0.png | Bin .../network_switch/network_switch_atlas1.png | Bin .../network_switch/network_switch_atlas2.png | Bin .../network_switch/network_switch_atlas3.png | Bin .../pci_card_cage/pci_card_cage_atlas0.png | Bin .../pci_card_cage/pci_card_cage_atlas1.png | Bin .../pci_card_cage/pci_card_cage_atlas2.png | Bin .../pci_card_cage/pci_card_cage_atlas3.png | Bin .../pci_card_cage/pci_card_cage_atlas4.png | Bin .../pci_card_cage/pci_card_cage_atlas5.png | Bin .../pci_card_cage/pci_card_cage_atlas6.png | Bin .../block/projector/projector_atlas0.png | Bin .../block/projector/projector_atlas1.png | Bin .../block/projector/projector_atlas2.png | Bin .../block/projector/projector_atlas3.png | Bin .../block/projector/projector_atlas4.png | Bin .../block/projector/projector_atlas5.png | Bin .../block/projector/projector_atlas6.png | Bin .../redstone_interface_atlas0.png | Bin .../redstone_interface_atlas1.png | Bin .../redstone_interface_atlas2.png | Bin .../redstone_interface_atlas3.png | Bin .../redstone_interface_atlas4.png | Bin .../block/vxlan_hub/vxlan_hub_atlas0.png | Bin .../block/vxlan_hub/vxlan_hub_atlas1.png | Bin .../block/vxlan_hub/vxlan_hub_atlas2.png | Bin .../block/vxlan_hub/vxlan_hub_atlas3.png | Bin .../textures/entity/robot/robot.png | Bin .../{oc2 => oc2r}/textures/font/OFL.TXT | 0 .../{oc2 => oc2r}/textures/font/monospace.png | Bin .../{oc2 => oc2r}/textures/font/terminus.png | Bin .../textures/gui/manual/home.png | Bin .../textures/gui/manual/manual.png | Bin .../textures/gui/manual/scroll_button.png | Bin .../textures/gui/manual/tab_button.png | Bin .../gui/overlay/block_face_disabled.png | Bin .../gui/overlay/block_face_enabled.png | Bin .../gui/overlay/block_face_focused.png | Bin .../textures/gui/overlay/slot_info.png | Bin .../textures/gui/overlay/slot_selection.png | Bin .../textures/gui/overlay/slot_warn.png | Bin .../textures/gui/overlay/terminal_focused.png | Bin .../gui/widget/bus_interface_screen.png | Bin .../textures/gui/widget/cancel_button.png | Bin .../gui/widget/computer_container.png | Bin .../textures/gui/widget/confirm_button.png | Bin .../textures/gui/widget/energy.png | Bin .../textures/gui/widget/hotbar.png | Bin .../textures/gui/widget/input_button.png | Bin .../textures/gui/widget/inventory_button.png | Bin .../textures/gui/widget/monitor_screen.png | Bin .../textures/gui/widget/monitor_sidebar_1.png | Bin .../widget/network_interface_card_screen.png | Bin .../gui/widget/network_tunnel_link_button.png | Bin .../gui/widget/network_tunnel_screen.png | Bin .../textures/gui/widget/power_button.png | Bin .../textures/gui/widget/robot_container.png | Bin .../textures/gui/widget/sidebar_2.png | Bin .../textures/gui/widget/sidebar_3.png | Bin .../textures/gui/widget/terminal_screen.png | Bin .../{oc2 => oc2r}/textures/item/backlight.png | Bin .../textures/item/block_operations_module.png | Bin .../{oc2 => oc2r}/textures/item/card_slot.png | Bin .../textures/item/circuit_board.png | Bin .../{oc2 => oc2r}/textures/item/cpu_slot.png | Bin .../textures/item/cpu_tier_1.png | Bin .../textures/item/cpu_tier_2.png | Bin .../textures/item/cpu_tier_3.png | Bin .../textures/item/cpu_tier_4.png | Bin .../textures/item/file_import_export_card.png | Bin .../item/file_import_export_card.png.mcmeta | 0 .../textures/item/flash_memory.png | Bin .../textures/item/flash_memory_slot.png | Bin .../textures/item/floppy_base.png | Bin .../textures/item/floppy_slot.png | Bin .../textures/item/floppy_tint.png | Bin .../textures/item/front_display_glass.png | Bin .../textures/item/hard_disk_platter.png | Bin .../textures/item/hard_drive_base.png | Bin .../textures/item/hard_drive_slot.png | Bin .../textures/item/hard_drive_tint.png | Bin .../item/inventory_operations_module.png | Bin .../textures/item/lcd_display.png | Bin .../textures/item/liquid_crystal_layers.png | Bin .../{oc2 => oc2r}/textures/item/manual.png | Bin .../textures/item/memory_extra_large.png | Bin .../textures/item/memory_large.png | Bin .../textures/item/memory_medium.png | Bin .../textures/item/memory_slot.png | Bin .../textures/item/memory_small.png | Bin .../{oc2 => oc2r}/textures/item/motor.png | Bin .../textures/item/network_cable.png | Bin .../textures/item/network_interface_card.png | Bin .../textures/item/network_tunnel_card.png | Bin .../textures/item/network_tunnel_module.png | Bin .../textures/item/network_tunnel_slot.png | Bin .../textures/item/polarization_filter.png | Bin .../textures/item/redstone_interface_card.png | Bin .../textures/item/robot_module_slot.png | Bin .../textures/item/sound_card.png | Bin .../textures/item/transistor.png | Bin .../{oc2 => oc2r}/textures/item/wrench.png | Bin .../recipes/oc2.common/hard_drive_large.json | 47 ------ .../data/oc2/file_systems/scripts.json | 5 - .../oc2/item_tag_filters/oc2/hard_drive.json | 6 - .../data/oc2/item_tag_filters/oc2/memory.json | 6 - .../data/oc2/recipes/flash_memory_custom.json | 14 -- .../data/oc2/recipes/hard_drive_custom.json | 14 -- .../data/oc2/tags/blocks/devices.json | 9 -- .../oc2/tags/blocks/wrench_breakable.json | 13 -- .../oc2/tags/items/device_needs_reboot.json | 26 --- .../data/oc2/tags/items/devices.json | 16 -- .../data/oc2/tags/items/devices/card.json | 10 -- .../data/oc2/tags/items/devices/cpu.json | 9 -- .../oc2/tags/items/devices/flash_memory.json | 7 - .../data/oc2/tags/items/devices/floppy.json | 7 - .../oc2/tags/items/devices/hard_drive.json | 10 -- .../data/oc2/tags/items/devices/memory.json | 9 -- .../tags/items/devices/network_tunnel.json | 7 - .../oc2/tags/items/devices/robot_module.json | 8 - .../data/oc2/tags/items/tool_materials.json | 11 -- .../oc2r.common}/block_operations_module.json | 8 +- .../recipes/oc2r.common}/bus_cable.json | 8 +- .../recipes/oc2r.common}/bus_interface.json | 8 +- .../recipes/oc2r.common}/charger.json | 8 +- .../recipes/oc2r.common}/circuit_board.json | 8 +- .../recipes/oc2r.common}/computer.json | 10 +- .../recipes/oc2r.common}/disk_drive.json | 8 +- .../oc2r.common}/file_import_export_card.json | 8 +- .../recipes/oc2r.common}/flash_memory.json | 10 +- .../oc2r.common/flash_memory_custom.json} | 8 +- .../recipes/oc2r.common}/floppy.json | 8 +- .../recipes/oc2r.common}/floppy_modern.json | 6 +- .../oc2r.common}/hard_drive_custom.json | 10 +- .../oc2r.common/hard_drive_extra_large.json | 47 ++++++ .../oc2r.common/hard_drive_large.json} | 8 +- .../oc2r.common}/hard_drive_medium.json | 10 +- .../oc2r.common}/hard_drive_small.json | 10 +- .../inventory_operations_module.json | 8 +- .../recipes/oc2r.common}/keyboard.json | 8 +- .../recipes/oc2r.common}/manual.json | 8 +- .../oc2r.common/memory_extra_large.json} | 10 +- .../recipes/oc2r.common}/memory_large.json | 10 +- .../recipes/oc2r.common}/memory_medium.json | 10 +- .../recipes/oc2r.common}/memory_small.json | 10 +- .../recipes/oc2r.common}/network_cable.json | 8 +- .../oc2r.common}/network_connector.json | 8 +- .../recipes/oc2r.common}/network_hub.json | 8 +- .../oc2r.common}/network_interface_card.json | 8 +- .../oc2r.common}/network_tunnel_card.json | 8 +- .../oc2r.common}/network_tunnel_module.json | 8 +- .../recipes/oc2r.common}/projector.json | 8 +- .../oc2r.common}/redstone_interface.json | 8 +- .../oc2r.common}/redstone_interface_card.json | 8 +- .../recipes/oc2r.common}/robot.json | 10 +- .../recipes/oc2r.common}/sound_card.json | 8 +- .../recipes/oc2r.common}/transistor.json | 6 +- .../recipes/oc2r.common}/wrench.json | 8 +- .../data/{oc2 => oc2r}/file_systems/README.md | 6 +- .../data/oc2r/file_systems/scripts.json | 5 + .../item_tag_filters/minecraft/common.json | 0 .../item_tag_filters/oc2r/hard_drive.json | 6 + .../oc2r/item_tag_filters/oc2r/memory.json | 6 + .../loot_tables/blocks/charger.json | 4 +- .../loot_tables/blocks/computer.json | 4 +- .../loot_tables/blocks/disk_drive.json | 4 +- .../loot_tables/blocks/keyboard.json | 4 +- .../loot_tables/blocks/network_connector.json | 4 +- .../loot_tables/blocks/network_hub.json | 4 +- .../loot_tables/blocks/projector.json | 4 +- .../blocks/redstone_interface.json | 4 +- .../recipes/block_operations_module.json | 8 +- .../data/{oc2 => oc2r}/recipes/bus_cable.json | 6 +- .../{oc2 => oc2r}/recipes/bus_interface.json | 8 +- .../data/{oc2 => oc2r}/recipes/charger.json | 8 +- .../{oc2 => oc2r}/recipes/circuit_board.json | 6 +- .../data/{oc2 => oc2r}/recipes/computer.json | 12 +- .../{oc2 => oc2r}/recipes/disk_drive.json | 8 +- .../recipes/file_import_export_card.json | 8 +- .../{oc2 => oc2r}/recipes/flash_memory.json | 8 +- .../oc2r/recipes/flash_memory_custom.json | 14 ++ .../recipes/flash_memory_flasher.json | 8 +- .../data/{oc2 => oc2r}/recipes/floppy.json | 8 +- .../{oc2 => oc2r}/recipes/floppy_modern.json | 6 +- .../data/oc2r/recipes/hard_drive_custom.json | 14 ++ .../recipes/hard_drive_extra_large.json | 6 +- .../recipes/hard_drive_large.json | 8 +- .../recipes/hard_drive_medium.json | 8 +- .../recipes/hard_drive_small.json | 8 +- .../recipes/inventory_operations_module.json | 8 +- .../data/{oc2 => oc2r}/recipes/keyboard.json | 10 +- .../data/{oc2 => oc2r}/recipes/manual.json | 8 +- .../recipes/memory_extra_large.json | 6 +- .../{oc2 => oc2r}/recipes/memory_large.json | 8 +- .../{oc2 => oc2r}/recipes/memory_medium.json | 8 +- .../{oc2 => oc2r}/recipes/memory_small.json | 8 +- .../{oc2 => oc2r}/recipes/network_cable.json | 6 +- .../recipes/network_connector.json | 6 +- .../{oc2 => oc2r}/recipes/network_hub.json | 12 +- .../recipes/network_interface_card.json | 8 +- .../recipes/network_tunnel_card.json | 8 +- .../recipes/network_tunnel_module.json | 8 +- .../data/{oc2 => oc2r}/recipes/projector.json | 10 +- .../recipes/redstone_interface.json | 10 +- .../recipes/redstone_interface_card.json | 8 +- .../data/{oc2 => oc2r}/recipes/robot.json | 12 +- .../{oc2 => oc2r}/recipes/sound_card.json | 8 +- .../{oc2 => oc2r}/recipes/transistor.json | 4 +- .../data/{oc2 => oc2r}/recipes/unflash.json | 4 +- .../data/{oc2 => oc2r}/recipes/wrench.json | 6 +- .../{oc2 => oc2r}/tags/blocks/cables.json | 4 +- .../data/oc2r/tags/blocks/devices.json | 9 ++ .../oc2r/tags/blocks/wrench_breakable.json | 13 ++ .../data/{oc2 => oc2r}/tags/items/cables.json | 4 +- .../oc2r/tags/items/device_needs_reboot.json | 26 +++ .../data/oc2r/tags/items/devices.json | 16 ++ .../data/oc2r/tags/items/devices/card.json | 10 ++ .../data/oc2r/tags/items/devices/cpu.json | 9 ++ .../oc2r/tags/items/devices/flash_memory.json | 7 + .../data/oc2r/tags/items/devices/floppy.json | 7 + .../oc2r/tags/items/devices/hard_drive.json | 10 ++ .../data/oc2r/tags/items/devices/memory.json | 9 ++ .../tags/items/devices/network_tunnel.json | 7 + .../oc2r/tags/items/devices/robot_module.json | 8 + .../data/oc2r/tags/items/tool_materials.json | 11 ++ .../tags/items/tool_materials/diamond.json | 0 .../tags/items/tool_materials/gold.json | 0 .../tags/items/tool_materials/iron.json | 0 .../tags/items/tool_materials/netherite.json | 0 .../tags/items/tool_materials/stone.json | 0 .../tags/items/tool_materials/wood.json | 0 .../{oc2 => oc2r}/tags/items/wrenches.json | 4 +- .../{mixins.oc2.json => mixins.oc2r.json} | 4 +- 1172 files changed, 4292 insertions(+), 4289 deletions(-) delete mode 100644 src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java delete mode 100644 src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/gui/terminal/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/gui/util/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/gui/widget/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/item/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/manual/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/model/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/renderer/color/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/renderer/entity/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/renderer/font/package-info.java delete mode 100644 src/main/java/li/cil/oc2/client/renderer/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/block/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/blockentity/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/data/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/util/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/bus/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/capabilities/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/container/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/energy/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/entity/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/entity/robot/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/ext/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/integration/jei/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/integration/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/item/crafting/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/item/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/mixin/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/network/message/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/network/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/serialization/gson/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/serialization/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/tags/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/util/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/vm/context/global/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/vm/context/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/vm/fs/package-info.java delete mode 100644 src/main/java/li/cil/oc2/common/vm/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/api/API.java (78%) rename src/main/java/li/cil/{oc2 => oc2r}/api/README.md (92%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/BlockDeviceBusElement.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/DeviceBus.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/DeviceBusController.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/DeviceBusElement.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/Device.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/DeviceType.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/DeviceTypes.java (67%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/ItemDevice.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/data/BlockDeviceData.java (81%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/data/Firmware.java (87%) create mode 100644 src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/object/Callback.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/object/Callbacks.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/object/DocumentedDevice.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/object/LifecycleAwareDevice.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/object/NamedDevice.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/object/ObjectDevice.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/object/Parameter.java (95%) create mode 100644 src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java create mode 100644 src/main/java/li/cil/oc2r/api/bus/device/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/provider/BlockDeviceProvider.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/provider/BlockDeviceQuery.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/provider/ItemDeviceProvider.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/provider/ItemDeviceQuery.java (95%) create mode 100644 src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/rpc/AbstractRPCMethod.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/rpc/RPCDevice.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/rpc/RPCInvocation.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/rpc/RPCMethod.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/rpc/RPCMethodGroup.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/rpc/RPCParameter.java (96%) rename src/main/java/li/cil/{oc2/api/bus/device/data => oc2r/api/bus/device/rpc}/package-info.java (83%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/FirmwareLoader.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/VMDevice.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/VMDeviceLoadResult.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/context/InterruptAllocator.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/context/MemoryAllocator.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/context/MemoryRangeAllocator.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/context/VMContext.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/context/VMLifecycleEventBus.java (57%) create mode 100644 src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/event/VMInitializationException.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/event/VMInitializingEvent.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/event/VMResumedRunningEvent.java (79%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/device/vm/event/VMSynchronizeEvent.java (93%) create mode 100644 src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java rename src/main/java/li/cil/{oc2/api/bus/device/rpc => oc2r/api/bus/device/vm}/package-info.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/api/bus/package-info.java (75%) rename src/main/java/li/cil/{oc2 => oc2r}/api/capabilities/NetworkInterface.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/api/capabilities/RedstoneEmitter.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/api/capabilities/Robot.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/api/capabilities/TerminalUserProvider.java (84%) rename src/main/java/li/cil/{oc2/api/bus/device/vm => oc2r/api/capabilities}/package-info.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/api/imc/RPCMethodParameterTypeAdapter.java (88%) rename src/main/java/li/cil/{oc2/api/util => oc2r/api/imc}/package-info.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/api/package-info.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/api/util/Invalidatable.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/api/util/Registries.java (81%) rename src/main/java/li/cil/{oc2 => oc2r}/api/util/RobotOperationSide.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/api/util/Side.java (92%) create mode 100644 src/main/java/li/cil/oc2r/api/util/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/ClientSetup.java (81%) rename src/main/java/li/cil/{oc2 => oc2r}/client/audio/LoopingBlockEntitySound.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/client/audio/LoopingSoundManager.java (97%) create mode 100644 src/main/java/li/cil/oc2r/client/audio/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/AbstractMachineInventoryScreen.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/AbstractMachineTerminalScreen.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/AbstractModContainerScreen.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/AbstractMonitorDisplayScreen.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/BusInterfaceScreen.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/ComputerContainerScreen.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/ComputerTerminalScreen.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/FileChooserScreen.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/KeyCodeMapping.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/KeyboardScreen.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/MachineTerminalWidget.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/MonitorDisplayScreen.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/MonitorDisplayWidget.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/NetworkInterfaceCardScreen.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/NetworkTunnelScreen.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/RobotContainerScreen.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/RobotTerminalScreen.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/Sprites.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/Textures.java (97%) create mode 100644 src/main/java/li/cil/oc2r/client/gui/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/terminal/TerminalInput.java (99%) create mode 100644 src/main/java/li/cil/oc2r/client/gui/terminal/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/util/GuiUtils.java (91%) rename src/main/java/li/cil/{oc2/api/capabilities => oc2r/client/gui/util}/package-info.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/widget/ImageButton.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/widget/Sprite.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/widget/Texture.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/client/gui/widget/ToggleImageButton.java (96%) create mode 100644 src/main/java/li/cil/oc2r/client/gui/widget/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/item/CustomItemColors.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/client/item/CustomItemModelProperties.java (94%) rename src/main/java/li/cil/{oc2/client/audio => oc2r/client/item}/package-info.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/client/manual/Manuals.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/client/manual/ModManualScreenStyle.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/client/manual/ModManualStyle.java (92%) rename src/main/java/li/cil/{oc2/api/bus/device => oc2r/client/manual}/package-info.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/client/model/BusCableBakedModel.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/client/model/BusCableModel.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/client/model/BusCableModelLoader.java (94%) create mode 100644 src/main/java/li/cil/oc2r/client/model/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/package-info.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/BusInterfaceNameRenderer.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/ModRenderType.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/ModShaders.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/MonitorGUIRenderer.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/NetworkCableRenderer.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/ProjectorDepthRenderer.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/blockentity/ChargerRenderer.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/blockentity/ComputerRenderer.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/blockentity/DiskDriveRenderer.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/blockentity/MonitorRenderer.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/blockentity/ProjectorRenderer.java (96%) create mode 100644 src/main/java/li/cil/oc2r/client/renderer/blockentity/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/color/BusCableBlockColor.java (88%) create mode 100644 src/main/java/li/cil/oc2r/client/renderer/color/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/entity/RobotRenderer.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/entity/RobotWithoutLevelRenderer.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/entity/model/RobotModel.java (96%) create mode 100644 src/main/java/li/cil/oc2r/client/renderer/entity/model/package-info.java rename src/main/java/li/cil/{oc2/api/bus/device/provider => oc2r/client/renderer/entity}/package-info.java (82%) rename src/main/java/li/cil/{oc2 => oc2r}/client/renderer/font/MonospaceFontRenderer.java (94%) rename src/main/java/li/cil/{oc2/api/bus/device/object => oc2r/client/renderer/font}/package-info.java (83%) create mode 100644 src/main/java/li/cil/oc2r/client/renderer/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/CommonSetup.java (62%) rename src/main/java/li/cil/{oc2 => oc2r}/common/Config.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/ConfigManager.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/common/Constants.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/Main.java (62%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/Blocks.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/BusCableBlock.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/ChargerBlock.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/ComputerBlock.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/CreativeEnergyBlock.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/DiskDriveBlock.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/EnergyConsumingBlock.java (76%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/FlashMemoryFlasherBlock.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/ImmutableHorizontalBlock.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/KeyboardBlock.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/MonitorBlock.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/NetworkConnectorBlock.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/NetworkHubBlock.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/NetworkSwitchBlock.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/PciCardCageBlock.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/ProjectorBlock.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/RedstoneInterfaceBlock.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/block/VxlanBlock.java (93%) create mode 100644 src/main/java/li/cil/oc2r/common/block/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/BlockEntities.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/BusCableBlockEntity.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/ChargerBlockEntity.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/ComputerBlockEntity.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/CreativeEnergyBlockEntity.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/DiskDriveBlockEntity.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/FlashMemoryFlasherBlockEntity.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/KeyboardBlockEntity.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/ModBlockEntity.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/MonitorBlockEntity.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/NetworkConnectorBlockEntity.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/NetworkHubBlockEntity.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/NetworkSwitchBlockEntity.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/PciCardCageBlockEntity.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/ProjectorBlockEntity.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/RedstoneInterfaceBlockEntity.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/TickableBlockEntity.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/blockentity/VxlanBlockEntity.java (93%) create mode 100644 src/main/java/li/cil/oc2r/common/blockentity/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/AbstractBlockDeviceBusElement.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/AbstractDeviceBusElement.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/AbstractGroupingDeviceBusElement.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/AbstractItemDeviceBusElement.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/BlockDeviceBusController.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/CommonDeviceBusController.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/RPCDeviceBusAdapter.java (97%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/DeviceGroup.java (77%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/DeviceTypes.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/data/BlockDeviceDataRegistry.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/data/BuildrootBlockDeviceData.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/data/BuildrootFirmware.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/data/FileSystems.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/data/FirmwareRegistry.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/data/ResourceBlockDeviceData.java (91%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/data/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/ProviderRegistry.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/Providers.java (81%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java (61%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/provider/block/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java (64%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/CPUItemDeviceProvider.java (61%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java (65%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java (78%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java (67%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java (67%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java (65%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/HardDriveItemDeviceProvider.java (75%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java (76%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java (65%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java (64%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java (71%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/MemoryItemDeviceProvider.java (72%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java (63%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java (63%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java (63%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java (65%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/item/SoundCardItemDeviceProvider.java (60%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/provider/item/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/provider/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/util/AbstractBlockDeviceProvider.java (51%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/provider/util/AbstractItemDeviceProvider.java (88%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/provider/util/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/EnergyStorageDevice.java (81%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/FluidHandlerDevice.java (80%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/ItemHandlerDevice.java (80%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/RPCDeviceList.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/RPCItemStackTagFilter.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/RPCItemStackTagFilters.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java (83%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/TypeNameRPCDevice.java (70%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java (57%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java (69%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java (59%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java (59%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java (58%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/rpc/block/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/item/AbstractItemRPCDevice.java (71%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/item/BlockOperationsModuleDevice.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/item/CPUItemDevice.java (73%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/item/FileImportExportCardItemDevice.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/rpc/item/SoundCardItemDevice.java (92%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/rpc/item/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/rpc/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/AbstractDeviceInfo.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/BlockDeviceInfo.java (68%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/DeviceTypeImpl.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/Devices.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/IdentityProxy.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/ItemDeviceInfo.java (81%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/OptionalAddress.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/util/OptionalInterrupt.java (90%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/util/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/DiskDriveContainer.java (79%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/DiskDriveDevice.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/FlashMemoryFlasherContainer.java (80%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/FlashMemoryFlasherDevice.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/KeyboardDevice.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/MonitorDevice.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/PciCardCageDevice.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/block/ProjectorDevice.java (88%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/vm/block/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/AbstractBlockStorageDevice.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/FirmwareFlashStorageDevice.java (71%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/HardDriveDevice.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/MemoryDevice.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/NetworkInterfaceCardDevice.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/bus/device/vm/item/NetworkTunnelDevice.java (92%) create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/vm/item/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/bus/device/vm/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/bus/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/capabilities/Capabilities.java (83%) rename src/main/java/li/cil/{oc2 => oc2r}/common/capabilities/CapabilityRegistry.java (84%) create mode 100644 src/main/java/li/cil/oc2r/common/capabilities/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractComputerContainer.java (83%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractContainer.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractDeviceItemStackHandler.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractMachineContainer.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractMachineTerminalContainer.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractMonitorContainer.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractRobotContainer.java (82%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/AbstractTypedDeviceItemStackHandler.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/ComputerInventoryContainer.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/ComputerTerminalContainer.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/Containers.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/DeviceTypeSlot.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/DeviceTypeSlotItemHandler.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/FixedSizeItemStackHandler.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/IntPrecisionContainerData.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/LockedSlot.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/MonitorDisplayContainer.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/NetworkTunnelContainer.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/RobotInventoryContainer.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/RobotSlot.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/RobotTerminalContainer.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/container/TypedItemStackHandler.java (95%) create mode 100644 src/main/java/li/cil/oc2r/common/container/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/energy/EnergyStorageItemStack.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/energy/FixedEnergyStorage.java (96%) create mode 100644 src/main/java/li/cil/oc2r/common/energy/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/Entities.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/Robot.java (95%) create mode 100644 src/main/java/li/cil/oc2r/common/entity/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/AbstractRobotAction.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/AbstractRobotActionType.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/MovementDirection.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/RobotActionResult.java (73%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/RobotActions.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/RobotMovementAction.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/RobotMovementActionType.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/RobotRotationAction.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/RobotRotationActionType.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/entity/robot/RotationDirection.java (95%) create mode 100644 src/main/java/li/cil/oc2r/common/entity/robot/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/ext/MinecraftExt.java (87%) create mode 100644 src/main/java/li/cil/oc2r/common/ext/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/integration/IMC.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/integration/Wrenches.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/integration/jei/ExtraGuiAreasJEIPlugin.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/integration/jei/ExtraItemsJEIPlugin.java (91%) create mode 100644 src/main/java/li/cil/oc2r/common/integration/jei/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/integration/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/item/AbstractBlockDeviceItem.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/AbstractStorageItem.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/BlockOperationsModule.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/BusCableItem.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/BusInterfaceItem.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/CPUItem.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/ChargerItem.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/FlashMemoryItem.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/FlashMemoryWithExternalDataItem.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/FloppyItem.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/HardDriveItem.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/HardDriveWithExternalDataItem.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/ItemGroup.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/ItemRenameHandler.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/Items.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/ManualItem.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/MemoryItem.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/ModBlockItem.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/ModItem.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/NetworkCableItem.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/NetworkInterfaceCardItem.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/NetworkTunnelItem.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/RobotItem.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/WrenchItem.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/crafting/RecipeSerializers.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/item/crafting/WrenchRecipe.java (96%) create mode 100644 src/main/java/li/cil/oc2r/common/item/crafting/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/item/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/mixin/FrustumMixin.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/mixin/LevelRendererMixin.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/mixin/MinecraftMixin.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/mixin/ServerChunkCacheMixin.java (88%) create mode 100644 src/main/java/li/cil/oc2r/common/mixin/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/network/MessageUtils.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/MonitorLoadBalancer.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/Network.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/ProjectorLoadBalancer.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/AbstractMessage.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/AbstractTerminalBlockMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/AbstractTerminalEntityMessage.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/BusCableFacadeMessage.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/BusInterfaceNameMessage.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ClientCanceledImportFileMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ComputerBootErrorMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ComputerBusStateMessage.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ComputerPowerMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ComputerRunStateMessage.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ComputerTerminalInputMessage.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ComputerTerminalOutputMessage.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/DiskDriveFloppyMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ExportedFileMessage.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/FirmwareFlasherMessage.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ImportedFileMessage.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/KeyboardInputMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/MonitorFramebufferMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/MonitorInputMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/MonitorPowerMessage.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/MonitorPowerMessageForwarded.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/MonitorRequestFramebufferMessage.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/MonitorStateMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/MultipartMessage.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/NetworkConnectorConnectionsMessage.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/NetworkInterfaceCardConfigurationMessage.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/NetworkTunnelLinkMessage.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/OpenComputerInventoryMessage.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/OpenComputerTerminalMessage.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/OpenRobotInventoryMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/OpenRobotTerminalMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ProjectorFramebufferMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ProjectorRequestFramebufferMessage.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ProjectorStateMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RequestImportedFileMessage.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotBootErrorMessage.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotBusStateMessage.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotInitializationMessage.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotInitializationRequestMessage.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotPowerMessage.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotRunStateMessage.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotTerminalInputMessage.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/RobotTerminalOutputMessage.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/common/network/message/ServerCanceledImportFileMessage.java (90%) create mode 100644 src/main/java/li/cil/oc2r/common/network/message/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/network/package-info.java rename src/main/java/li/cil/{oc2/api/imc => oc2r/common}/package-info.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/BlobStorage.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/NBTSerialization.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/NBTToJsonConverter.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/ceres/JsonArraySerializer.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/ceres/MemoryRangeListSerializer.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/ceres/MemoryRangeSerializer.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/ceres/Serializers.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/ceres/TextComponentSerializer.java (96%) create mode 100644 src/main/java/li/cil/oc2r/common/serialization/ceres/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/DirectionJsonSerializer.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/EmptyRPCMethodGroupSerializer.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/ItemStackJsonSerializer.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/MessageJsonDeserializer.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/MethodInvocationJsonDeserializer.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/RPCMethodJsonSerializer.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/SideJsonDeserializer.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/serialization/gson/UnsignedByteArrayJsonSerializer.java (92%) create mode 100644 src/main/java/li/cil/oc2r/common/serialization/gson/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/serialization/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/tags/BlockTags.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/tags/ItemTags.java (96%) create mode 100644 src/main/java/li/cil/oc2r/common/tags/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/util/BlockEntityUtils.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/BlockLocation.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ChainableVertexConsumer.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ChunkLocation.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ChunkUtils.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ColorUtils.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/Event.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/FakePlayerUtils.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/HorizontalBlockUtils.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ItemDeviceUtils.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ItemStackUtils.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/LazyOptionalUtils.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/LevelUtils.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/LocationSupplierUtils.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/NBTTagIds.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/NBTUtils.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ParameterizedEvent.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/RegistryUtils.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/RunnableUtils.java (78%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ServerScheduler.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/SoundEvents.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/TerminalUtils.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/TextFormatUtils.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/ThrottledSoundEmitter.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/TickUtils.java (77%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/TooltipUtils.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/TranslationUtils.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/Vec3Utils.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/util/VoxelShapeUtils.java (95%) create mode 100644 src/main/java/li/cil/oc2r/common/util/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/AbstractTerminalVMRunner.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/AbstractVMItemStackHandlers.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/AbstractVirtualMachine.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/Allocator.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/BaseAddressProvider.java (68%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/BuiltinDevices.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/MinecraftRealTimeCounter.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/Terminal.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/VMDeviceBusAdapter.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/VMItemStackHandlers.java (78%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/VMRunState.java (78%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/VMRunner.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/VirtualMachine.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/EventManager.java (74%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/InterruptManager.java (82%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/InterruptValidator.java (80%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/MemoryRangeManager.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/VMContextManagerCollection.java (84%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/GlobalEventBus.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/GlobalInterruptAllocator.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/GlobalInterruptController.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/GlobalMemoryAllocator.java (83%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/GlobalMemoryMap.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/GlobalMemoryRangeAllocator.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/GlobalVMContext.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/global/MemoryRangeList.java (79%) create mode 100644 src/main/java/li/cil/oc2r/common/vm/context/global/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/managed/ManagedEventBus.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/managed/ManagedInterruptAllocator.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/managed/ManagedInterruptController.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/managed/ManagedMemoryAllocator.java (85%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/managed/ManagedMemoryMap.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/managed/ManagedMemoryRangeAllocator.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/context/managed/ManagedVMContext.java (94%) create mode 100644 src/main/java/li/cil/oc2r/common/vm/context/managed/package-info.java create mode 100644 src/main/java/li/cil/oc2r/common/vm/context/package-info.java rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/device/PciRootPortDevice.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/device/SimpleFramebufferDevice.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/fs/LayeredFileSystem.java (99%) create mode 100644 src/main/java/li/cil/oc2r/common/vm/fs/package-info.java rename src/main/java/li/cil/{oc2/client/gui => oc2r/common/vm}/package-info.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/provider/DeviceTreeProviders.java (71%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/provider/PciRootPortDeviceProvider.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vm/provider/SimpleFramebufferDeviceProvider.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/common/vxlan/TunnelManager.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/data/DataGenerators.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/data/ModBlockStateProvider.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/data/ModBlockTagsProvider.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/data/ModItemModelProvider.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/data/ModItemTagsProvider.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/data/ModLootTableProvider.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/data/ModRecipesProvider.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/data/WrenchRecipeBuilder.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/data/package-info.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/common/biari/MConst.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/common/biari/MDecoder.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/H264Const.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/H264Decoder.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/H264Encoder.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/H264Utils.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/POCManager.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/BlockInterpolator.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/CABACContst.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/CAVLCReader.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/CoeffTransformer.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/DeblockerInput.java (74%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/DecoderState.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/FrameReader.java (77%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlock.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderBase.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java (65%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderInter.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java (88%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockDecoderUtils.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/MBlockSkipDecoder.java (82%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/PredictionMerger.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/RefListManager.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/SliceDecoder.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/SliceHeaderReader.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/SliceReader.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java (89%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/aso/MapManager.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/aso/Mapper.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/CQPRateControl.java (90%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/EncodedMB.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/EncodingContext.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/H264EncoderUtils.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/IntraPredEstimator.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/MBDeblocker.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/MBEncoderHelper.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/MBWriterI16x16.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/MBWriterINxN.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/MBWriterP16x16.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/MotionEstimator.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/encode/RateControl.java (70%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/CABAC.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/CAVLC.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/AspectRatio.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/Frame.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/HRDParameters.java (94%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/MBType.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/NALUnit.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/NALUnitType.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/PictureParameterSet.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/PredictionWeightTable.java (93%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/RefPicMarking.java (91%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java (87%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/SeqParameterSet.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/SliceHeader.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/SliceType.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/model/VUIParameters.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/write/CAVLCWriter.java (92%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/codecs/h264/io/write/SliceHeaderWriter.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/ArrayUtil.java (96%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/IntArrayList.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/IntObjectMap.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/VideoDecoder.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/VideoEncoder.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/io/BitReader.java (99%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/io/BitWriter.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/io/VLC.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/io/VLCBuilder.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/model/ColorSpace.java (97%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/model/Picture.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/model/Size.java (86%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/common/tools/MathUtil.java (98%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/scale/RgbToYuv420j.java (95%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/scale/Transform.java (78%) rename src/main/java/li/cil/{oc2 => oc2r}/jcodec/scale/Yuv420jToRgb.java (96%) delete mode 100644 src/main/resources/assets/oc2/blockstates/computer.json delete mode 100644 src/main/resources/assets/oc2/blockstates/creative_energy.json delete mode 100644 src/main/resources/assets/oc2/blockstates/flash_memory_flasher.json delete mode 100644 src/main/resources/assets/oc2/blockstates/redstone_interface.json delete mode 100644 src/main/resources/assets/oc2/lang/en_us.json delete mode 100644 src/main/resources/assets/oc2/lang/ru_ru.json delete mode 100644 src/main/resources/assets/oc2/lang/zh_cn.json delete mode 100644 src/main/resources/assets/oc2/models/block/cable_base.json delete mode 100644 src/main/resources/assets/oc2/models/block/cable_link.json delete mode 100644 src/main/resources/assets/oc2/models/block/cable_plug.json delete mode 100644 src/main/resources/assets/oc2/models/block/cable_straight.json delete mode 100644 src/main/resources/assets/oc2/models/block/cable_support.json delete mode 100644 src/main/resources/assets/oc2/models/block/charger.json delete mode 100644 src/main/resources/assets/oc2/models/block/computer.json delete mode 100644 src/main/resources/assets/oc2/models/block/disk_drive.json delete mode 100644 src/main/resources/assets/oc2/models/block/flash_memory_flasher.json delete mode 100644 src/main/resources/assets/oc2/models/block/keyboard.json delete mode 100644 src/main/resources/assets/oc2/models/block/monitor.json delete mode 100644 src/main/resources/assets/oc2/models/block/network_connector.json delete mode 100644 src/main/resources/assets/oc2/models/block/network_hub.json delete mode 100644 src/main/resources/assets/oc2/models/block/pci_card_cage.json delete mode 100644 src/main/resources/assets/oc2/models/block/projector.json delete mode 100644 src/main/resources/assets/oc2/models/block/redstone_interface.json delete mode 100644 src/main/resources/assets/oc2/models/item/block_operations_module.json delete mode 100644 src/main/resources/assets/oc2/models/item/charger.json delete mode 100644 src/main/resources/assets/oc2/models/item/circuit_board.json delete mode 100644 src/main/resources/assets/oc2/models/item/computer.json delete mode 100644 src/main/resources/assets/oc2/models/item/creative_energy.json delete mode 100644 src/main/resources/assets/oc2/models/item/disk_drive.json delete mode 100644 src/main/resources/assets/oc2/models/item/file_import_export_card.json delete mode 100644 src/main/resources/assets/oc2/models/item/flash_memory.json delete mode 100644 src/main/resources/assets/oc2/models/item/flash_memory_flasher.json delete mode 100644 src/main/resources/assets/oc2/models/item/floppy.json delete mode 100644 src/main/resources/assets/oc2/models/item/floppy_modern.json delete mode 100644 src/main/resources/assets/oc2/models/item/hard_drive_custom.json delete mode 100644 src/main/resources/assets/oc2/models/item/hard_drive_extra_large.json delete mode 100644 src/main/resources/assets/oc2/models/item/hard_drive_large.json delete mode 100644 src/main/resources/assets/oc2/models/item/hard_drive_medium.json delete mode 100644 src/main/resources/assets/oc2/models/item/hard_drive_small.json delete mode 100644 src/main/resources/assets/oc2/models/item/inventory_operations_module.json delete mode 100644 src/main/resources/assets/oc2/models/item/keyboard.json delete mode 100644 src/main/resources/assets/oc2/models/item/manual.json delete mode 100644 src/main/resources/assets/oc2/models/item/memory_large.json delete mode 100644 src/main/resources/assets/oc2/models/item/memory_medium.json delete mode 100644 src/main/resources/assets/oc2/models/item/memory_small.json delete mode 100644 src/main/resources/assets/oc2/models/item/monitor.json delete mode 100644 src/main/resources/assets/oc2/models/item/network_cable.json delete mode 100644 src/main/resources/assets/oc2/models/item/network_hub.json delete mode 100644 src/main/resources/assets/oc2/models/item/network_interface_card.json delete mode 100644 src/main/resources/assets/oc2/models/item/network_switch.json delete mode 100644 src/main/resources/assets/oc2/models/item/network_tunnel_card.json delete mode 100644 src/main/resources/assets/oc2/models/item/network_tunnel_module.json delete mode 100644 src/main/resources/assets/oc2/models/item/pci_card_cage.json delete mode 100644 src/main/resources/assets/oc2/models/item/projector.json delete mode 100644 src/main/resources/assets/oc2/models/item/redstone_interface.json delete mode 100644 src/main/resources/assets/oc2/models/item/redstone_interface_card.json delete mode 100644 src/main/resources/assets/oc2/models/item/sound_card.json delete mode 100644 src/main/resources/assets/oc2/models/item/transistor.json delete mode 100644 src/main/resources/assets/oc2/models/item/vxlan_hub.json delete mode 100644 src/main/resources/assets/oc2/models/item/wrench.json delete mode 100644 src/main/resources/assets/oc2/sounds.json rename src/main/resources/assets/{oc2 => oc2r}/blockstates/bus_cable.json (77%) rename src/main/resources/assets/{oc2 => oc2r}/blockstates/charger.json (54%) rename src/main/resources/assets/{oc2/blockstates/vxlan_hub.json => oc2r/blockstates/computer.json} (54%) create mode 100644 src/main/resources/assets/oc2r/blockstates/creative_energy.json create mode 100644 src/main/resources/assets/oc2r/blockstates/disk_drive.json create mode 100644 src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json rename src/main/resources/assets/{oc2 => oc2r}/blockstates/keyboard.json (53%) rename src/main/resources/assets/{oc2 => oc2r}/blockstates/monitor.json (55%) rename src/main/resources/assets/{oc2 => oc2r}/blockstates/network_connector.json (57%) rename src/main/resources/assets/{oc2 => oc2r}/blockstates/network_hub.json (52%) rename src/main/resources/assets/{oc2 => oc2r}/blockstates/network_switch.json (50%) rename src/main/resources/assets/{oc2 => oc2r}/blockstates/pci_card_cage.json (54%) rename src/main/resources/assets/{oc2 => oc2r}/blockstates/projector.json (56%) create mode 100644 src/main/resources/assets/oc2r/blockstates/redstone_interface.json rename src/main/resources/assets/{oc2/blockstates/disk_drive.json => oc2r/blockstates/vxlan_hub.json} (53%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/basics.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/bus_cable.md (86%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/bus_interface.md (94%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/charger.md (80%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/computer.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/disk_drive.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/flash_memory_flasher.md (93%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/index.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/keyboard.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/monitor.md (97%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/network_connector.md (90%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/network_hub.md (83%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/projector.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/block/redstone_interface.md (97%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/getting_started.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/index.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/block_operations_module.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/file_import_export_card.md (92%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/flash_memory.md (77%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/floppy.md (73%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/hard_drive.md (86%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/index.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/inventory_operations_module.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/manual.md (73%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/memory.md (87%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/network_cable.md (87%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/network_interface_card.md (94%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/network_tunnel_card.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/network_tunnel_module.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/redstone_interface_card.md (88%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/robot.md (98%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/sound_card.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/item/wrench.md (80%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/networking.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/robotics.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/en_us/scripting.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/img/getting_started_basics.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/img/getting_started_energy.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/img/getting_started_inventory.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/img/getting_started_login.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/img/scripting_lamp.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/img/scripting_lua_interactive.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/img/scripting_redstone_interface.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/basics.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/bus_cable.md (79%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/bus_interface.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/charger.md (92%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/computer.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/disk_drive.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/index.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/keyboard.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/network_connector.md (89%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/network_hub.md (86%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/projector.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/block/redstone_interface.md (97%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/getting_started.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/index.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/block_operations_module.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/file_import_export_card.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/flash_memory.md (89%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/floppy.md (88%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/hard_drive.md (92%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/index.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/inventory_operations_module.md (97%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/manual.md (80%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/memory.md (96%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/network_cable.md (87%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/network_interface_card.md (94%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/network_tunnel_card.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/network_tunnel_module.md (95%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/redstone_interface_card.md (86%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/robot.md (99%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/sound_card.md (97%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/item/wrench.md (87%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/networking.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/robotics.md (100%) rename src/main/resources/assets/{oc2 => oc2r}/doc/ru_ru/scripting.md (100%) create mode 100644 src/main/resources/assets/oc2r/lang/en_us.json create mode 100644 src/main/resources/assets/oc2r/lang/ru_ru.json create mode 100644 src/main/resources/assets/oc2r/lang/zh_cn.json create mode 100644 src/main/resources/assets/oc2r/models/block/cable_base.json create mode 100644 src/main/resources/assets/oc2r/models/block/cable_link.json create mode 100644 src/main/resources/assets/oc2r/models/block/cable_plug.json create mode 100644 src/main/resources/assets/oc2r/models/block/cable_straight.json create mode 100644 src/main/resources/assets/oc2r/models/block/cable_support.json create mode 100644 src/main/resources/assets/oc2r/models/block/charger.json create mode 100644 src/main/resources/assets/oc2r/models/block/computer.json rename src/main/resources/assets/{oc2 => oc2r}/models/block/creative_energy.json (59%) create mode 100644 src/main/resources/assets/oc2r/models/block/disk_drive.json create mode 100644 src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json create mode 100644 src/main/resources/assets/oc2r/models/block/keyboard.json create mode 100644 src/main/resources/assets/oc2r/models/block/monitor.json rename src/main/resources/assets/{oc2 => oc2r}/models/block/monitor.mtl (100%) rename src/main/resources/assets/{oc2 => oc2r}/models/block/monitor.obj (100%) create mode 100644 src/main/resources/assets/oc2r/models/block/network_connector.json create mode 100644 src/main/resources/assets/oc2r/models/block/network_hub.json rename src/main/resources/assets/{oc2 => oc2r}/models/block/network_switch.json (97%) create mode 100644 src/main/resources/assets/oc2r/models/block/pci_card_cage.json create mode 100644 src/main/resources/assets/oc2r/models/block/projector.json create mode 100644 src/main/resources/assets/oc2r/models/block/redstone_interface.json rename src/main/resources/assets/{oc2 => oc2r}/models/block/vxlan_hub.json (97%) create mode 100644 src/main/resources/assets/oc2r/models/item/block_operations_module.json rename src/main/resources/assets/{oc2 => oc2r}/models/item/bus_cable.json (95%) rename src/main/resources/assets/{oc2 => oc2r}/models/item/bus_interface.json (96%) create mode 100644 src/main/resources/assets/oc2r/models/item/charger.json create mode 100644 src/main/resources/assets/oc2r/models/item/circuit_board.json create mode 100644 src/main/resources/assets/oc2r/models/item/computer.json rename src/main/resources/assets/{oc2 => oc2r}/models/item/cpu_tier_1.json (63%) create mode 100644 src/main/resources/assets/oc2r/models/item/cpu_tier_2.json create mode 100644 src/main/resources/assets/oc2r/models/item/cpu_tier_3.json rename src/main/resources/assets/{oc2 => oc2r}/models/item/cpu_tier_4.json (63%) create mode 100644 src/main/resources/assets/oc2r/models/item/creative_energy.json create mode 100644 src/main/resources/assets/oc2r/models/item/disk_drive.json create mode 100644 src/main/resources/assets/oc2r/models/item/file_import_export_card.json create mode 100644 src/main/resources/assets/oc2r/models/item/flash_memory.json rename src/main/resources/assets/{oc2 => oc2r}/models/item/flash_memory_custom.json (62%) create mode 100644 src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json create mode 100644 src/main/resources/assets/oc2r/models/item/floppy.json create mode 100644 src/main/resources/assets/oc2r/models/item/floppy_modern.json create mode 100644 src/main/resources/assets/oc2r/models/item/hard_drive_custom.json create mode 100644 src/main/resources/assets/oc2r/models/item/hard_drive_extra_large.json create mode 100644 src/main/resources/assets/oc2r/models/item/hard_drive_large.json create mode 100644 src/main/resources/assets/oc2r/models/item/hard_drive_medium.json create mode 100644 src/main/resources/assets/oc2r/models/item/hard_drive_small.json create mode 100644 src/main/resources/assets/oc2r/models/item/inventory_operations_module.json create mode 100644 src/main/resources/assets/oc2r/models/item/keyboard.json rename src/main/resources/assets/{oc2/models/item/cpu_tier_2.json => oc2r/models/item/manual.json} (64%) rename src/main/resources/assets/{oc2 => oc2r}/models/item/memory_extra_large.json (58%) create mode 100644 src/main/resources/assets/oc2r/models/item/memory_large.json create mode 100644 src/main/resources/assets/oc2r/models/item/memory_medium.json create mode 100644 src/main/resources/assets/oc2r/models/item/memory_small.json create mode 100644 src/main/resources/assets/oc2r/models/item/monitor.json create mode 100644 src/main/resources/assets/oc2r/models/item/network_cable.json rename src/main/resources/assets/{oc2 => oc2r}/models/item/network_connector.json (89%) create mode 100644 src/main/resources/assets/oc2r/models/item/network_hub.json create mode 100644 src/main/resources/assets/oc2r/models/item/network_interface_card.json create mode 100644 src/main/resources/assets/oc2r/models/item/network_switch.json create mode 100644 src/main/resources/assets/oc2r/models/item/network_tunnel_card.json create mode 100644 src/main/resources/assets/oc2r/models/item/network_tunnel_module.json create mode 100644 src/main/resources/assets/oc2r/models/item/pci_card_cage.json create mode 100644 src/main/resources/assets/oc2r/models/item/projector.json create mode 100644 src/main/resources/assets/oc2r/models/item/redstone_interface.json create mode 100644 src/main/resources/assets/oc2r/models/item/redstone_interface_card.json rename src/main/resources/assets/{oc2 => oc2r}/models/item/robot.json (100%) create mode 100644 src/main/resources/assets/oc2r/models/item/sound_card.json create mode 100644 src/main/resources/assets/oc2r/models/item/transistor.json create mode 100644 src/main/resources/assets/oc2r/models/item/vxlan_hub.json rename src/main/resources/assets/{oc2/models/item/cpu_tier_3.json => oc2r/models/item/wrench.json} (64%) rename src/main/resources/assets/{oc2 => oc2r}/shaders/core/projectors.fsh (100%) rename src/main/resources/assets/{oc2 => oc2r}/shaders/core/projectors.json (95%) rename src/main/resources/assets/{oc2 => oc2r}/shaders/core/projectors.vsh (100%) create mode 100644 src/main/resources/assets/oc2r/sounds.json rename src/main/resources/assets/{oc2 => oc2r}/sounds/computer_running.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_access1.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_access2.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_access3.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_access4.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_access5.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_access6.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_eject.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/floppy_insert.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/hdd_access1.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/hdd_access2.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/hdd_access3.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/hdd_access4.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/hdd_access5.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/hdd_access6.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/sounds/hdd_access7.ogg (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/cable_base/cable_base_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/cable_link/cable_link_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/cable_plug/cable_plug_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/cable_straight/cable_straight_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/cable_support/cable_support_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/charger/charger_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/charger/charger_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/charger/charger_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/charger/charger_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/charger/effect.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_atlas4.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_overlay_power.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_overlay_status.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/computer/computer_overlay_terminal.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/creative_energy.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/disk_drive/disk_drive_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/disk_drive/disk_drive_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/disk_drive/disk_drive_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/disk_drive/disk_drive_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/keyboard/keyboard_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/keyboard/keyboard_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/monitor/monitor.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/monitor/monitor_overlay_power.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_connector/network_connector_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_hub/network_hub_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_hub/network_hub_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_hub/network_hub_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_hub/network_hub_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_switch/network_switch_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_switch/network_switch_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_switch/network_switch_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/network_switch/network_switch_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/pci_card_cage/pci_card_cage_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/pci_card_cage/pci_card_cage_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/pci_card_cage/pci_card_cage_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/pci_card_cage/pci_card_cage_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/pci_card_cage/pci_card_cage_atlas4.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/pci_card_cage/pci_card_cage_atlas5.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/pci_card_cage/pci_card_cage_atlas6.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/projector/projector_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/projector/projector_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/projector/projector_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/projector/projector_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/projector/projector_atlas4.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/projector/projector_atlas5.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/projector/projector_atlas6.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/redstone_interface/redstone_interface_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/redstone_interface/redstone_interface_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/redstone_interface/redstone_interface_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/redstone_interface/redstone_interface_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/redstone_interface/redstone_interface_atlas4.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/vxlan_hub/vxlan_hub_atlas0.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/vxlan_hub/vxlan_hub_atlas1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/vxlan_hub/vxlan_hub_atlas2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/block/vxlan_hub/vxlan_hub_atlas3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/entity/robot/robot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/font/OFL.TXT (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/font/monospace.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/font/terminus.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/manual/home.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/manual/manual.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/manual/scroll_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/manual/tab_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/overlay/block_face_disabled.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/overlay/block_face_enabled.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/overlay/block_face_focused.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/overlay/slot_info.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/overlay/slot_selection.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/overlay/slot_warn.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/overlay/terminal_focused.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/bus_interface_screen.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/cancel_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/computer_container.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/confirm_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/energy.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/hotbar.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/input_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/inventory_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/monitor_screen.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/monitor_sidebar_1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/network_interface_card_screen.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/network_tunnel_link_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/network_tunnel_screen.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/power_button.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/robot_container.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/sidebar_2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/sidebar_3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/gui/widget/terminal_screen.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/backlight.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/block_operations_module.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/card_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/circuit_board.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/cpu_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/cpu_tier_1.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/cpu_tier_2.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/cpu_tier_3.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/cpu_tier_4.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/file_import_export_card.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/file_import_export_card.png.mcmeta (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/flash_memory.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/flash_memory_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/floppy_base.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/floppy_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/floppy_tint.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/front_display_glass.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/hard_disk_platter.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/hard_drive_base.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/hard_drive_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/hard_drive_tint.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/inventory_operations_module.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/lcd_display.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/liquid_crystal_layers.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/manual.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/memory_extra_large.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/memory_large.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/memory_medium.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/memory_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/memory_small.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/motor.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/network_cable.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/network_interface_card.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/network_tunnel_card.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/network_tunnel_module.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/network_tunnel_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/polarization_filter.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/redstone_interface_card.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/robot_module_slot.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/sound_card.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/transistor.png (100%) rename src/main/resources/assets/{oc2 => oc2r}/textures/item/wrench.png (100%) delete mode 100644 src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_large.json delete mode 100644 src/main/resources/data/oc2/file_systems/scripts.json delete mode 100644 src/main/resources/data/oc2/item_tag_filters/oc2/hard_drive.json delete mode 100644 src/main/resources/data/oc2/item_tag_filters/oc2/memory.json delete mode 100644 src/main/resources/data/oc2/recipes/flash_memory_custom.json delete mode 100644 src/main/resources/data/oc2/recipes/hard_drive_custom.json delete mode 100644 src/main/resources/data/oc2/tags/blocks/devices.json delete mode 100644 src/main/resources/data/oc2/tags/blocks/wrench_breakable.json delete mode 100644 src/main/resources/data/oc2/tags/items/device_needs_reboot.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/card.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/cpu.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/flash_memory.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/floppy.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/hard_drive.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/memory.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/network_tunnel.json delete mode 100644 src/main/resources/data/oc2/tags/items/devices/robot_module.json delete mode 100644 src/main/resources/data/oc2/tags/items/tool_materials.json rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/block_operations_module.json (80%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/bus_cable.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/bus_interface.json (83%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/charger.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/circuit_board.json (83%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/computer.json (85%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/disk_drive.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/file_import_export_card.json (80%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/flash_memory.json (85%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common/hard_drive_extra_large.json => oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json} (83%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/floppy.json (85%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/floppy_modern.json (83%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/hard_drive_custom.json (84%) create mode 100644 src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_extra_large.json rename src/main/resources/data/{oc2/advancements/recipes/oc2.common/memory_extra_large.json => oc2r/advancements/recipes/oc2r.common/hard_drive_large.json} (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/hard_drive_medium.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/hard_drive_small.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/inventory_operations_module.json (79%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/keyboard.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/manual.json (89%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common/flash_memory_custom.json => oc2r/advancements/recipes/oc2r.common/memory_extra_large.json} (83%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/memory_large.json (85%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/memory_medium.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/memory_small.json (85%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/network_cable.json (82%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/network_connector.json (82%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/network_hub.json (83%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/network_interface_card.json (80%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/network_tunnel_card.json (81%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/network_tunnel_module.json (81%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/projector.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/redstone_interface.json (81%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/redstone_interface_card.json (80%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/robot.json (85%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/sound_card.json (84%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/transistor.json (89%) rename src/main/resources/data/{oc2/advancements/recipes/oc2.common => oc2r/advancements/recipes/oc2r.common}/wrench.json (85%) rename src/main/resources/data/{oc2 => oc2r}/file_systems/README.md (93%) create mode 100644 src/main/resources/data/oc2r/file_systems/scripts.json rename src/main/resources/data/{oc2 => oc2r}/item_tag_filters/minecraft/common.json (100%) create mode 100644 src/main/resources/data/oc2r/item_tag_filters/oc2r/hard_drive.json create mode 100644 src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/charger.json (89%) rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/computer.json (95%) rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/disk_drive.json (88%) rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/keyboard.json (89%) rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/network_connector.json (86%) rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/network_hub.json (88%) rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/projector.json (88%) rename src/main/resources/data/{oc2 => oc2r}/loot_tables/blocks/redstone_interface.json (86%) rename src/main/resources/data/{oc2 => oc2r}/recipes/block_operations_module.json (70%) rename src/main/resources/data/{oc2 => oc2r}/recipes/bus_cable.json (80%) rename src/main/resources/data/{oc2 => oc2r}/recipes/bus_interface.json (53%) rename src/main/resources/data/{oc2 => oc2r}/recipes/charger.json (78%) rename src/main/resources/data/{oc2 => oc2r}/recipes/circuit_board.json (75%) rename src/main/resources/data/{oc2 => oc2r}/recipes/computer.json (67%) rename src/main/resources/data/{oc2 => oc2r}/recipes/disk_drive.json (71%) rename src/main/resources/data/{oc2 => oc2r}/recipes/file_import_export_card.json (69%) rename src/main/resources/data/{oc2 => oc2r}/recipes/flash_memory.json (71%) create mode 100644 src/main/resources/data/oc2r/recipes/flash_memory_custom.json rename src/main/resources/data/{oc2 => oc2r}/recipes/flash_memory_flasher.json (70%) rename src/main/resources/data/{oc2 => oc2r}/recipes/floppy.json (72%) rename src/main/resources/data/{oc2 => oc2r}/recipes/floppy_modern.json (72%) create mode 100644 src/main/resources/data/oc2r/recipes/hard_drive_custom.json rename src/main/resources/data/{oc2 => oc2r}/recipes/hard_drive_extra_large.json (71%) rename src/main/resources/data/{oc2 => oc2r}/recipes/hard_drive_large.json (70%) rename src/main/resources/data/{oc2 => oc2r}/recipes/hard_drive_medium.json (70%) rename src/main/resources/data/{oc2 => oc2r}/recipes/hard_drive_small.json (70%) rename src/main/resources/data/{oc2 => oc2r}/recipes/inventory_operations_module.json (68%) rename src/main/resources/data/{oc2 => oc2r}/recipes/keyboard.json (68%) rename src/main/resources/data/{oc2 => oc2r}/recipes/manual.json (55%) rename src/main/resources/data/{oc2 => oc2r}/recipes/memory_extra_large.json (72%) rename src/main/resources/data/{oc2 => oc2r}/recipes/memory_large.json (68%) rename src/main/resources/data/{oc2 => oc2r}/recipes/memory_medium.json (67%) rename src/main/resources/data/{oc2 => oc2r}/recipes/memory_small.json (68%) rename src/main/resources/data/{oc2 => oc2r}/recipes/network_cable.json (78%) rename src/main/resources/data/{oc2 => oc2r}/recipes/network_connector.json (77%) rename src/main/resources/data/{oc2 => oc2r}/recipes/network_hub.json (58%) rename src/main/resources/data/{oc2 => oc2r}/recipes/network_interface_card.json (68%) rename src/main/resources/data/{oc2 => oc2r}/recipes/network_tunnel_card.json (70%) rename src/main/resources/data/{oc2 => oc2r}/recipes/network_tunnel_module.json (69%) rename src/main/resources/data/{oc2 => oc2r}/recipes/projector.json (71%) rename src/main/resources/data/{oc2 => oc2r}/recipes/redstone_interface.json (66%) rename src/main/resources/data/{oc2 => oc2r}/recipes/redstone_interface_card.json (69%) rename src/main/resources/data/{oc2 => oc2r}/recipes/robot.json (69%) rename src/main/resources/data/{oc2 => oc2r}/recipes/sound_card.json (72%) rename src/main/resources/data/{oc2 => oc2r}/recipes/transistor.json (89%) rename src/main/resources/data/{oc2 => oc2r}/recipes/unflash.json (57%) rename src/main/resources/data/{oc2 => oc2r}/recipes/wrench.json (76%) rename src/main/resources/data/{oc2 => oc2r}/tags/blocks/cables.json (63%) create mode 100644 src/main/resources/data/oc2r/tags/blocks/devices.json create mode 100644 src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json rename src/main/resources/data/{oc2 => oc2r}/tags/items/cables.json (63%) create mode 100644 src/main/resources/data/oc2r/tags/items/device_needs_reboot.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/card.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/cpu.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/flash_memory.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/floppy.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/hard_drive.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/memory.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json create mode 100644 src/main/resources/data/oc2r/tags/items/devices/robot_module.json create mode 100644 src/main/resources/data/oc2r/tags/items/tool_materials.json rename src/main/resources/data/{oc2 => oc2r}/tags/items/tool_materials/diamond.json (100%) rename src/main/resources/data/{oc2 => oc2r}/tags/items/tool_materials/gold.json (100%) rename src/main/resources/data/{oc2 => oc2r}/tags/items/tool_materials/iron.json (100%) rename src/main/resources/data/{oc2 => oc2r}/tags/items/tool_materials/netherite.json (100%) rename src/main/resources/data/{oc2 => oc2r}/tags/items/tool_materials/stone.json (100%) rename src/main/resources/data/{oc2 => oc2r}/tags/items/tool_materials/wood.json (100%) rename src/main/resources/data/{oc2 => oc2r}/tags/items/wrenches.json (66%) rename src/main/resources/{mixins.oc2.json => mixins.oc2r.json} (76%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 1ef3d791..76884ad0 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] - - OC2: [e.g. 0.1.7] + - oc2r: [e.g. 0.1.7] **Additional context** Add any other context about the problem here. diff --git a/README.md b/README.md index 297d0a8e..78bebcac 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,32 @@ -# OpenComputers II +# OpenComputers II: Reimagined -OpenComputers II is a Minecraft mod adding virtual computers to the game. These computers run a virtual machine emulating a 64-Bit RISC-V architecture capable of booting Linux. On top of this, a high-level Lua API is provided to communicate with various devices in the game world. This enables adding virtual devices using a simple, Java-friendly API, without having to implement actual kernel drivers. +*OpenComputers II: Reimagined* is a Minecraft mod adding virtual computers to the game. It is a fork of the mod originally made by [Sangar (fnuecke)], this fork is maintained North Western Development. These computers run a virtual machine emulating a 64-Bit RISC-V architecture capable of booting Linux. On top of this, a high-level Lua API is provided to communicate with various devices in the game world. This enables adding virtual devices using a simple, Java-friendly API, without having to implement actual kernel drivers. -This mod is a successor to [OpenComputers]. At least in spirit. While many of the implementation details have changed quite dramatically, the core concepts of customizable hardware, persistence and sand-boxing are shared. +The original mod was a successor to [OpenComputers]. At least in spirit. While many of the implementation details have changed quite dramatically, the core concepts of customizable hardware, persistence and sand-boxing are shared. + +The underlying VM, which is written entirely in Java, is called [Sedna] and was written by [Sangar (fnuecke)] as well. + +## Why the Fork? + +*OpenComputers II: Reimagined* aims to fix bugs with OC2 while adding new features and attempting to keep up with the latest popular versions of Minecraft. We did attempt to reach [Sangar (fnuecke)] on Twitter but got no response, so we've decided to continue with the fork and releasing separately on Curse under a new name. +The name change is simply an attempt to ensure it is well known that [Sangar (fnuecke)] is not responsible for this version, so they're not blasted with issues from it. We will be doing everything we can to ensure [Sangar (fnuecke)] does still get the credit they deserve for the mod though. ## Gameplay Documentation For documentation on how the to get computers up and running, and how to use them, see the [documentation]. It is available as a manual item in the game. ## Development Documentation -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]. +The original section that was found here is preserved below, however it should be taken with a grain of salt as the current team has a ways to go in being 100% up to speed with where the device APIs are at the moment. So everything below is subject to change, though it is likely to remain mostly the same. -## Building -To build this project, credentials for the Github Package Repository must be set up once on your machine (see -[the documentation][GithubPackagesGradle] for more information). In short, you'll want to add your username and a -public access token with `read:packages` permissions into your `~/.gradle/gradle.properties`. The properties must be -named `gpr.user` and `gpr.key`. +~~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/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 +[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 [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 ed1e7d23..51136599 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ def getGitRef() { } version = "${semver}+${getGitRef()}" -group = "li.cil.oc2" +group = "li.cil.oc2r" java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -105,7 +105,7 @@ System.setProperty("line.separator", "\n") task packageScripts(type: Zip) { archiveFileName = "scripts.zip" - destinationDirectory = file("$buildDir/resources/main/data/oc2/file_systems") + destinationDirectory = file("$buildDir/resources/main/data/oc2r/file_systems") from "src/main/scripts" filter { line -> line } } @@ -130,7 +130,7 @@ minecraft { property "forge.logging.console.level", "debug" mods { - oc2 { + oc2r { source sourceSets.main } } @@ -138,30 +138,30 @@ minecraft { client { workingDirectory project.file("runclient") - property "forge.enabledGameTestNamespaces", "oc2" + property "forge.enabledGameTestNamespaces", "oc2r" } server { workingDirectory project.file("run") - property "forge.enabledGameTestNamespaces", "oc2" + property "forge.enabledGameTestNamespaces", "oc2r" arg "--nogui" } gameTestServer { workingDirectory project.file('run') - property "forge.enabledGameTestNamespaces", "oc2" + property "forge.enabledGameTestNamespaces", "oc2r" } data { workingDirectory project.file("run") - args "--mod", "oc2", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources") + args "--mod", "oc2r", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources") } } } mixin { - add sourceSets.main, "mixins.oc2.refmap.json" - config "mixins.oc2.json" + add sourceSets.main, "mixins.oc2r.refmap.json" + config "mixins.oc2r.json" // quiet } @@ -178,14 +178,14 @@ jar { manifest { attributes([ "FMLAT" : "accesstransformer.cfg", - "Specification-Title" : "oc2", - "Specification-Vendor" : "Sangar", + "Specification-Title" : "oc2r", + "Specification-Vendor" : "North Western Development (Originally by Sangar)", "Specification-Version" : "1", "Implementation-Title" : project.name, "Implementation-Version" : "${semver}", - "Implementation-Vendor" : "Sangar", + "Implementation-Vendor" : "North Western Development (Originally by Sangar)", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - "MixinConfigs" : "mixins.oc2.json", + "MixinConfigs" : "mixins.oc2r.json", "ContainedDeps" : "commons-collections4-4.4.jar" ]) } @@ -195,7 +195,7 @@ task apiJar(type: Jar) { archiveClassifier.set("api") from sourceSets.main.allSource from sourceSets.main.output - include "li/cil/oc2/api/**" + include "li/cil/oc2r/api/**" } artifacts { diff --git a/gradle.properties b/gradle.properties index f568ae6b..eaa54414 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ org.gradle.daemon=false forge_version=47.2.32 -semver=0.0.0 +semver=1.0.0 curse_project_id=437654 diff --git a/settings.gradle b/settings.gradle index ca232508..20743bf8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { } apply from: 'minecraft.gradle' -rootProject.name = "oc2-${minecraft_version}-${minecraft_sdk}" +rootProject.name = "oc2r-${minecraft_version}-${minecraft_sdk}" def substituteLocal(final directoryName, final libraryName) { final def path = new File("../${directoryName}"); diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java deleted file mode 100644 index b67780c0..00000000 --- a/src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device.vm.context; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java deleted file mode 100644 index 08173178..00000000 --- a/src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device.vm.event; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/terminal/package-info.java b/src/main/java/li/cil/oc2/client/gui/terminal/package-info.java deleted file mode 100644 index 6dc108fe..00000000 --- a/src/main/java/li/cil/oc2/client/gui/terminal/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.gui.terminal; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/util/package-info.java b/src/main/java/li/cil/oc2/client/gui/util/package-info.java deleted file mode 100644 index 811d7482..00000000 --- a/src/main/java/li/cil/oc2/client/gui/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.gui.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/widget/package-info.java b/src/main/java/li/cil/oc2/client/gui/widget/package-info.java deleted file mode 100644 index 6f146b0c..00000000 --- a/src/main/java/li/cil/oc2/client/gui/widget/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.gui.widget; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/item/package-info.java b/src/main/java/li/cil/oc2/client/item/package-info.java deleted file mode 100644 index 248854e6..00000000 --- a/src/main/java/li/cil/oc2/client/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/manual/package-info.java b/src/main/java/li/cil/oc2/client/manual/package-info.java deleted file mode 100644 index bd104786..00000000 --- a/src/main/java/li/cil/oc2/client/manual/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.manual; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/model/package-info.java b/src/main/java/li/cil/oc2/client/model/package-info.java deleted file mode 100644 index 4ab66041..00000000 --- a/src/main/java/li/cil/oc2/client/model/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.model; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java deleted file mode 100644 index f6447fba..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.blockentity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/color/package-info.java b/src/main/java/li/cil/oc2/client/renderer/color/package-info.java deleted file mode 100644 index b08b3562..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/color/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.color; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java b/src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java deleted file mode 100644 index a5c06b5e..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.entity.model; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/entity/package-info.java b/src/main/java/li/cil/oc2/client/renderer/entity/package-info.java deleted file mode 100644 index b313dc7f..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/entity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.entity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/font/package-info.java b/src/main/java/li/cil/oc2/client/renderer/font/package-info.java deleted file mode 100644 index dd9ccdf3..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/font/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.font; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/package-info.java b/src/main/java/li/cil/oc2/client/renderer/package-info.java deleted file mode 100644 index b523eaeb..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/block/package-info.java b/src/main/java/li/cil/oc2/common/block/package-info.java deleted file mode 100644 index b2e6d494..00000000 --- a/src/main/java/li/cil/oc2/common/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/blockentity/package-info.java b/src/main/java/li/cil/oc2/common/blockentity/package-info.java deleted file mode 100644 index b2284550..00000000 --- a/src/main/java/li/cil/oc2/common/blockentity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.blockentity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java deleted file mode 100644 index 9d18d60e..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java +++ /dev/null @@ -1,8 +0,0 @@ -package li.cil.oc2.common.bus.device; - -import li.cil.oc2.common.bus.AbstractDeviceBusElement; - - -public class BlockDeviceBusElement extends AbstractDeviceBusElement { - -} diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/data/package-info.java deleted file mode 100644 index 14b9d74a..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/data/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.data; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/package-info.java deleted file mode 100644 index c6a315b1..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java deleted file mode 100644 index 8a13946f..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java deleted file mode 100644 index 093cd2f9..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java deleted file mode 100644 index c16cf596..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java deleted file mode 100644 index 7bea9b40..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java deleted file mode 100644 index ab99897f..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.rpc.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java deleted file mode 100644 index 48db9acd..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.rpc.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java deleted file mode 100644 index 799d6786..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.rpc; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/util/package-info.java deleted file mode 100644 index 1d3a4176..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java deleted file mode 100644 index 299a373f..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.vm.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java deleted file mode 100644 index 802bfe1e..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.vm.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java deleted file mode 100644 index d78998d9..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.vm; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/package-info.java b/src/main/java/li/cil/oc2/common/bus/package-info.java deleted file mode 100644 index 5c01aa7e..00000000 --- a/src/main/java/li/cil/oc2/common/bus/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/capabilities/package-info.java b/src/main/java/li/cil/oc2/common/capabilities/package-info.java deleted file mode 100644 index 1083fb2c..00000000 --- a/src/main/java/li/cil/oc2/common/capabilities/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.capabilities; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/container/package-info.java b/src/main/java/li/cil/oc2/common/container/package-info.java deleted file mode 100644 index 9a3c9402..00000000 --- a/src/main/java/li/cil/oc2/common/container/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.container; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/energy/package-info.java b/src/main/java/li/cil/oc2/common/energy/package-info.java deleted file mode 100644 index d26d50ce..00000000 --- a/src/main/java/li/cil/oc2/common/energy/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.energy; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/entity/package-info.java b/src/main/java/li/cil/oc2/common/entity/package-info.java deleted file mode 100644 index 92a5fd21..00000000 --- a/src/main/java/li/cil/oc2/common/entity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.entity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/package-info.java b/src/main/java/li/cil/oc2/common/entity/robot/package-info.java deleted file mode 100644 index 4c4d8f26..00000000 --- a/src/main/java/li/cil/oc2/common/entity/robot/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.entity.robot; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/ext/package-info.java b/src/main/java/li/cil/oc2/common/ext/package-info.java deleted file mode 100644 index e7fc99ec..00000000 --- a/src/main/java/li/cil/oc2/common/ext/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.ext; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/integration/jei/package-info.java b/src/main/java/li/cil/oc2/common/integration/jei/package-info.java deleted file mode 100644 index fdd08fd5..00000000 --- a/src/main/java/li/cil/oc2/common/integration/jei/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.integration.jei; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/integration/package-info.java b/src/main/java/li/cil/oc2/common/integration/package-info.java deleted file mode 100644 index a9b0fdf9..00000000 --- a/src/main/java/li/cil/oc2/common/integration/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.integration; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/item/crafting/package-info.java b/src/main/java/li/cil/oc2/common/item/crafting/package-info.java deleted file mode 100644 index b5f62d13..00000000 --- a/src/main/java/li/cil/oc2/common/item/crafting/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.item.crafting; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/item/package-info.java b/src/main/java/li/cil/oc2/common/item/package-info.java deleted file mode 100644 index 63a35021..00000000 --- a/src/main/java/li/cil/oc2/common/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/mixin/package-info.java b/src/main/java/li/cil/oc2/common/mixin/package-info.java deleted file mode 100644 index 1811d92a..00000000 --- a/src/main/java/li/cil/oc2/common/mixin/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.mixin; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/network/message/package-info.java b/src/main/java/li/cil/oc2/common/network/message/package-info.java deleted file mode 100644 index 2958dc13..00000000 --- a/src/main/java/li/cil/oc2/common/network/message/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.network.message; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/network/package-info.java b/src/main/java/li/cil/oc2/common/network/package-info.java deleted file mode 100644 index 452145b8..00000000 --- a/src/main/java/li/cil/oc2/common/network/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.network; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/package-info.java b/src/main/java/li/cil/oc2/common/package-info.java deleted file mode 100644 index 0670c71c..00000000 --- a/src/main/java/li/cil/oc2/common/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java b/src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java deleted file mode 100644 index 4ecb1685..00000000 --- a/src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.serialization.ceres; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/package-info.java b/src/main/java/li/cil/oc2/common/serialization/gson/package-info.java deleted file mode 100644 index 1071e17e..00000000 --- a/src/main/java/li/cil/oc2/common/serialization/gson/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.serialization.gson; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/package-info.java b/src/main/java/li/cil/oc2/common/serialization/package-info.java deleted file mode 100644 index 50764906..00000000 --- a/src/main/java/li/cil/oc2/common/serialization/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.serialization; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/tags/package-info.java b/src/main/java/li/cil/oc2/common/tags/package-info.java deleted file mode 100644 index 8c8a0e5f..00000000 --- a/src/main/java/li/cil/oc2/common/tags/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.tags; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/util/package-info.java b/src/main/java/li/cil/oc2/common/util/package-info.java deleted file mode 100644 index 500f2929..00000000 --- a/src/main/java/li/cil/oc2/common/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/global/package-info.java deleted file mode 100644 index 55d4086b..00000000 --- a/src/main/java/li/cil/oc2/common/vm/context/global/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.context.global; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java deleted file mode 100644 index 1e0a9e06..00000000 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.context.managed; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/context/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/package-info.java deleted file mode 100644 index f3b27499..00000000 --- a/src/main/java/li/cil/oc2/common/vm/context/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.context; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/fs/package-info.java b/src/main/java/li/cil/oc2/common/vm/fs/package-info.java deleted file mode 100644 index a94c4a31..00000000 --- a/src/main/java/li/cil/oc2/common/vm/fs/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.fs; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/package-info.java b/src/main/java/li/cil/oc2/common/vm/package-info.java deleted file mode 100644 index 780a7292..00000000 --- a/src/main/java/li/cil/oc2/common/vm/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/API.java b/src/main/java/li/cil/oc2r/api/API.java similarity index 78% rename from src/main/java/li/cil/oc2/api/API.java rename to src/main/java/li/cil/oc2r/api/API.java index cff37dfc..d2824560 100644 --- a/src/main/java/li/cil/oc2/api/API.java +++ b/src/main/java/li/cil/oc2r/api/API.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api; +package li.cil.oc2r.api; import com.google.gson.GsonBuilder; -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 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 java.lang.reflect.Type; public final class API { - public static final String MOD_ID = "oc2"; + public static final String MOD_ID = "oc2r"; /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/api/README.md b/src/main/java/li/cil/oc2r/api/README.md similarity index 92% rename from src/main/java/li/cil/oc2/api/README.md rename to src/main/java/li/cil/oc2r/api/README.md index dbf62c69..5da3fd24 100644 --- a/src/main/java/li/cil/oc2/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 `oc2`, fellow developer! This document will hopefully provide a sufficient overview of what +Welcome to the API of `oc2r`, 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,9 +150,9 @@ In this example, a device is made available for a custom `BlockEntity`. Using capabilities: ```java -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 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 net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.capabilities.Capability; @@ -166,7 +166,7 @@ class ModBlockEntity extends BlockEntity { @Override public LazyOptional getCapability(Capability cap, @Nullable Direction side) { - if (ModList.get().isLoaded("oc2")) { + if (ModList.get().isLoaded("oc2r")) { // 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(); @@ -187,7 +187,8 @@ class ModBlockEntity extends BlockEntity { } class Integration { - public static final Capability DEVICE_CAPABILITY = CapabilityManager.get(new CapabilityToken<>() { }); + public static final Capability DEVICE_CAPABILITY = CapabilityManager.get(new CapabilityToken<>() { + }); public static RPCDevice createDevice(ModBlockEntity blockEntity) { return new ObjectDevice(new ModBlockEntityDevice(blockEntity)); @@ -210,7 +211,7 @@ class Integration { Using the `Callback` annotation in the `BlockEntity` (hard dependency): ```java -import li.cil.oc2.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.Callback; import net.minecraft.world.level.block.entity.BlockEntity; class ModBlockEntity extends BlockEntity { @@ -227,15 +228,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 `oc2` is present, this is a +. As long as the registration of the `BlockDeviceProvider` is gated behind a check, whether `oc2r` is present, this is a soft dependency. Using `ObjectDevice`: ```java -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 li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; import net.minecraft.world.level.block.entity.BlockEntity; class MyCalculatorDevice { @@ -263,14 +263,14 @@ class ModDeviceProvider extends ForgeRegistryEntry implemen Using the `RPCDevice` and `RPCMethods` interfaces directly: ```java -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 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 net.minecraft.world.level.block.entity.FurnaceBlockEntity; import java.util.Collections; @@ -332,15 +332,15 @@ class ModDeviceProvider extends ForgeRegistryEntry implemen Shared device provider registration: ```java -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; class Providers { static final DeferredRegister BLOCK_DEVICE_PROVIDERS = - DeferredRegister.create(BlockDeviceProvider.class, "my_mod_id"); + DeferredRegister.create(BlockDeviceProvider.class, "my_mod_id"); - // Called from mod initialization, if oc2 is present. + // Called from mod initialization, if oc2r is present. static void initialize() { BLOCK_DEVICE_PROVIDERS.register("my_calculator_device", ModDeviceProvider::new); diff --git a/src/main/java/li/cil/oc2/api/bus/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java similarity index 96% rename from src/main/java/li/cil/oc2/api/bus/BlockDeviceBusElement.java rename to src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java index 29129e3f..b4c62709 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus; +package li.cil.oc2r.api.bus; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2/api/bus/DeviceBus.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/DeviceBus.java rename to src/main/java/li/cil/oc2r/api/bus/DeviceBus.java index cbbc90b6..075ccfd9 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus; +package li.cil.oc2r.api.bus; -import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.Device; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2/api/bus/DeviceBusController.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/DeviceBusController.java rename to src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java index 4c37b137..1f00442c 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus; +package li.cil.oc2r.api.bus; -import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.Device; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2/api/bus/DeviceBusElement.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/DeviceBusElement.java rename to src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java index 53d11696..dfe7a813 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus; +package li.cil.oc2r.api.bus; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; import net.minecraftforge.common.util.LazyOptional; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2/api/bus/device/Device.java b/src/main/java/li/cil/oc2r/api/bus/device/Device.java similarity index 92% rename from src/main/java/li/cil/oc2/api/bus/device/Device.java rename to src/main/java/li/cil/oc2r/api/bus/device/Device.java index 6a6b699b..b7a43d39 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.bus.DeviceBus; -import li.cil.oc2.api.bus.DeviceBusController; +import li.cil.oc2r.api.bus.DeviceBus; +import li.cil.oc2r.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/oc2/api/bus/device/DeviceType.java b/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/DeviceType.java rename to src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java index fbd949a0..e785a73b 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.API; +import li.cil.oc2r.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/oc2/api/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java similarity index 67% rename from src/main/java/li/cil/oc2/api/bus/device/DeviceTypes.java rename to src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java index 88e0d6c7..b4b9c4bc 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.RegistryObject; @@ -10,15 +10,15 @@ import net.minecraftforge.registries.RegistryObject; * Lists built-in device types for convenience. */ public final class DeviceTypes { - public static final DeviceType MEMORY = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "memory"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); + public static final DeviceType MEMORY = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "memory"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); - public static final DeviceType HARD_DRIVE = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "hard_drive"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); + public static final DeviceType HARD_DRIVE = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "hard_drive"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); - public static final DeviceType FLASH_MEMORY = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "flash_memory"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); - public static final DeviceType CARD = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "card"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); - public static final DeviceType ROBOT_MODULE = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "robot_module"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); + public static final DeviceType FLASH_MEMORY = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "flash_memory"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); + public static final DeviceType CARD = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "card"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); + public static final DeviceType ROBOT_MODULE = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "robot_module"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); - public static final DeviceType FLOPPY = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "floppy"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); - public static final DeviceType NETWORK_TUNNEL = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "network_tunnel"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); - public static final DeviceType CPU = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "cpu"), new ResourceLocation("oc2", "device_type"), API.MOD_ID).get(); + public static final DeviceType FLOPPY = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "floppy"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); + public static final DeviceType NETWORK_TUNNEL = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "network_tunnel"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); + public static final DeviceType CPU = (DeviceType) RegistryObject.create(new ResourceLocation(API.MOD_ID, "cpu"), new ResourceLocation(API.MOD_ID, "device_type"), API.MOD_ID).get(); } diff --git a/src/main/java/li/cil/oc2/api/bus/device/ItemDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java similarity index 93% rename from src/main/java/li/cil/oc2/api/bus/device/ItemDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java index a9c2d999..a460d37a 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java b/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java similarity index 81% rename from src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java rename to src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java index c796b4bd..40bc7a51 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.data; +package li.cil.oc2r.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 oc2.base} referencing the implementation's registry id + * string tag {@code oc2r.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 ? oc2:hard_drive{oc2:{data:"my_mod:my_block_device"}}
+ * /give ? oc2r:hard_drive{oc2r:{data:"my_mod:my_block_device"}}
  *
* The drive can be made readonly by also specifying the {@code readonly} tag: * 
- * /give ? oc2:hard_drive{oc2:{data:"my_mod:my_block_device",readonly:true}}
+ * /give ? oc2r:hard_drive{oc2r:{data:"my_mod:my_block_device",readonly:true}}
  *
*/ public interface BlockDeviceData { diff --git a/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java b/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java similarity index 87% rename from src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java rename to src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java index ecfd0ab0..791e5013 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.data; +package li.cil.oc2r.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 oc2.firmware} referencing the implementation's registry name + * string tag {@code oc2r.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 oc2:flash_memory{oc2:{firmware:"my_mod:my_firmware"}}
+ * /give @p oc2r:flash_memory{oc2r:{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 new file mode 100644 index 00000000..54007429 --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device.data; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/object/Callback.java b/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java similarity index 91% rename from src/main/java/li/cil/oc2/api/bus/device/object/Callback.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java index ae350414..07986a82 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.object; +package li.cil.oc2r.api.bus.device.object; -import li.cil.oc2.api.bus.device.rpc.RPCMethod; +import li.cil.oc2r.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.oc2.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. + * via {@link li.cil.oc2r.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java b/src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java index 2fccd3ef..ae6896dd 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.object; +package li.cil.oc2r.api.bus.device.object; -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 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 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/oc2/api/bus/device/object/DocumentedDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java similarity index 98% rename from src/main/java/li/cil/oc2/api/bus/device/object/DocumentedDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java index f840bae0..22adf2d5 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.object; +package li.cil.oc2r.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/oc2/api/bus/device/object/LifecycleAwareDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java similarity index 89% rename from src/main/java/li/cil/oc2/api/bus/device/object/LifecycleAwareDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java index aedd908b..fd4bc8b8 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.object; +package li.cil.oc2r.api.bus.device.object; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.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/oc2/api/bus/device/object/NamedDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/device/object/NamedDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java index 0001a66f..e28af06f 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.object; +package li.cil.oc2r.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/oc2/api/bus/device/object/ObjectDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java index 2e237764..ffffc3d2 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.object; +package li.cil.oc2r.api.bus.device.object; -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 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 javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2/api/bus/device/object/Parameter.java b/src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/object/Parameter.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java index 86226498..23276549 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.object; +package li.cil.oc2r.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 new file mode 100644 index 00000000..9151568c --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device.object; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; 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 new file mode 100644 index 00000000..169ce7b5 --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceProvider.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java similarity index 85% rename from src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceProvider.java rename to src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java index 6c1eab63..cf59de58 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.provider; +package li.cil.oc2r.api.bus.device.provider; -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 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 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.oc2.api.bus.DeviceBus} more than once. An example where this can occur are + * {@link li.cil.oc2r.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.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 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 BlockDeviceQuery */ public interface BlockDeviceProvider { diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java rename to src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java index 5781523a..ff014567 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.provider; +package li.cil.oc2r.api.bus.device.provider; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java similarity index 89% rename from src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java index b860fd6e..a53a92ed 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.provider; +package li.cil.oc2r.api.bus.device.provider; -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 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 net.minecraft.nbt.CompoundTag; import javax.annotation.Nullable; @@ -36,9 +36,9 @@ import java.util.Optional; * } * * - * @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 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 ItemDeviceQuery */ public interface ItemDeviceProvider { diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java rename to src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java index 9bed31a5..4d29d709 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.provider; +package li.cil.oc2r.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 new file mode 100644 index 00000000..cb72d743 --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device.provider; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/AbstractRPCMethod.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java similarity index 98% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/AbstractRPCMethod.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java index c6397ad8..b78ffebb 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java similarity index 92% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java index 68942d14..bbea5262 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; -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 li.cil.oc2r.api.bus.DeviceBus; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; import java.util.List; @@ -47,8 +47,8 @@ import java.util.List; * * * @see ObjectDevice - * @see li.cil.oc2.api.bus.device.provider.BlockDeviceProvider - * @see li.cil.oc2.api.bus.device.provider.ItemDeviceProvider + * @see li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider + * @see li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider */ public interface RPCDevice extends Device { /** diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCInvocation.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCInvocation.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java index e4c0c6f9..4db63dc4 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethod.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethod.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java index ac9b7a05..3adfd861 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; -import li.cil.oc2.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.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.oc2.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. + * via {@link li.cil.oc2r.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. * * @see ObjectDevice */ diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethodGroup.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethodGroup.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java index 74cf93cc..570e4e67 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; -import li.cil.oc2.api.bus.DeviceBusController; +import li.cil.oc2r.api.bus.DeviceBusController; import java.util.Collections; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCParameter.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java similarity index 96% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCParameter.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java index 51f9ecff..61d15bbc 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/api/bus/device/data/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java similarity index 83% rename from src/main/java/li/cil/oc2/api/bus/device/data/package-info.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java index 47ed0659..bdd7e92f 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/data/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.oc2.api.bus.device.data; +package li.cil.oc2r.api.bus.device.rpc; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/FirmwareLoader.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java similarity index 89% rename from src/main/java/li/cil/oc2/api/bus/device/vm/FirmwareLoader.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java index f93a4cd4..b66e4949 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm; +package li.cil.oc2r.api.bus.device.vm; /** * This interface serves as a marker for devices that load firmware. diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/VMDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java similarity index 89% rename from src/main/java/li/cil/oc2/api/bus/device/vm/VMDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java index a6574819..7a13998b 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm; +package li.cil.oc2r.api.bus.device.vm; -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.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.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.oc2.api.bus.device.provider.BlockDeviceProvider - * @see li.cil.oc2.api.bus.device.provider.ItemDeviceProvider + * @see li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider + * @see li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider */ public interface VMDevice extends Device { /** diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/VMDeviceLoadResult.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/device/vm/VMDeviceLoadResult.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java index f8cf523c..5b504669 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm; +package li.cil.oc2r.api.bus.device.vm; -import li.cil.oc2.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; import net.minecraft.network.chat.Component; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/context/InterruptAllocator.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java similarity index 92% rename from src/main/java/li/cil/oc2/api/bus/device/vm/context/InterruptAllocator.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java index fb7fb991..d69853e9 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.context; +package li.cil.oc2r.api.bus.device.vm.context; -import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; import java.util.Optional; import java.util.OptionalInt; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryAllocator.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java similarity index 90% rename from src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryAllocator.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java index 084e1847..9244d2ce 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.context; +package li.cil.oc2r.api.bus.device.vm.context; /** * A memory allocator used to ensure sandbox limits when loading devices. diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryRangeAllocator.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryRangeAllocator.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java index f148d6aa..3195723a 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.context; +package li.cil.oc2r.api.bus.device.vm.context; -import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; import li.cil.sedna.api.device.MemoryMappedDevice; import java.util.OptionalLong; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/context/VMContext.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java similarity index 96% rename from src/main/java/li/cil/oc2/api/bus/device/vm/context/VMContext.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java index e3090cea..0b253157 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.context; +package li.cil.oc2r.api.bus.device.vm.context; -import li.cil.oc2.api.bus.DeviceBus; -import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.DeviceBus; +import li.cil.oc2r.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/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java similarity index 57% rename from src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java index de272ddb..9d85db3f 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.context; +package li.cil.oc2r.api.bus.device.vm.context; /** * Allows registering for VM lifecycle events. * - * @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 + * @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 */ 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 new file mode 100644 index 00000000..d1de369e --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device.vm.context; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializationException.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializationException.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java index fb6c6ee2..6f779716 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.event; +package li.cil.oc2r.api.bus.device.vm.event; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializingEvent.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java similarity index 84% rename from src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializingEvent.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java index f264abf5..fc254d37 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.event; +package li.cil.oc2r.api.bus.device.vm.event; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; /** * Fired exactly once, when the VM first starts running. diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/event/VMResumedRunningEvent.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java similarity index 79% rename from src/main/java/li/cil/oc2/api/bus/device/vm/event/VMResumedRunningEvent.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java index 628726ea..42f93ee3 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.event; +package li.cil.oc2r.api.bus.device.vm.event; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.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/oc2/api/bus/device/vm/event/VMSynchronizeEvent.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java similarity index 93% rename from src/main/java/li/cil/oc2/api/bus/device/vm/event/VMSynchronizeEvent.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java index af0f69b3..d201c0c8 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.device.vm.event; +package li.cil.oc2r.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 new file mode 100644 index 00000000..e4a4edd3 --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device.vm.event; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java similarity index 84% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/package-info.java rename to src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java index c3668cf1..f699c021 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/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.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.vm; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/package-info.java b/src/main/java/li/cil/oc2r/api/bus/package-info.java similarity index 75% rename from src/main/java/li/cil/oc2/api/bus/package-info.java rename to src/main/java/li/cil/oc2r/api/bus/package-info.java index 89ba550b..ca439a80 100644 --- a/src/main/java/li/cil/oc2/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.oc2.api.bus.DeviceBusController}. + * A bus must always be managed by a {@link li.cil.oc2r.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.oc2.api.bus.DeviceBusElement}s thus defining a - * {@link li.cil.oc2.api.bus.DeviceBus}. + * {@link li.cil.oc2r.api.bus.DeviceBusElement}s thus defining a + * {@link li.cil.oc2r.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.oc2.api.bus.DeviceBusElement}s are responsible for + * {@link li.cil.oc2r.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.oc2.api.bus.DeviceBusController}s then + * After a scan {@link li.cil.oc2r.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.oc2.api.bus.device.rpc.RPCDevice} - * and {@link li.cil.oc2.api.bus.device.vm.VMDevice}. + * 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}. *

    *
  • * RPC devices are a high-level system for providing VMs with means of @@ -42,7 +42,7 @@ */ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus; +package li.cil.oc2r.api.bus; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/capabilities/NetworkInterface.java b/src/main/java/li/cil/oc2r/api/capabilities/NetworkInterface.java similarity index 96% rename from src/main/java/li/cil/oc2/api/capabilities/NetworkInterface.java rename to src/main/java/li/cil/oc2r/api/capabilities/NetworkInterface.java index a228ed95..6ad5dba1 100644 --- a/src/main/java/li/cil/oc2/api/capabilities/NetworkInterface.java +++ b/src/main/java/li/cil/oc2r/api/capabilities/NetworkInterface.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.capabilities; +package li.cil.oc2r.api.capabilities; -import li.cil.oc2.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.ItemDevice; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/api/capabilities/RedstoneEmitter.java b/src/main/java/li/cil/oc2r/api/capabilities/RedstoneEmitter.java similarity index 93% rename from src/main/java/li/cil/oc2/api/capabilities/RedstoneEmitter.java rename to src/main/java/li/cil/oc2r/api/capabilities/RedstoneEmitter.java index 1d50a2ac..51293231 100644 --- a/src/main/java/li/cil/oc2/api/capabilities/RedstoneEmitter.java +++ b/src/main/java/li/cil/oc2r/api/capabilities/RedstoneEmitter.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.capabilities; +package li.cil.oc2r.api.capabilities; /** * This interface may be provided as a capability by item components to signal diff --git a/src/main/java/li/cil/oc2/api/capabilities/Robot.java b/src/main/java/li/cil/oc2r/api/capabilities/Robot.java similarity index 95% rename from src/main/java/li/cil/oc2/api/capabilities/Robot.java rename to src/main/java/li/cil/oc2r/api/capabilities/Robot.java index 248c443a..671af64b 100644 --- a/src/main/java/li/cil/oc2/api/capabilities/Robot.java +++ b/src/main/java/li/cil/oc2r/api/capabilities/Robot.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.capabilities; +package li.cil.oc2r.api.capabilities; import net.minecraftforge.items.ItemStackHandler; diff --git a/src/main/java/li/cil/oc2/api/capabilities/TerminalUserProvider.java b/src/main/java/li/cil/oc2r/api/capabilities/TerminalUserProvider.java similarity index 84% rename from src/main/java/li/cil/oc2/api/capabilities/TerminalUserProvider.java rename to src/main/java/li/cil/oc2r/api/capabilities/TerminalUserProvider.java index 1e4ed50e..b6b3afa4 100644 --- a/src/main/java/li/cil/oc2/api/capabilities/TerminalUserProvider.java +++ b/src/main/java/li/cil/oc2r/api/capabilities/TerminalUserProvider.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.capabilities; +package li.cil.oc2r.api.capabilities; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/package-info.java b/src/main/java/li/cil/oc2r/api/capabilities/package-info.java similarity index 84% rename from src/main/java/li/cil/oc2/api/bus/device/vm/package-info.java rename to src/main/java/li/cil/oc2r/api/capabilities/package-info.java index 6f100586..4575d615 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/vm/package-info.java +++ b/src/main/java/li/cil/oc2r/api/capabilities/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device.vm; +package li.cil.oc2r.api.capabilities; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/imc/RPCMethodParameterTypeAdapter.java b/src/main/java/li/cil/oc2r/api/imc/RPCMethodParameterTypeAdapter.java similarity index 88% rename from src/main/java/li/cil/oc2/api/imc/RPCMethodParameterTypeAdapter.java rename to src/main/java/li/cil/oc2r/api/imc/RPCMethodParameterTypeAdapter.java index 7af1d69d..d1344f7a 100644 --- a/src/main/java/li/cil/oc2/api/imc/RPCMethodParameterTypeAdapter.java +++ b/src/main/java/li/cil/oc2r/api/imc/RPCMethodParameterTypeAdapter.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.imc; +package li.cil.oc2r.api.imc; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/api/util/package-info.java b/src/main/java/li/cil/oc2r/api/imc/package-info.java similarity index 87% rename from src/main/java/li/cil/oc2/api/util/package-info.java rename to src/main/java/li/cil/oc2r/api/imc/package-info.java index 2ee5b311..20c0c7ba 100644 --- a/src/main/java/li/cil/oc2/api/util/package-info.java +++ b/src/main/java/li/cil/oc2r/api/imc/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.util; +package li.cil.oc2r.api.imc; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/package-info.java b/src/main/java/li/cil/oc2r/api/package-info.java similarity index 89% rename from src/main/java/li/cil/oc2/api/package-info.java rename to src/main/java/li/cil/oc2r/api/package-info.java index cd72a3a6..eabd85b5 100644 --- a/src/main/java/li/cil/oc2/api/package-info.java +++ b/src/main/java/li/cil/oc2r/api/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api; +package li.cil.oc2r.api; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/util/Invalidatable.java b/src/main/java/li/cil/oc2r/api/util/Invalidatable.java similarity index 96% rename from src/main/java/li/cil/oc2/api/util/Invalidatable.java rename to src/main/java/li/cil/oc2r/api/util/Invalidatable.java index 83fe4cc1..8e3de7c5 100644 --- a/src/main/java/li/cil/oc2/api/util/Invalidatable.java +++ b/src/main/java/li/cil/oc2r/api/util/Invalidatable.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.util; +package li.cil.oc2r.api.util; -import li.cil.oc2.common.util.RunnableUtils; +import li.cil.oc2r.common.util.RunnableUtils; import java.util.ArrayList; import java.util.List; @@ -11,7 +11,7 @@ import java.util.function.Consumer; import java.util.function.Function; /** - * Wrapper for objects which may become invalid, such as {@link li.cil.oc2.api.bus.device.Device}s. + * Wrapper for objects which may become invalid, such as {@link li.cil.oc2r.api.bus.device.Device}s. *

    * This implementation allows listeners added via {@link #addListener(Consumer)} to be removed again * using the returned token. This allows avoiding memory leaks due to inversion of reference ownership, diff --git a/src/main/java/li/cil/oc2/api/util/Registries.java b/src/main/java/li/cil/oc2r/api/util/Registries.java similarity index 81% rename from src/main/java/li/cil/oc2/api/util/Registries.java rename to src/main/java/li/cil/oc2r/api/util/Registries.java index 3d01cdb0..d9e6faa9 100644 --- a/src/main/java/li/cil/oc2/api/util/Registries.java +++ b/src/main/java/li/cil/oc2r/api/util/Registries.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.util; +package li.cil.oc2r.api.util; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.data.BlockDeviceData; -import li.cil.oc2.api.bus.device.data.Firmware; -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.data.BlockDeviceData; +import li.cil.oc2r.api.bus.device.data.Firmware; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/api/util/RobotOperationSide.java b/src/main/java/li/cil/oc2r/api/util/RobotOperationSide.java similarity index 98% rename from src/main/java/li/cil/oc2/api/util/RobotOperationSide.java rename to src/main/java/li/cil/oc2r/api/util/RobotOperationSide.java index b3a9694e..5665a57b 100644 --- a/src/main/java/li/cil/oc2/api/util/RobotOperationSide.java +++ b/src/main/java/li/cil/oc2r/api/util/RobotOperationSide.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.util; +package li.cil.oc2r.api.util; import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2/api/util/Side.java b/src/main/java/li/cil/oc2r/api/util/Side.java similarity index 92% rename from src/main/java/li/cil/oc2/api/util/Side.java rename to src/main/java/li/cil/oc2r/api/util/Side.java index baded973..04e3df09 100644 --- a/src/main/java/li/cil/oc2/api/util/Side.java +++ b/src/main/java/li/cil/oc2r/api/util/Side.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.util; +package li.cil.oc2r.api.util; import net.minecraft.core.Direction; @@ -9,7 +9,7 @@ import javax.annotation.Nullable; /** * This enum indicates a side of a block device. *

    - * It is intended to be used by {@link li.cil.oc2.api.bus.device.rpc.RPCDevice} APIs, + * It is intended to be used by {@link li.cil.oc2r.api.bus.device.rpc.RPCDevice} APIs, * providing both convenience for the caller by providing a range of aliases, and also * stability, in case Mojang decide to rename the enum fields of the {@link Direction} * enum at some time in the future. diff --git a/src/main/java/li/cil/oc2r/api/util/package-info.java b/src/main/java/li/cil/oc2r/api/util/package-info.java new file mode 100644 index 00000000..6df16f55 --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/util/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.util; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/ClientSetup.java b/src/main/java/li/cil/oc2r/client/ClientSetup.java similarity index 81% rename from src/main/java/li/cil/oc2/client/ClientSetup.java rename to src/main/java/li/cil/oc2r/client/ClientSetup.java index d704d3c2..32808c13 100644 --- a/src/main/java/li/cil/oc2/client/ClientSetup.java +++ b/src/main/java/li/cil/oc2r/client/ClientSetup.java @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client; +package li.cil.oc2r.client; -import li.cil.oc2.client.gui.*; -import li.cil.oc2.client.item.CustomItemColors; -import li.cil.oc2.client.item.CustomItemModelProperties; -import li.cil.oc2.client.model.BusCableModelLoader; -import li.cil.oc2.client.renderer.BusInterfaceNameRenderer; -import li.cil.oc2.client.renderer.ProjectorDepthRenderer; -import li.cil.oc2.client.renderer.blockentity.*; -import li.cil.oc2.client.renderer.color.BusCableBlockColor; -import li.cil.oc2.client.renderer.entity.RobotRenderer; -import li.cil.oc2.client.renderer.entity.model.RobotModel; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.container.Containers; -import li.cil.oc2.common.entity.Entities; +import li.cil.oc2r.client.gui.*; +import li.cil.oc2r.client.item.CustomItemColors; +import li.cil.oc2r.client.item.CustomItemModelProperties; +import li.cil.oc2r.client.model.BusCableModelLoader; +import li.cil.oc2r.client.renderer.BusInterfaceNameRenderer; +import li.cil.oc2r.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2r.client.renderer.blockentity.*; +import li.cil.oc2r.client.renderer.color.BusCableBlockColor; +import li.cil.oc2r.client.renderer.entity.RobotRenderer; +import li.cil.oc2r.client.renderer.entity.model.RobotModel; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.container.Containers; +import li.cil.oc2r.common.entity.Entities; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.renderer.ItemBlockRenderTypes; @@ -61,7 +61,7 @@ public final class ClientSetup { @SubscribeEvent public static void handleModelRegistryEvent(final RegisterGeometryLoaders event) { - event.register(Blocks.BUS_CABLE.getId().toString().replace("oc2:", ""), new BusCableModelLoader()); + event.register(Blocks.BUS_CABLE.getId().toString().replace("oc2r:", ""), new BusCableModelLoader()); } @SubscribeEvent diff --git a/src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java b/src/main/java/li/cil/oc2r/client/audio/LoopingBlockEntitySound.java similarity index 96% rename from src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java rename to src/main/java/li/cil/oc2r/client/audio/LoopingBlockEntitySound.java index 8cf84f4e..16d5f1e9 100644 --- a/src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java +++ b/src/main/java/li/cil/oc2r/client/audio/LoopingBlockEntitySound.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.audio; +package li.cil.oc2r.client.audio; -import li.cil.oc2.common.util.TickUtils; +import li.cil.oc2r.common.util.TickUtils; import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java b/src/main/java/li/cil/oc2r/client/audio/LoopingSoundManager.java similarity index 97% rename from src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java rename to src/main/java/li/cil/oc2r/client/audio/LoopingSoundManager.java index d7e26f39..dc57818c 100644 --- a/src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java +++ b/src/main/java/li/cil/oc2r/client/audio/LoopingSoundManager.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.audio; +package li.cil.oc2r.client.audio; import net.minecraft.client.Minecraft; import net.minecraft.sounds.SoundEvent; diff --git a/src/main/java/li/cil/oc2r/client/audio/package-info.java b/src/main/java/li/cil/oc2r/client/audio/package-info.java new file mode 100644 index 00000000..4f94272c --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/audio/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.audio; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractMachineInventoryScreen.java similarity index 93% rename from src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java rename to src/main/java/li/cil/oc2r/client/gui/AbstractMachineInventoryScreen.java index e8814e5c..914ad6c7 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/AbstractMachineInventoryScreen.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.client.gui.util.GuiUtils; -import li.cil.oc2.client.gui.widget.ImageButton; -import li.cil.oc2.client.gui.widget.ToggleImageButton; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.container.AbstractMachineTerminalContainer; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.client.gui.util.GuiUtils; +import li.cil.oc2r.client.gui.widget.ImageButton; +import li.cil.oc2r.client.gui.widget.ToggleImageButton; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.container.AbstractMachineTerminalContainer; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.narration.NarrationElementOutput; @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import static java.util.Arrays.asList; -import static li.cil.oc2.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2r.common.util.TextFormatUtils.withFormat; @OnlyIn(Dist.CLIENT) public abstract class AbstractMachineInventoryScreen extends AbstractModContainerScreen { diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractMachineTerminalScreen.java similarity index 96% rename from src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java rename to src/main/java/li/cil/oc2r/client/gui/AbstractMachineTerminalScreen.java index e0a34b75..bf3c328d 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/AbstractMachineTerminalScreen.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.platform.InputConstants; -import li.cil.oc2.client.gui.widget.ImageButton; -import li.cil.oc2.client.gui.widget.ToggleImageButton; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.container.AbstractMachineTerminalContainer; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.client.gui.widget.ImageButton; +import li.cil.oc2r.client.gui.widget.ToggleImageButton; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.container.AbstractMachineTerminalContainer; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import static java.util.Arrays.asList; -import static li.cil.oc2.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2r.common.util.TextFormatUtils.withFormat; @OnlyIn(Dist.CLIENT) public abstract class AbstractMachineTerminalScreen extends AbstractModContainerScreen { diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractModContainerScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractModContainerScreen.java similarity index 98% rename from src/main/java/li/cil/oc2/client/gui/AbstractModContainerScreen.java rename to src/main/java/li/cil/oc2r/client/gui/AbstractModContainerScreen.java index a1763056..e116abcd 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractModContainerScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/AbstractModContainerScreen.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMonitorDisplayScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractMonitorDisplayScreen.java similarity index 96% rename from src/main/java/li/cil/oc2/client/gui/AbstractMonitorDisplayScreen.java rename to src/main/java/li/cil/oc2r/client/gui/AbstractMonitorDisplayScreen.java index fa3ec14c..6098671c 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractMonitorDisplayScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/AbstractMonitorDisplayScreen.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.platform.InputConstants; -import li.cil.oc2.client.gui.widget.ToggleImageButton; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.container.AbstractMonitorContainer; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.client.gui.widget.ToggleImageButton; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.container.AbstractMonitorContainer; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; @@ -21,7 +21,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import java.util.List; import static java.util.Arrays.asList; -import static li.cil.oc2.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2r.common.util.TextFormatUtils.withFormat; @OnlyIn(Dist.CLIENT) public abstract class AbstractMonitorDisplayScreen extends AbstractModContainerScreen { diff --git a/src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java b/src/main/java/li/cil/oc2r/client/gui/BusInterfaceScreen.java similarity index 92% rename from src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java rename to src/main/java/li/cil/oc2r/client/gui/BusInterfaceScreen.java index bc573753..14aff918 100644 --- a/src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/BusInterfaceScreen.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import li.cil.oc2.client.gui.widget.ImageButton; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.BusInterfaceNameMessage; +import li.cil.oc2r.client.gui.widget.ImageButton; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.blockentity.BusCableBlockEntity; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.BusInterfaceNameMessage; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.narration.NarrationElementOutput; @@ -18,7 +18,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.phys.Vec3; import org.lwjgl.glfw.GLFW; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class BusInterfaceScreen extends Screen { private static final int TEXT_LEFT = 9; diff --git a/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java b/src/main/java/li/cil/oc2r/client/gui/ComputerContainerScreen.java similarity index 91% rename from src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java rename to src/main/java/li/cil/oc2r/client/gui/ComputerContainerScreen.java index 3fd92cad..faeff012 100644 --- a/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/ComputerContainerScreen.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; -import li.cil.oc2.common.container.ComputerInventoryContainer; +import li.cil.oc2r.common.container.ComputerInventoryContainer; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java b/src/main/java/li/cil/oc2r/client/gui/ComputerTerminalScreen.java similarity index 90% rename from src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java rename to src/main/java/li/cil/oc2r/client/gui/ComputerTerminalScreen.java index 674cd1fc..f77150e9 100644 --- a/src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/ComputerTerminalScreen.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; -import li.cil.oc2.common.container.ComputerTerminalContainer; +import li.cil.oc2r.common.container.ComputerTerminalContainer; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/src/main/java/li/cil/oc2/client/gui/FileChooserScreen.java b/src/main/java/li/cil/oc2r/client/gui/FileChooserScreen.java similarity index 99% rename from src/main/java/li/cil/oc2/client/gui/FileChooserScreen.java rename to src/main/java/li/cil/oc2r/client/gui/FileChooserScreen.java index 5153d6da..0b84ed32 100644 --- a/src/main/java/li/cil/oc2/client/gui/FileChooserScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/FileChooserScreen.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.vertex.Tesselator; import net.minecraft.ChatFormatting; @@ -24,9 +24,8 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.function.Supplier; -import java.util.stream.Collectors; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class FileChooserScreen extends Screen { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java b/src/main/java/li/cil/oc2r/client/gui/KeyCodeMapping.java similarity index 99% rename from src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java rename to src/main/java/li/cil/oc2r/client/gui/KeyCodeMapping.java index ea820e9d..8c41a1c9 100644 --- a/src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java +++ b/src/main/java/li/cil/oc2r/client/gui/KeyCodeMapping.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import it.unimi.dsi.fastutil.ints.Int2IntArrayMap; import li.cil.sedna.evdev.EvdevKeys; diff --git a/src/main/java/li/cil/oc2/client/gui/KeyboardScreen.java b/src/main/java/li/cil/oc2r/client/gui/KeyboardScreen.java similarity index 95% rename from src/main/java/li/cil/oc2/client/gui/KeyboardScreen.java rename to src/main/java/li/cil/oc2r/client/gui/KeyboardScreen.java index a6a31fc0..a3ace960 100644 --- a/src/main/java/li/cil/oc2/client/gui/KeyboardScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/KeyboardScreen.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; -import li.cil.oc2.common.blockentity.KeyboardBlockEntity; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.KeyboardInputMessage; +import li.cil.oc2r.common.blockentity.KeyboardBlockEntity; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.KeyboardInputMessage; import net.minecraft.client.Minecraft; import net.minecraft.client.MouseHandler; import net.minecraft.client.gui.GuiGraphics; @@ -27,7 +27,7 @@ public final class KeyboardScreen extends Screen { private static final float ARM_SWING_RATE = 0.8f; private static final int BORDER_COLOR = 0xFFFFFFFF; - private static final MutableComponent CLOSE_INFO = Component.translatable("gui.oc2.keyboard.close_info"); + private static final MutableComponent CLOSE_INFO = Component.translatable("gui.oc2r.keyboard.close_info"); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java b/src/main/java/li/cil/oc2r/client/gui/MachineTerminalWidget.java similarity index 97% rename from src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java rename to src/main/java/li/cil/oc2r/client/gui/MachineTerminalWidget.java index acba38f3..cba87519 100644 --- a/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java +++ b/src/main/java/li/cil/oc2r/client/gui/MachineTerminalWidget.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; import org.joml.Matrix4f; -import li.cil.oc2.client.gui.terminal.TerminalInput; -import li.cil.oc2.common.container.AbstractMachineTerminalContainer; -import li.cil.oc2.common.vm.Terminal; +import li.cil.oc2r.client.gui.terminal.TerminalInput; +import li.cil.oc2r.common.container.AbstractMachineTerminalContainer; +import li.cil.oc2r.common.vm.Terminal; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/client/gui/MonitorDisplayScreen.java b/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayScreen.java similarity index 92% rename from src/main/java/li/cil/oc2/client/gui/MonitorDisplayScreen.java rename to src/main/java/li/cil/oc2r/client/gui/MonitorDisplayScreen.java index 6a0c184b..466ea3ac 100644 --- a/src/main/java/li/cil/oc2/client/gui/MonitorDisplayScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayScreen.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; -import li.cil.oc2.common.container.MonitorDisplayContainer; +import li.cil.oc2r.common.container.MonitorDisplayContainer; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/src/main/java/li/cil/oc2/client/gui/MonitorDisplayWidget.java b/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayWidget.java similarity index 94% rename from src/main/java/li/cil/oc2/client/gui/MonitorDisplayWidget.java rename to src/main/java/li/cil/oc2r/client/gui/MonitorDisplayWidget.java index 8f9a785d..824b01cc 100644 --- a/src/main/java/li/cil/oc2/client/gui/MonitorDisplayWidget.java +++ b/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayWidget.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; -import li.cil.oc2.client.renderer.MonitorGUIRenderer; -import li.cil.oc2.common.bus.device.vm.block.MonitorDevice; -import li.cil.oc2.common.container.AbstractMonitorContainer; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.MonitorInputMessage; -import li.cil.oc2.common.vm.Terminal; +import li.cil.oc2r.client.renderer.MonitorGUIRenderer; +import li.cil.oc2r.common.bus.device.vm.block.MonitorDevice; +import li.cil.oc2r.common.container.AbstractMonitorContainer; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.MonitorInputMessage; +import li.cil.oc2r.common.vm.Terminal; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/li/cil/oc2/client/gui/NetworkInterfaceCardScreen.java b/src/main/java/li/cil/oc2r/client/gui/NetworkInterfaceCardScreen.java similarity index 96% rename from src/main/java/li/cil/oc2/client/gui/NetworkInterfaceCardScreen.java rename to src/main/java/li/cil/oc2r/client/gui/NetworkInterfaceCardScreen.java index f13e7bad..40d22357 100644 --- a/src/main/java/li/cil/oc2/client/gui/NetworkInterfaceCardScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/NetworkInterfaceCardScreen.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; @@ -10,12 +10,12 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.item.ItemDisplayContext; import org.joml.Quaternionf; import org.joml.Vector3f; -import li.cil.oc2.client.gui.widget.Texture; -import li.cil.oc2.client.renderer.ModRenderType; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.item.NetworkInterfaceCardItem; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.NetworkInterfaceCardConfigurationMessage; +import li.cil.oc2r.client.gui.widget.Texture; +import li.cil.oc2r.client.renderer.ModRenderType; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.item.NetworkInterfaceCardItem; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.NetworkInterfaceCardConfigurationMessage; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.MultiBufferSource; @@ -37,8 +37,8 @@ import net.minecraft.world.phys.Vec3; import javax.annotation.Nullable; -import static li.cil.oc2.common.util.TranslationUtils.key; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.key; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class NetworkInterfaceCardScreen extends Screen { private static final String SIDE_STATE_TEXT = key("gui.{mod}.network_interface_card.side_state"); diff --git a/src/main/java/li/cil/oc2/client/gui/NetworkTunnelScreen.java b/src/main/java/li/cil/oc2r/client/gui/NetworkTunnelScreen.java similarity index 90% rename from src/main/java/li/cil/oc2/client/gui/NetworkTunnelScreen.java rename to src/main/java/li/cil/oc2r/client/gui/NetworkTunnelScreen.java index 999c5e45..39cd407e 100644 --- a/src/main/java/li/cil/oc2/client/gui/NetworkTunnelScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/NetworkTunnelScreen.java @@ -1,19 +1,19 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import li.cil.oc2.client.gui.widget.ImageButton; -import li.cil.oc2.common.container.NetworkTunnelContainer; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.NetworkTunnelLinkMessage; +import li.cil.oc2r.client.gui.widget.ImageButton; +import li.cil.oc2r.common.container.NetworkTunnelContainer; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.NetworkTunnelLinkMessage; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class NetworkTunnelScreen extends AbstractModContainerScreen { private static final int LINK_BUTTON_LEFT = 48; diff --git a/src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java b/src/main/java/li/cil/oc2r/client/gui/RobotContainerScreen.java similarity index 95% rename from src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java rename to src/main/java/li/cil/oc2r/client/gui/RobotContainerScreen.java index d795ef89..627074df 100644 --- a/src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/RobotContainerScreen.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import li.cil.oc2.common.container.RobotInventoryContainer; +import li.cil.oc2r.common.container.RobotInventoryContainer; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java b/src/main/java/li/cil/oc2r/client/gui/RobotTerminalScreen.java similarity index 94% rename from src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java rename to src/main/java/li/cil/oc2r/client/gui/RobotTerminalScreen.java index 1b83b7e7..81929784 100644 --- a/src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java +++ b/src/main/java/li/cil/oc2r/client/gui/RobotTerminalScreen.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; -import li.cil.oc2.common.container.RobotTerminalContainer; +import li.cil.oc2r.common.container.RobotTerminalContainer; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/client/gui/Sprites.java b/src/main/java/li/cil/oc2r/client/gui/Sprites.java similarity index 96% rename from src/main/java/li/cil/oc2/client/gui/Sprites.java rename to src/main/java/li/cil/oc2r/client/gui/Sprites.java index 0e27f8f2..9146b8f0 100644 --- a/src/main/java/li/cil/oc2/client/gui/Sprites.java +++ b/src/main/java/li/cil/oc2r/client/gui/Sprites.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; -import li.cil.oc2.client.gui.widget.Sprite; +import li.cil.oc2r.client.gui.widget.Sprite; -import static li.cil.oc2.client.gui.Textures.*; +import static li.cil.oc2r.client.gui.Textures.*; public final class Sprites { public static final Sprite COMPUTER_CONTAINER = new Sprite(COMPUTER_CONTAINER_TEXTURE); diff --git a/src/main/java/li/cil/oc2/client/gui/Textures.java b/src/main/java/li/cil/oc2r/client/gui/Textures.java similarity index 97% rename from src/main/java/li/cil/oc2/client/gui/Textures.java rename to src/main/java/li/cil/oc2r/client/gui/Textures.java index 37629866..74aa1af0 100644 --- a/src/main/java/li/cil/oc2/client/gui/Textures.java +++ b/src/main/java/li/cil/oc2r/client/gui/Textures.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui; +package li.cil.oc2r.client.gui; -import li.cil.oc2.client.gui.widget.Texture; +import li.cil.oc2r.client.gui.widget.Texture; public final class Textures { public static final Texture COMPUTER_CONTAINER_TEXTURE = new Texture("textures/gui/widget/computer_container.png", 176, 197); diff --git a/src/main/java/li/cil/oc2r/client/gui/package-info.java b/src/main/java/li/cil/oc2r/client/gui/package-info.java new file mode 100644 index 00000000..6b1a3df4 --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/gui/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.gui; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java b/src/main/java/li/cil/oc2r/client/gui/terminal/TerminalInput.java similarity index 99% rename from src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java rename to src/main/java/li/cil/oc2r/client/gui/terminal/TerminalInput.java index d3bf4797..3a114986 100644 --- a/src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java +++ b/src/main/java/li/cil/oc2r/client/gui/terminal/TerminalInput.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui.terminal; +package li.cil.oc2r.client.gui.terminal; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/li/cil/oc2r/client/gui/terminal/package-info.java b/src/main/java/li/cil/oc2r/client/gui/terminal/package-info.java new file mode 100644 index 00000000..fbd8104e --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/gui/terminal/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.gui.terminal; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java b/src/main/java/li/cil/oc2r/client/gui/util/GuiUtils.java similarity index 91% rename from src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java rename to src/main/java/li/cil/oc2r/client/gui/util/GuiUtils.java index b390f0f9..7bedc876 100644 --- a/src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java +++ b/src/main/java/li/cil/oc2r/client/gui/util/GuiUtils.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui.util; +package li.cil.oc2r.client.gui.util; -import li.cil.oc2.api.bus.device.DeviceType; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.client.gui.widget.Sprite; -import li.cil.oc2.common.container.DeviceTypeSlotItemHandler; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.client.gui.widget.Sprite; +import li.cil.oc2r.common.container.DeviceTypeSlotItemHandler; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; @@ -17,7 +17,7 @@ import net.minecraft.world.inventory.Slot; import java.util.*; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class GuiUtils { private static final Map WARNING_BY_DEVICE_TYPE = Util.make(() -> { diff --git a/src/main/java/li/cil/oc2/api/capabilities/package-info.java b/src/main/java/li/cil/oc2r/client/gui/util/package-info.java similarity index 84% rename from src/main/java/li/cil/oc2/api/capabilities/package-info.java rename to src/main/java/li/cil/oc2r/client/gui/util/package-info.java index e6daf2d8..a89452b5 100644 --- a/src/main/java/li/cil/oc2/api/capabilities/package-info.java +++ b/src/main/java/li/cil/oc2r/client/gui/util/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.capabilities; +package li.cil.oc2r.client.gui.util; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java b/src/main/java/li/cil/oc2r/client/gui/widget/ImageButton.java similarity index 96% rename from src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java rename to src/main/java/li/cil/oc2r/client/gui/widget/ImageButton.java index 5ab921f7..8d9a6437 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java +++ b/src/main/java/li/cil/oc2r/client/gui/widget/ImageButton.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui.widget; +package li.cil.oc2r.client.gui.widget; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.ChatFormatting; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Objects; import static java.util.Collections.emptyList; -import static li.cil.oc2.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2r.common.util.TextFormatUtils.withFormat; public abstract class ImageButton extends AbstractButton { private static final long PRESS_DURATION = 200; diff --git a/src/main/java/li/cil/oc2/client/gui/widget/Sprite.java b/src/main/java/li/cil/oc2r/client/gui/widget/Sprite.java similarity index 97% rename from src/main/java/li/cil/oc2/client/gui/widget/Sprite.java rename to src/main/java/li/cil/oc2r/client/gui/widget/Sprite.java index d0a5be6b..093c0ea3 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/Sprite.java +++ b/src/main/java/li/cil/oc2r/client/gui/widget/Sprite.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui.widget; +package li.cil.oc2r.client.gui.widget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.util.Mth; diff --git a/src/main/java/li/cil/oc2/client/gui/widget/Texture.java b/src/main/java/li/cil/oc2r/client/gui/widget/Texture.java similarity index 89% rename from src/main/java/li/cil/oc2/client/gui/widget/Texture.java rename to src/main/java/li/cil/oc2r/client/gui/widget/Texture.java index 62bdb6b5..fbe072b8 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/Texture.java +++ b/src/main/java/li/cil/oc2r/client/gui/widget/Texture.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui.widget; +package li.cil.oc2r.client.gui.widget; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.resources.ResourceLocation; public final class Texture { diff --git a/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java b/src/main/java/li/cil/oc2r/client/gui/widget/ToggleImageButton.java similarity index 96% rename from src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java rename to src/main/java/li/cil/oc2r/client/gui/widget/ToggleImageButton.java index 67aa72b2..e9199cb7 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java +++ b/src/main/java/li/cil/oc2r/client/gui/widget/ToggleImageButton.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.gui.widget; +package li.cil.oc2r.client.gui.widget; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/package-info.java b/src/main/java/li/cil/oc2r/client/gui/widget/package-info.java new file mode 100644 index 00000000..887b018f --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/gui/widget/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.gui.widget; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/item/CustomItemColors.java b/src/main/java/li/cil/oc2r/client/item/CustomItemColors.java similarity index 97% rename from src/main/java/li/cil/oc2/client/item/CustomItemColors.java rename to src/main/java/li/cil/oc2r/client/item/CustomItemColors.java index 6178db40..d1c4aa1e 100644 --- a/src/main/java/li/cil/oc2/client/item/CustomItemColors.java +++ b/src/main/java/li/cil/oc2r/client/item/CustomItemColors.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.item; +package li.cil.oc2r.client.item; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.common.item.Items; import net.minecraft.client.Minecraft; import net.minecraft.client.color.item.ItemColors; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java b/src/main/java/li/cil/oc2r/client/item/CustomItemModelProperties.java similarity index 94% rename from src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java rename to src/main/java/li/cil/oc2r/client/item/CustomItemModelProperties.java index db49879b..c4f7fe29 100644 --- a/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java +++ b/src/main/java/li/cil/oc2r/client/item/CustomItemModelProperties.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.item; +package li.cil.oc2r.client.item; -import li.cil.oc2.api.API; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.item.Items; import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/client/audio/package-info.java b/src/main/java/li/cil/oc2r/client/item/package-info.java similarity index 86% rename from src/main/java/li/cil/oc2/client/audio/package-info.java rename to src/main/java/li/cil/oc2r/client/item/package-info.java index a58b4026..9a562fbf 100644 --- a/src/main/java/li/cil/oc2/client/audio/package-info.java +++ b/src/main/java/li/cil/oc2r/client/item/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.client.audio; +package li.cil.oc2r.client.item; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/manual/Manuals.java b/src/main/java/li/cil/oc2r/client/manual/Manuals.java similarity index 95% rename from src/main/java/li/cil/oc2/client/manual/Manuals.java rename to src/main/java/li/cil/oc2r/client/manual/Manuals.java index b5f5c3da..ee77e31e 100644 --- a/src/main/java/li/cil/oc2/client/manual/Manuals.java +++ b/src/main/java/li/cil/oc2r/client/manual/Manuals.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.manual; +package li.cil.oc2r.client.manual; import li.cil.manual.api.ManualModel; import li.cil.manual.api.Tab; @@ -12,9 +12,9 @@ import li.cil.manual.api.prefab.tab.TextureTab; import li.cil.manual.api.provider.DocumentProvider; import li.cil.manual.api.provider.PathProvider; import li.cil.manual.api.util.Constants; -import li.cil.oc2.api.API; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.item.Items; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/client/manual/ModManualScreenStyle.java b/src/main/java/li/cil/oc2r/client/manual/ModManualScreenStyle.java similarity index 95% rename from src/main/java/li/cil/oc2/client/manual/ModManualScreenStyle.java rename to src/main/java/li/cil/oc2r/client/manual/ModManualScreenStyle.java index 9d76f805..4fbd9a6a 100644 --- a/src/main/java/li/cil/oc2/client/manual/ModManualScreenStyle.java +++ b/src/main/java/li/cil/oc2r/client/manual/ModManualScreenStyle.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.manual; +package li.cil.oc2r.client.manual; import li.cil.manual.api.ManualScreenStyle; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.client.renderer.Rect2i; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/li/cil/oc2/client/manual/ModManualStyle.java b/src/main/java/li/cil/oc2r/client/manual/ModManualStyle.java similarity index 92% rename from src/main/java/li/cil/oc2/client/manual/ModManualStyle.java rename to src/main/java/li/cil/oc2r/client/manual/ModManualStyle.java index bee9ee3a..762837be 100644 --- a/src/main/java/li/cil/oc2/client/manual/ModManualStyle.java +++ b/src/main/java/li/cil/oc2r/client/manual/ModManualStyle.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.manual; +package li.cil.oc2r.client.manual; import li.cil.manual.api.ManualStyle; import li.cil.manual.api.render.FontRenderer; -import li.cil.oc2.client.renderer.font.MonospaceFontRenderer; +import li.cil.oc2r.client.renderer.font.MonospaceFontRenderer; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/li/cil/oc2/api/bus/device/package-info.java b/src/main/java/li/cil/oc2r/client/manual/package-info.java similarity index 85% rename from src/main/java/li/cil/oc2/api/bus/device/package-info.java rename to src/main/java/li/cil/oc2r/client/manual/package-info.java index 609af817..30ef96b3 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/package-info.java +++ b/src/main/java/li/cil/oc2r/client/manual/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device; +package li.cil.oc2r.client.manual; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java b/src/main/java/li/cil/oc2r/client/model/BusCableBakedModel.java similarity index 97% rename from src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java rename to src/main/java/li/cil/oc2r/client/model/BusCableBakedModel.java index 099114cd..29c81604 100644 --- a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java +++ b/src/main/java/li/cil/oc2r/client/model/BusCableBakedModel.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.model; +package li.cil.oc2r.client.model; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.util.ItemStackUtils; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.block.BusCableBlock; +import li.cil.oc2r.common.blockentity.BusCableBlockEntity; +import li.cil.oc2r.common.util.ItemStackUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.BlockModelShaper; diff --git a/src/main/java/li/cil/oc2/client/model/BusCableModel.java b/src/main/java/li/cil/oc2r/client/model/BusCableModel.java similarity index 97% rename from src/main/java/li/cil/oc2/client/model/BusCableModel.java rename to src/main/java/li/cil/oc2r/client/model/BusCableModel.java index d2f82a28..6cc2513d 100644 --- a/src/main/java/li/cil/oc2/client/model/BusCableModel.java +++ b/src/main/java/li/cil/oc2r/client/model/BusCableModel.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.model; +package li.cil.oc2r.client.model; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.*; diff --git a/src/main/java/li/cil/oc2/client/model/BusCableModelLoader.java b/src/main/java/li/cil/oc2r/client/model/BusCableModelLoader.java similarity index 94% rename from src/main/java/li/cil/oc2/client/model/BusCableModelLoader.java rename to src/main/java/li/cil/oc2r/client/model/BusCableModelLoader.java index 6d5ce6e7..ef54cc47 100644 --- a/src/main/java/li/cil/oc2/client/model/BusCableModelLoader.java +++ b/src/main/java/li/cil/oc2r/client/model/BusCableModelLoader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.model; +package li.cil.oc2r.client.model; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; diff --git a/src/main/java/li/cil/oc2r/client/model/package-info.java b/src/main/java/li/cil/oc2r/client/model/package-info.java new file mode 100644 index 00000000..35c7fcea --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/model/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.model; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/package-info.java b/src/main/java/li/cil/oc2r/client/package-info.java similarity index 88% rename from src/main/java/li/cil/oc2/client/package-info.java rename to src/main/java/li/cil/oc2r/client/package-info.java index e90acf4d..4dee9b24 100644 --- a/src/main/java/li/cil/oc2/client/package-info.java +++ b/src/main/java/li/cil/oc2r/client/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.client; +package li.cil.oc2r.client; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/BusInterfaceNameRenderer.java similarity index 95% rename from src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/BusInterfaceNameRenderer.java index 718613f9..1acbab6c 100644 --- a/src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/BusInterfaceNameRenderer.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer; +package li.cil.oc2r.client.renderer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import org.joml.Matrix4f; -import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.integration.Wrenches; +import li.cil.oc2r.common.block.BusCableBlock; +import li.cil.oc2r.common.blockentity.BusCableBlockEntity; +import li.cil.oc2r.common.integration.Wrenches; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/src/main/java/li/cil/oc2/client/renderer/ModRenderType.java b/src/main/java/li/cil/oc2r/client/renderer/ModRenderType.java similarity index 98% rename from src/main/java/li/cil/oc2/client/renderer/ModRenderType.java rename to src/main/java/li/cil/oc2r/client/renderer/ModRenderType.java index 2d1a86a2..9b419bf9 100644 --- a/src/main/java/li/cil/oc2/client/renderer/ModRenderType.java +++ b/src/main/java/li/cil/oc2r/client/renderer/ModRenderType.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer; +package li.cil.oc2r.client.renderer; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/li/cil/oc2/client/renderer/ModShaders.java b/src/main/java/li/cil/oc2r/client/renderer/ModShaders.java similarity index 98% rename from src/main/java/li/cil/oc2/client/renderer/ModShaders.java rename to src/main/java/li/cil/oc2r/client/renderer/ModShaders.java index bca42421..e81a548a 100644 --- a/src/main/java/li/cil/oc2/client/renderer/ModShaders.java +++ b/src/main/java/li/cil/oc2r/client/renderer/ModShaders.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer; +package li.cil.oc2r.client.renderer; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import org.joml.Matrix4f; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/client/renderer/MonitorGUIRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java similarity index 96% rename from src/main/java/li/cil/oc2/client/renderer/MonitorGUIRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java index e6607481..35d4cbc7 100644 --- a/src/main/java/li/cil/oc2/client/renderer/MonitorGUIRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java @@ -1,4 +1,4 @@ -package li.cil.oc2.client.renderer; +package li.cil.oc2r.client.renderer; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -7,10 +7,10 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.bus.device.vm.block.MonitorDevice; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.scale.Yuv420jToRgb; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.bus.device.vm.block.MonitorDevice; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.scale.Yuv420jToRgb; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.client.renderer.texture.DynamicTexture; diff --git a/src/main/java/li/cil/oc2/client/renderer/NetworkCableRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/NetworkCableRenderer.java similarity index 98% rename from src/main/java/li/cil/oc2/client/renderer/NetworkCableRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/NetworkCableRenderer.java index 94f0f72e..651abb45 100644 --- a/src/main/java/li/cil/oc2/client/renderer/NetworkCableRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/NetworkCableRenderer.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer; +package li.cil.oc2r.client.renderer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import li.cil.oc2.common.util.Vec3Utils; +import li.cil.oc2r.common.util.Vec3Utils; import org.joml.Matrix4f; import org.joml.Vector3f; -import li.cil.oc2.api.API; -import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/li/cil/oc2/client/renderer/ProjectorDepthRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/ProjectorDepthRenderer.java similarity index 98% rename from src/main/java/li/cil/oc2/client/renderer/ProjectorDepthRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/ProjectorDepthRenderer.java index 59653d23..ec308a98 100644 --- a/src/main/java/li/cil/oc2/client/renderer/ProjectorDepthRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/ProjectorDepthRenderer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer; +package li.cil.oc2r.client.renderer; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -16,14 +16,14 @@ import com.mojang.blaze3d.vertex.*; import com.mojang.math.Axis; import org.joml.Matrix3f; import org.joml.Matrix4f; -import li.cil.oc2.common.block.ProjectorBlock; -import li.cil.oc2.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2.common.bus.device.vm.block.ProjectorDevice; -import li.cil.oc2.common.ext.MinecraftExt; -import li.cil.oc2.common.mixin.LevelRendererMixin; -import li.cil.oc2.common.util.FakePlayerUtils; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.scale.Yuv420jToRgb; +import li.cil.oc2r.common.block.ProjectorBlock; +import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2r.common.bus.device.vm.block.ProjectorDevice; +import li.cil.oc2r.common.ext.MinecraftExt; +import li.cil.oc2r.common.mixin.LevelRendererMixin; +import li.cil.oc2r.common.util.FakePlayerUtils; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.scale.Yuv420jToRgb; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/ChargerRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ChargerRenderer.java similarity index 93% rename from src/main/java/li/cil/oc2/client/renderer/blockentity/ChargerRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/blockentity/ChargerRenderer.java index ce58305d..a285e9fe 100644 --- a/src/main/java/li/cil/oc2/client/renderer/blockentity/ChargerRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ChargerRenderer.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.blockentity; +package li.cil.oc2r.client.renderer.blockentity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import org.joml.Matrix4f; -import li.cil.oc2.api.API; -import li.cil.oc2.client.renderer.ModRenderType; -import li.cil.oc2.common.blockentity.ChargerBlockEntity; -import li.cil.oc2.common.util.ChainableVertexConsumer; +import li.cil.oc2r.api.API; +import li.cil.oc2r.client.renderer.ModRenderType; +import li.cil.oc2r.common.blockentity.ChargerBlockEntity; +import li.cil.oc2r.common.util.ChainableVertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ComputerRenderer.java similarity index 97% rename from src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/blockentity/ComputerRenderer.java index 56020478..0fb02a74 100644 --- a/src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ComputerRenderer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.blockentity; +package li.cil.oc2r.client.renderer.blockentity; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -11,12 +11,12 @@ import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import org.joml.Matrix4f; -import li.cil.oc2.api.API; -import li.cil.oc2.client.renderer.ModRenderType; -import li.cil.oc2.common.block.ComputerBlock; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.util.ChainableVertexConsumer; -import li.cil.oc2.common.vm.Terminal; +import li.cil.oc2r.api.API; +import li.cil.oc2r.client.renderer.ModRenderType; +import li.cil.oc2r.common.block.ComputerBlock; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.util.ChainableVertexConsumer; +import li.cil.oc2r.common.vm.Terminal; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/DiskDriveRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/DiskDriveRenderer.java similarity index 93% rename from src/main/java/li/cil/oc2/client/renderer/blockentity/DiskDriveRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/blockentity/DiskDriveRenderer.java index 9f92c0b8..278e8c08 100644 --- a/src/main/java/li/cil/oc2/client/renderer/blockentity/DiskDriveRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/blockentity/DiskDriveRenderer.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.blockentity; +package li.cil.oc2r.client.renderer.blockentity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.world.item.ItemDisplayContext; -import li.cil.oc2.common.block.DiskDriveBlock; -import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; +import li.cil.oc2r.common.block.DiskDriveBlock; +import li.cil.oc2r.common.blockentity.DiskDriveBlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/MonitorRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/MonitorRenderer.java similarity index 95% rename from src/main/java/li/cil/oc2/client/renderer/blockentity/MonitorRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/blockentity/MonitorRenderer.java index 930130c6..21735342 100644 --- a/src/main/java/li/cil/oc2/client/renderer/blockentity/MonitorRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/blockentity/MonitorRenderer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.blockentity; +package li.cil.oc2r.client.renderer.blockentity; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -10,14 +10,14 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; -import li.cil.oc2.api.API; -import li.cil.oc2.client.renderer.ModRenderType; -import li.cil.oc2.client.renderer.MonitorGUIRenderer; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.block.MonitorBlock; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.bus.device.vm.block.MonitorDevice; -import li.cil.oc2.common.util.ChainableVertexConsumer; +import li.cil.oc2r.api.API; +import li.cil.oc2r.client.renderer.ModRenderType; +import li.cil.oc2r.client.renderer.MonitorGUIRenderer; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.block.MonitorBlock; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.bus.device.vm.block.MonitorDevice; +import li.cil.oc2r.common.util.ChainableVertexConsumer; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/ProjectorRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ProjectorRenderer.java similarity index 96% rename from src/main/java/li/cil/oc2/client/renderer/blockentity/ProjectorRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/blockentity/ProjectorRenderer.java index ba702bd2..63d335a4 100644 --- a/src/main/java/li/cil/oc2/client/renderer/blockentity/ProjectorRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ProjectorRenderer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.blockentity; +package li.cil.oc2r.client.renderer.blockentity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -8,11 +8,11 @@ import com.mojang.math.Axis; import org.joml.Matrix4f; import org.joml.Quaternionf; import org.joml.Vector4f; -import li.cil.oc2.api.API; -import li.cil.oc2.client.renderer.ModRenderType; -import li.cil.oc2.client.renderer.ProjectorDepthRenderer; -import li.cil.oc2.common.block.ProjectorBlock; -import li.cil.oc2.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2r.api.API; +import li.cil.oc2r.client.renderer.ModRenderType; +import li.cil.oc2r.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2r.common.block.ProjectorBlock; +import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/package-info.java new file mode 100644 index 00000000..01208e2e --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/renderer/blockentity/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.renderer.blockentity; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java b/src/main/java/li/cil/oc2r/client/renderer/color/BusCableBlockColor.java similarity index 88% rename from src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java rename to src/main/java/li/cil/oc2r/client/renderer/color/BusCableBlockColor.java index 6744b96c..c8911e1a 100644 --- a/src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java +++ b/src/main/java/li/cil/oc2r/client/renderer/color/BusCableBlockColor.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.color; +package li.cil.oc2r.client.renderer.color; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.util.ItemStackUtils; +import li.cil.oc2r.common.blockentity.BusCableBlockEntity; +import li.cil.oc2r.common.util.ItemStackUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.color.block.BlockColor; import net.minecraft.core.BlockPos; diff --git a/src/main/java/li/cil/oc2r/client/renderer/color/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/color/package-info.java new file mode 100644 index 00000000..a973df53 --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/renderer/color/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.renderer.color; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/entity/RobotRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/entity/RobotRenderer.java similarity index 94% rename from src/main/java/li/cil/oc2/client/renderer/entity/RobotRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/entity/RobotRenderer.java index 0fe9d41e..b81b25f1 100644 --- a/src/main/java/li/cil/oc2/client/renderer/entity/RobotRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/entity/RobotRenderer.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.entity; +package li.cil.oc2r.client.renderer.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; -import li.cil.oc2.client.renderer.entity.model.RobotModel; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.client.renderer.entity.model.RobotModel; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; diff --git a/src/main/java/li/cil/oc2/client/renderer/entity/RobotWithoutLevelRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/entity/RobotWithoutLevelRenderer.java similarity index 93% rename from src/main/java/li/cil/oc2/client/renderer/entity/RobotWithoutLevelRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/entity/RobotWithoutLevelRenderer.java index a23e7a9c..1afd6cd8 100644 --- a/src/main/java/li/cil/oc2/client/renderer/entity/RobotWithoutLevelRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/entity/RobotWithoutLevelRenderer.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.entity; +package li.cil.oc2r.client.renderer.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import li.cil.oc2.client.renderer.entity.model.RobotModel; +import li.cil.oc2r.client.renderer.entity.model.RobotModel; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/li/cil/oc2/client/renderer/entity/model/RobotModel.java b/src/main/java/li/cil/oc2r/client/renderer/entity/model/RobotModel.java similarity index 96% rename from src/main/java/li/cil/oc2/client/renderer/entity/model/RobotModel.java rename to src/main/java/li/cil/oc2r/client/renderer/entity/model/RobotModel.java index 20606be5..9def9ee1 100644 --- a/src/main/java/li/cil/oc2/client/renderer/entity/model/RobotModel.java +++ b/src/main/java/li/cil/oc2r/client/renderer/entity/model/RobotModel.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.entity.model; +package li.cil.oc2r.client.renderer.entity.model; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import li.cil.oc2.api.API; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/model/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/entity/model/package-info.java new file mode 100644 index 00000000..de77c76b --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/renderer/entity/model/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.renderer.entity.model; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/entity/package-info.java similarity index 82% rename from src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java rename to src/main/java/li/cil/oc2r/client/renderer/entity/package-info.java index fc586bd3..ef080e9c 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java +++ b/src/main/java/li/cil/oc2r/client/renderer/entity/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device.provider; +package li.cil.oc2r.client.renderer.entity; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/font/MonospaceFontRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/font/MonospaceFontRenderer.java similarity index 94% rename from src/main/java/li/cil/oc2/client/renderer/font/MonospaceFontRenderer.java rename to src/main/java/li/cil/oc2r/client/renderer/font/MonospaceFontRenderer.java index cd24a499..1e5fc6a0 100644 --- a/src/main/java/li/cil/oc2/client/renderer/font/MonospaceFontRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/font/MonospaceFontRenderer.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.client.renderer.font; +package li.cil.oc2r.client.renderer.font; import li.cil.manual.api.prefab.renderer.BitmapFontRenderer; import li.cil.manual.api.render.FontRenderer; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.resources.ResourceLocation; public final class MonospaceFontRenderer extends BitmapFontRenderer { diff --git a/src/main/java/li/cil/oc2/api/bus/device/object/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/font/package-info.java similarity index 83% rename from src/main/java/li/cil/oc2/api/bus/device/object/package-info.java rename to src/main/java/li/cil/oc2r/client/renderer/font/package-info.java index 261c7339..a80ad457 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/object/package-info.java +++ b/src/main/java/li/cil/oc2r/client/renderer/font/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device.object; +package li.cil.oc2r.client.renderer.font; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/renderer/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/package-info.java new file mode 100644 index 00000000..23fa4d53 --- /dev/null +++ b/src/main/java/li/cil/oc2r/client/renderer/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.client.renderer; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/CommonSetup.java b/src/main/java/li/cil/oc2r/common/CommonSetup.java similarity index 62% rename from src/main/java/li/cil/oc2/common/CommonSetup.java rename to src/main/java/li/cil/oc2r/common/CommonSetup.java index ad552621..cff92d07 100644 --- a/src/main/java/li/cil/oc2/common/CommonSetup.java +++ b/src/main/java/li/cil/oc2r/common/CommonSetup.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common; +package li.cil.oc2r.common; -import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; -import li.cil.oc2.common.integration.IMC; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.util.ServerScheduler; -import li.cil.oc2.common.vxlan.TunnelManager; +import li.cil.oc2r.common.bus.device.rpc.RPCMethodParameterTypeAdapters; +import li.cil.oc2r.common.integration.IMC; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.util.ServerScheduler; +import li.cil.oc2r.common.vxlan.TunnelManager; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; diff --git a/src/main/java/li/cil/oc2/common/Config.java b/src/main/java/li/cil/oc2r/common/Config.java similarity index 98% rename from src/main/java/li/cil/oc2/common/Config.java rename to src/main/java/li/cil/oc2r/common/Config.java index 62a2e588..e889d88e 100644 --- a/src/main/java/li/cil/oc2/common/Config.java +++ b/src/main/java/li/cil/oc2r/common/Config.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common; +package li.cil.oc2r.common; -import li.cil.oc2.common.ConfigManager.Path; +import li.cil.oc2r.common.ConfigManager.Path; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Tiers; import net.minecraftforge.common.TierSortingRegistry; diff --git a/src/main/java/li/cil/oc2/common/ConfigManager.java b/src/main/java/li/cil/oc2r/common/ConfigManager.java similarity index 99% rename from src/main/java/li/cil/oc2/common/ConfigManager.java rename to src/main/java/li/cil/oc2r/common/ConfigManager.java index 8c31a184..68361c90 100644 --- a/src/main/java/li/cil/oc2/common/ConfigManager.java +++ b/src/main/java/li/cil/oc2r/common/ConfigManager.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common; +package li.cil.oc2r.common; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/li/cil/oc2/common/Constants.java b/src/main/java/li/cil/oc2r/common/Constants.java similarity index 96% rename from src/main/java/li/cil/oc2/common/Constants.java rename to src/main/java/li/cil/oc2r/common/Constants.java index b4fcdeec..c0adf980 100644 --- a/src/main/java/li/cil/oc2/common/Constants.java +++ b/src/main/java/li/cil/oc2r/common/Constants.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common; +package li.cil.oc2r.common; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.core.Direction; -import static li.cil.oc2.common.util.TranslationUtils.key; +import static li.cil.oc2r.common.util.TranslationUtils.key; public final class Constants { public static final int KILOBYTE = 1024; diff --git a/src/main/java/li/cil/oc2/common/Main.java b/src/main/java/li/cil/oc2r/common/Main.java similarity index 62% rename from src/main/java/li/cil/oc2/common/Main.java rename to src/main/java/li/cil/oc2r/common/Main.java index b2358e63..8c40f603 100644 --- a/src/main/java/li/cil/oc2/common/Main.java +++ b/src/main/java/li/cil/oc2r/common/Main.java @@ -1,29 +1,29 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common; +package li.cil.oc2r.common; import dev.architectury.platform.forge.EventBuses; import li.cil.ceres.Ceres; -import li.cil.oc2.api.API; -import li.cil.oc2.client.ClientSetup; -import li.cil.oc2.client.manual.Manuals; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.bus.device.DeviceTypes; -import li.cil.oc2.common.bus.device.data.BlockDeviceDataRegistry; -import li.cil.oc2.common.bus.device.data.FirmwareRegistry; -import li.cil.oc2.common.bus.device.provider.ProviderRegistry; -import li.cil.oc2.common.container.Containers; -import li.cil.oc2.common.entity.Entities; -import li.cil.oc2.common.item.ItemGroup; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.item.crafting.RecipeSerializers; -import li.cil.oc2.common.serialization.ceres.Serializers; -import li.cil.oc2.common.tags.BlockTags; -import li.cil.oc2.common.tags.ItemTags; -import li.cil.oc2.common.util.RegistryUtils; -import li.cil.oc2.common.util.SoundEvents; -import li.cil.oc2.common.vm.provider.DeviceTreeProviders; +import li.cil.oc2r.api.API; +import li.cil.oc2r.client.ClientSetup; +import li.cil.oc2r.client.manual.Manuals; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.bus.device.DeviceTypes; +import li.cil.oc2r.common.bus.device.data.BlockDeviceDataRegistry; +import li.cil.oc2r.common.bus.device.data.FirmwareRegistry; +import li.cil.oc2r.common.bus.device.provider.ProviderRegistry; +import li.cil.oc2r.common.container.Containers; +import li.cil.oc2r.common.entity.Entities; +import li.cil.oc2r.common.item.ItemGroup; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.item.crafting.RecipeSerializers; +import li.cil.oc2r.common.serialization.ceres.Serializers; +import li.cil.oc2r.common.tags.BlockTags; +import li.cil.oc2r.common.tags.ItemTags; +import li.cil.oc2r.common.util.RegistryUtils; +import li.cil.oc2r.common.util.SoundEvents; +import li.cil.oc2r.common.vm.provider.DeviceTreeProviders; import li.cil.sedna.Sedna; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; diff --git a/src/main/java/li/cil/oc2/common/block/Blocks.java b/src/main/java/li/cil/oc2r/common/block/Blocks.java similarity index 97% rename from src/main/java/li/cil/oc2/common/block/Blocks.java rename to src/main/java/li/cil/oc2r/common/block/Blocks.java index c721ec16..02911df1 100644 --- a/src/main/java/li/cil/oc2/common/block/Blocks.java +++ b/src/main/java/li/cil/oc2r/common/block/Blocks.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.world.level.block.Block; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2r/common/block/BusCableBlock.java similarity index 98% rename from src/main/java/li/cil/oc2/common/block/BusCableBlock.java rename to src/main/java/li/cil/oc2r/common/block/BusCableBlock.java index da66b5fe..9dc15e2d 100644 --- a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/BusCableBlock.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; import com.google.common.collect.Maps; -import li.cil.oc2.client.gui.BusInterfaceScreen; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.integration.Wrenches; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.LevelUtils; +import li.cil.oc2r.client.gui.BusInterfaceScreen; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.BusCableBlockEntity; +import li.cil.oc2r.common.integration.Wrenches; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.LevelUtils; import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -54,7 +54,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class BusCableBlock extends BaseEntityBlock { public enum ConnectionType implements StringRepresentable { diff --git a/src/main/java/li/cil/oc2/common/block/ChargerBlock.java b/src/main/java/li/cil/oc2r/common/block/ChargerBlock.java similarity index 94% rename from src/main/java/li/cil/oc2/common/block/ChargerBlock.java rename to src/main/java/li/cil/oc2r/common/block/ChargerBlock.java index a0c34bd0..a961949f 100644 --- a/src/main/java/li/cil/oc2/common/block/ChargerBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/ChargerBlock.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java b/src/main/java/li/cil/oc2r/common/block/ComputerBlock.java similarity index 91% rename from src/main/java/li/cil/oc2/common/block/ComputerBlock.java rename to src/main/java/li/cil/oc2r/common/block/ComputerBlock.java index 6b72374d..7e8dd706 100644 --- a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/ComputerBlock.java @@ -1,19 +1,19 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.api.capabilities.RedstoneEmitter; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.blockentity.TickableBlockEntity; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.integration.Wrenches; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.util.NBTUtils; -import li.cil.oc2.common.util.TooltipUtils; -import li.cil.oc2.common.util.VoxelShapeUtils; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.api.capabilities.RedstoneEmitter; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.integration.Wrenches; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.util.NBTUtils; +import li.cil.oc2r.common.util.TooltipUtils; +import li.cil.oc2r.common.util.VoxelShapeUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -47,10 +47,10 @@ import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nullable; import java.util.List; -import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; -import static li.cil.oc2.common.Constants.ITEMS_TAG_NAME; -import static li.cil.oc2.common.util.NBTUtils.makeInventoryTag; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; +import static li.cil.oc2r.common.Constants.ITEMS_TAG_NAME; +import static li.cil.oc2r.common.util.NBTUtils.makeInventoryTag; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class ComputerBlock extends HorizontalDirectionalBlock implements EntityBlock { // We bake the "screen" indent on the front into the collision shape, to prevent stuff being diff --git a/src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java b/src/main/java/li/cil/oc2r/common/block/CreativeEnergyBlock.java similarity index 90% rename from src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java rename to src/main/java/li/cil/oc2r/common/block/CreativeEnergyBlock.java index e3b12da7..c02a250b 100644 --- a/src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/CreativeEnergyBlock.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java b/src/main/java/li/cil/oc2r/common/block/DiskDriveBlock.java similarity index 95% rename from src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java rename to src/main/java/li/cil/oc2r/common/block/DiskDriveBlock.java index dd184f87..9217eb7d 100644 --- a/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/DiskDriveBlock.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.DiskDriveBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/li/cil/oc2/common/block/EnergyConsumingBlock.java b/src/main/java/li/cil/oc2r/common/block/EnergyConsumingBlock.java similarity index 76% rename from src/main/java/li/cil/oc2/common/block/EnergyConsumingBlock.java rename to src/main/java/li/cil/oc2r/common/block/EnergyConsumingBlock.java index 5580826f..e995187e 100644 --- a/src/main/java/li/cil/oc2/common/block/EnergyConsumingBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/EnergyConsumingBlock.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; public interface EnergyConsumingBlock { int getEnergyConsumption(); diff --git a/src/main/java/li/cil/oc2/common/block/FlashMemoryFlasherBlock.java b/src/main/java/li/cil/oc2r/common/block/FlashMemoryFlasherBlock.java similarity index 95% rename from src/main/java/li/cil/oc2/common/block/FlashMemoryFlasherBlock.java rename to src/main/java/li/cil/oc2r/common/block/FlashMemoryFlasherBlock.java index 0475ad83..cad1735f 100644 --- a/src/main/java/li/cil/oc2/common/block/FlashMemoryFlasherBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/FlashMemoryFlasherBlock.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.FlashMemoryFlasherBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.FlashMemoryFlasherBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/li/cil/oc2/common/block/ImmutableHorizontalBlock.java b/src/main/java/li/cil/oc2r/common/block/ImmutableHorizontalBlock.java similarity index 95% rename from src/main/java/li/cil/oc2/common/block/ImmutableHorizontalBlock.java rename to src/main/java/li/cil/oc2r/common/block/ImmutableHorizontalBlock.java index a845818b..837931b2 100644 --- a/src/main/java/li/cil/oc2/common/block/ImmutableHorizontalBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/ImmutableHorizontalBlock.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.Mirror; diff --git a/src/main/java/li/cil/oc2/common/block/KeyboardBlock.java b/src/main/java/li/cil/oc2r/common/block/KeyboardBlock.java similarity index 94% rename from src/main/java/li/cil/oc2/common/block/KeyboardBlock.java rename to src/main/java/li/cil/oc2r/common/block/KeyboardBlock.java index 7c6675e7..82570fc1 100644 --- a/src/main/java/li/cil/oc2/common/block/KeyboardBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/KeyboardBlock.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.client.gui.KeyboardScreen; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.KeyboardBlockEntity; -import li.cil.oc2.common.util.VoxelShapeUtils; +import li.cil.oc2r.client.gui.KeyboardScreen; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.KeyboardBlockEntity; +import li.cil.oc2r.common.util.VoxelShapeUtils; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2/common/block/MonitorBlock.java b/src/main/java/li/cil/oc2r/common/block/MonitorBlock.java similarity index 92% rename from src/main/java/li/cil/oc2/common/block/MonitorBlock.java rename to src/main/java/li/cil/oc2r/common/block/MonitorBlock.java index 92cc5cb5..50da8a25 100644 --- a/src/main/java/li/cil/oc2/common/block/MonitorBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/MonitorBlock.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.blockentity.TickableBlockEntity; -import li.cil.oc2.common.integration.Wrenches; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.MonitorPowerMessageForwarded; -import li.cil.oc2.common.util.TooltipUtils; -import li.cil.oc2.common.util.VoxelShapeUtils; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.integration.Wrenches; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.MonitorPowerMessageForwarded; +import li.cil.oc2r.common.util.TooltipUtils; +import li.cil.oc2r.common.util.VoxelShapeUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java b/src/main/java/li/cil/oc2r/common/block/NetworkConnectorBlock.java similarity index 95% rename from src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java rename to src/main/java/li/cil/oc2r/common/block/NetworkConnectorBlock.java index d8df4ca3..7f8443fb 100644 --- a/src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/NetworkConnectorBlock.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; -import li.cil.oc2.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockGetter; diff --git a/src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java b/src/main/java/li/cil/oc2r/common/block/NetworkHubBlock.java similarity index 94% rename from src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java rename to src/main/java/li/cil/oc2r/common/block/NetworkHubBlock.java index 3f82a34e..4e3a23d8 100644 --- a/src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/NetworkHubBlock.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.NetworkHubBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.NetworkHubBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2/common/block/NetworkSwitchBlock.java b/src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java similarity index 93% rename from src/main/java/li/cil/oc2/common/block/NetworkSwitchBlock.java rename to src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java index 079159d4..7b8b79a2 100644 --- a/src/main/java/li/cil/oc2/common/block/NetworkSwitchBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java @@ -1,7 +1,7 @@ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.NetworkHubBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.NetworkHubBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2/common/block/PciCardCageBlock.java b/src/main/java/li/cil/oc2r/common/block/PciCardCageBlock.java similarity index 94% rename from src/main/java/li/cil/oc2/common/block/PciCardCageBlock.java rename to src/main/java/li/cil/oc2r/common/block/PciCardCageBlock.java index ea0c6670..f17f324d 100644 --- a/src/main/java/li/cil/oc2/common/block/PciCardCageBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/PciCardCageBlock.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.TickableBlockEntity; -import li.cil.oc2.common.util.VoxelShapeUtils; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.util.VoxelShapeUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2/common/block/ProjectorBlock.java b/src/main/java/li/cil/oc2r/common/block/ProjectorBlock.java similarity index 94% rename from src/main/java/li/cil/oc2/common/block/ProjectorBlock.java rename to src/main/java/li/cil/oc2r/common/block/ProjectorBlock.java index adc1d1ee..0fb32272 100644 --- a/src/main/java/li/cil/oc2/common/block/ProjectorBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/ProjectorBlock.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.TickableBlockEntity; -import li.cil.oc2.common.util.VoxelShapeUtils; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.util.VoxelShapeUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java b/src/main/java/li/cil/oc2r/common/block/RedstoneInterfaceBlock.java similarity index 94% rename from src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java rename to src/main/java/li/cil/oc2r/common/block/RedstoneInterfaceBlock.java index 41b0fd1f..b8de56da 100644 --- a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/RedstoneInterfaceBlock.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.RedstoneInterfaceBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.RedstoneInterfaceBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2/common/block/VxlanBlock.java b/src/main/java/li/cil/oc2r/common/block/VxlanBlock.java similarity index 93% rename from src/main/java/li/cil/oc2/common/block/VxlanBlock.java rename to src/main/java/li/cil/oc2r/common/block/VxlanBlock.java index d8854498..45123faf 100644 --- a/src/main/java/li/cil/oc2/common/block/VxlanBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/VxlanBlock.java @@ -1,8 +1,8 @@ -package li.cil.oc2.common.block; +package li.cil.oc2r.common.block; -import li.cil.oc2.common.blockentity.BlockEntities; -import li.cil.oc2.common.blockentity.TickableBlockEntity; -import li.cil.oc2.common.blockentity.VxlanBlockEntity; +import li.cil.oc2r.common.blockentity.BlockEntities; +import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2r.common.blockentity.VxlanBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/li/cil/oc2r/common/block/package-info.java b/src/main/java/li/cil/oc2r/common/block/package-info.java new file mode 100644 index 00000000..6df364fa --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/block/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.block; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java b/src/main/java/li/cil/oc2r/common/blockentity/BlockEntities.java similarity index 97% rename from src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java rename to src/main/java/li/cil/oc2r/common/blockentity/BlockEntities.java index 9f187177..ac617828 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/BlockEntities.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.API; -import li.cil.oc2.common.block.Blocks; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.block.Blocks; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/BusCableBlockEntity.java similarity index 95% rename from src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/BusCableBlockEntity.java index 03112f73..8a569907 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/BusCableBlockEntity.java @@ -1,24 +1,24 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.bus.DeviceBus; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.client.model.BusCableBakedModel; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.bus.AbstractBlockDeviceBusElement; -import li.cil.oc2.common.bus.device.rpc.TypeNameRPCDevice; -import li.cil.oc2.common.bus.device.util.BlockDeviceInfo; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.BusCableFacadeMessage; -import li.cil.oc2.common.network.message.BusInterfaceNameMessage; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.LevelUtils; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.util.ServerScheduler; +import li.cil.oc2r.api.bus.DeviceBus; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.client.model.BusCableBakedModel; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.block.BusCableBlock; +import li.cil.oc2r.common.bus.AbstractBlockDeviceBusElement; +import li.cil.oc2r.common.bus.device.rpc.TypeNameRPCDevice; +import li.cil.oc2r.common.bus.device.util.BlockDeviceInfo; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.BusCableFacadeMessage; +import li.cil.oc2r.common.network.message.BusInterfaceNameMessage; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.LevelUtils; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.util.ServerScheduler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.resources.model.BakedModel; @@ -47,7 +47,7 @@ import java.util.HashSet; import java.util.Objects; import static java.util.Objects.requireNonNull; -import static li.cil.oc2.client.model.BusCableBakedModel.*; +import static li.cil.oc2r.client.model.BusCableBakedModel.*; public final class BusCableBlockEntity extends ModBlockEntity { public enum FacadeType { diff --git a/src/main/java/li/cil/oc2/common/blockentity/ChargerBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ChargerBlockEntity.java similarity index 92% rename from src/main/java/li/cil/oc2/common/blockentity/ChargerBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/ChargerBlockEntity.java index 2f583e72..3c974705 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/ChargerBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/ChargerBlockEntity.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.NamedDevice; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.util.ChunkUtils; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.NamedDevice; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.util.ChunkUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ComputerBlockEntity.java similarity index 92% rename from src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/ComputerBlockEntity.java index 8de996f6..ec1effeb 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/ComputerBlockEntity.java @@ -1,31 +1,31 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.api.capabilities.TerminalUserProvider; -import li.cil.oc2.client.audio.LoopingSoundManager; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.block.ComputerBlock; -import li.cil.oc2.common.bus.AbstractBlockDeviceBusElement; -import li.cil.oc2.common.bus.BlockDeviceBusController; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.bus.device.util.Devices; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.container.ComputerInventoryContainer; -import li.cil.oc2.common.container.ComputerTerminalContainer; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.ComputerBootErrorMessage; -import li.cil.oc2.common.network.message.ComputerBusStateMessage; -import li.cil.oc2.common.network.message.ComputerRunStateMessage; -import li.cil.oc2.common.network.message.ComputerTerminalOutputMessage; -import li.cil.oc2.common.serialization.NBTSerialization; -import li.cil.oc2.common.util.*; -import li.cil.oc2.common.vm.*; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.capabilities.TerminalUserProvider; +import li.cil.oc2r.client.audio.LoopingSoundManager; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.block.ComputerBlock; +import li.cil.oc2r.common.bus.AbstractBlockDeviceBusElement; +import li.cil.oc2r.common.bus.BlockDeviceBusController; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.bus.device.util.Devices; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.container.ComputerInventoryContainer; +import li.cil.oc2r.common.container.ComputerTerminalContainer; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.ComputerBootErrorMessage; +import li.cil.oc2r.common.network.message.ComputerBusStateMessage; +import li.cil.oc2r.common.network.message.ComputerRunStateMessage; +import li.cil.oc2r.common.network.message.ComputerTerminalOutputMessage; +import li.cil.oc2r.common.serialization.NBTSerialization; +import li.cil.oc2r.common.util.*; +import li.cil.oc2r.common.vm.*; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -46,8 +46,8 @@ import java.nio.ByteBuffer; import java.time.Duration; import java.util.*; -import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; -import static li.cil.oc2.common.Constants.ITEMS_TAG_NAME; +import static li.cil.oc2r.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; +import static li.cil.oc2r.common.Constants.ITEMS_TAG_NAME; public final class ComputerBlockEntity extends ModBlockEntity implements TerminalUserProvider, TickableBlockEntity { private static final String BUS_ELEMENT_TAG_NAME = "busElement"; diff --git a/src/main/java/li/cil/oc2/common/blockentity/CreativeEnergyBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/CreativeEnergyBlockEntity.java similarity index 93% rename from src/main/java/li/cil/oc2/common/blockentity/CreativeEnergyBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/CreativeEnergyBlockEntity.java index f3a54e15..a8774ce8 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/CreativeEnergyBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/CreativeEnergyBlockEntity.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.ChunkPos; diff --git a/src/main/java/li/cil/oc2/common/blockentity/DiskDriveBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java similarity index 90% rename from src/main/java/li/cil/oc2/common/blockentity/DiskDriveBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java index bfe4418f..b2eb63e0 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/DiskDriveBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.block.DiskDriveBlock; -import li.cil.oc2.common.bus.device.vm.block.DiskDriveContainer; -import li.cil.oc2.common.bus.device.vm.block.DiskDriveDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.container.TypedItemStackHandler; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.DiskDriveFloppyMessage; -import li.cil.oc2.common.tags.ItemTags; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.LocationSupplierUtils; -import li.cil.oc2.common.util.SoundEvents; -import li.cil.oc2.common.util.ThrottledSoundEmitter; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.block.DiskDriveBlock; +import li.cil.oc2r.common.bus.device.vm.block.DiskDriveContainer; +import li.cil.oc2r.common.bus.device.vm.block.DiskDriveDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.container.TypedItemStackHandler; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.DiskDriveFloppyMessage; +import li.cil.oc2r.common.tags.ItemTags; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.LocationSupplierUtils; +import li.cil.oc2r.common.util.SoundEvents; +import li.cil.oc2r.common.util.ThrottledSoundEmitter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/blockentity/FlashMemoryFlasherBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/FlashMemoryFlasherBlockEntity.java similarity index 90% rename from src/main/java/li/cil/oc2/common/blockentity/FlashMemoryFlasherBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/FlashMemoryFlasherBlockEntity.java index 5e8cdfa0..e6556170 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/FlashMemoryFlasherBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/FlashMemoryFlasherBlockEntity.java @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.block.FlashMemoryFlasherBlock; -import li.cil.oc2.common.bus.device.vm.block.FlashMemoryFlasherContainer; -import li.cil.oc2.common.bus.device.vm.block.FlashMemoryFlasherDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.container.TypedItemStackHandler; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.FirmwareFlasherMessage; -import li.cil.oc2.common.tags.ItemTags; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.LocationSupplierUtils; -import li.cil.oc2.common.util.SoundEvents; -import li.cil.oc2.common.util.ThrottledSoundEmitter; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.block.FlashMemoryFlasherBlock; +import li.cil.oc2r.common.bus.device.vm.block.FlashMemoryFlasherContainer; +import li.cil.oc2r.common.bus.device.vm.block.FlashMemoryFlasherDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.container.TypedItemStackHandler; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.FirmwareFlasherMessage; +import li.cil.oc2r.common.tags.ItemTags; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.LocationSupplierUtils; +import li.cil.oc2r.common.util.SoundEvents; +import li.cil.oc2r.common.util.ThrottledSoundEmitter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/blockentity/KeyboardBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/KeyboardBlockEntity.java similarity index 88% rename from src/main/java/li/cil/oc2/common/blockentity/KeyboardBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/KeyboardBlockEntity.java index 3bdebe25..4cf2004b 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/KeyboardBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/KeyboardBlockEntity.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.bus.device.vm.block.KeyboardDevice; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.common.bus.device.vm.block.KeyboardDevice; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ModBlockEntity.java similarity index 97% rename from src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/ModBlockEntity.java index a9f20045..ad1a44d4 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/ModBlockEntity.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.util.LazyOptionalUtils; -import li.cil.oc2.common.util.ServerScheduler; +import li.cil.oc2r.common.util.LazyOptionalUtils; +import li.cil.oc2r.common.util.ServerScheduler; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/common/blockentity/MonitorBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/MonitorBlockEntity.java similarity index 90% rename from src/main/java/li/cil/oc2/common/blockentity/MonitorBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/MonitorBlockEntity.java index 9982eb1c..35497064 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/MonitorBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/MonitorBlockEntity.java @@ -1,25 +1,25 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.client.renderer.MonitorGUIRenderer; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.block.MonitorBlock; -import li.cil.oc2.common.bus.device.DeviceGroup; -import li.cil.oc2.common.bus.device.vm.block.KeyboardDevice; -import li.cil.oc2.common.bus.device.vm.block.MonitorDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.container.MonitorDisplayContainer; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.network.MonitorLoadBalancer; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.*; -import li.cil.oc2.common.vm.device.SimpleFramebufferDevice; -import li.cil.oc2.jcodec.codecs.h264.H264Decoder; -import li.cil.oc2.jcodec.codecs.h264.H264Encoder; -import li.cil.oc2.jcodec.codecs.h264.encode.CQPRateControl; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.client.renderer.MonitorGUIRenderer; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.block.MonitorBlock; +import li.cil.oc2r.common.bus.device.DeviceGroup; +import li.cil.oc2r.common.bus.device.vm.block.KeyboardDevice; +import li.cil.oc2r.common.bus.device.vm.block.MonitorDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.container.MonitorDisplayContainer; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.network.MonitorLoadBalancer; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.*; +import li.cil.oc2r.common.vm.device.SimpleFramebufferDevice; +import li.cil.oc2r.jcodec.codecs.h264.H264Decoder; +import li.cil.oc2r.jcodec.codecs.h264.H264Encoder; +import li.cil.oc2r.jcodec.codecs.h264.encode.CQPRateControl; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -40,8 +40,8 @@ import java.util.zip.DataFormatException; import java.util.zip.Deflater; import java.util.zip.Inflater; -import static li.cil.oc2.common.bus.device.vm.block.MonitorDevice.HEIGHT; -import static li.cil.oc2.common.bus.device.vm.block.MonitorDevice.WIDTH; +import static li.cil.oc2r.common.bus.device.vm.block.MonitorDevice.HEIGHT; +import static li.cil.oc2r.common.bus.device.vm.block.MonitorDevice.WIDTH; public final class MonitorBlockEntity extends ModBlockEntity implements TickableBlockEntity { @FunctionalInterface diff --git a/src/main/java/li/cil/oc2/common/blockentity/NetworkConnectorBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/NetworkConnectorBlockEntity.java similarity index 97% rename from src/main/java/li/cil/oc2/common/blockentity/NetworkConnectorBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/NetworkConnectorBlockEntity.java index 93ba7c98..d7f43c66 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/NetworkConnectorBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/NetworkConnectorBlockEntity.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.client.renderer.NetworkCableRenderer; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.block.NetworkConnectorBlock; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.NetworkConnectorConnectionsMessage; -import li.cil.oc2.common.util.*; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.client.renderer.NetworkCableRenderer; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.block.NetworkConnectorBlock; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.NetworkConnectorConnectionsMessage; +import li.cil.oc2r.common.util.*; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/NetworkHubBlockEntity.java similarity index 92% rename from src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/NetworkHubBlockEntity.java index 4e3f1e2a..3676f800 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/NetworkHubBlockEntity.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.util.LazyOptionalUtils; -import li.cil.oc2.common.util.LevelUtils; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.util.LazyOptionalUtils; +import li.cil.oc2r.common.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/common/blockentity/NetworkSwitchBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java similarity index 97% rename from src/main/java/li/cil/oc2/common/blockentity/NetworkSwitchBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java index 4e3e2175..24b081a8 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/NetworkSwitchBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java @@ -1,18 +1,18 @@ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; import java.util.*; import java.util.stream.Collectors; import com.google.gson.internal.LinkedTreeMap; import com.mojang.datafixers.util.Pair; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.DocumentedDevice; -import li.cil.oc2.api.bus.device.object.NamedDevice; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.util.LazyOptionalUtils; -import li.cil.oc2.common.util.LevelUtils; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.DocumentedDevice; +import li.cil.oc2r.api.bus.device.object.NamedDevice; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.util.LazyOptionalUtils; +import li.cil.oc2r.common.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.*; diff --git a/src/main/java/li/cil/oc2/common/blockentity/PciCardCageBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/PciCardCageBlockEntity.java similarity index 91% rename from src/main/java/li/cil/oc2/common/blockentity/PciCardCageBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/PciCardCageBlockEntity.java index 3d9d8dbf..59494a46 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/PciCardCageBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/PciCardCageBlockEntity.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.block.PciCardCageBlock; -import li.cil.oc2.common.bus.device.vm.block.PciCardCageDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.block.PciCardCageBlock; +import li.cil.oc2r.common.bus.device.vm.block.PciCardCageDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.energy.FixedEnergyStorage; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/blockentity/ProjectorBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ProjectorBlockEntity.java similarity index 93% rename from src/main/java/li/cil/oc2/common/blockentity/ProjectorBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/ProjectorBlockEntity.java index 25c0ef9e..35a1d334 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/ProjectorBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/ProjectorBlockEntity.java @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.block.ProjectorBlock; -import li.cil.oc2.common.bus.device.vm.block.ProjectorDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.ProjectorLoadBalancer; -import li.cil.oc2.common.network.message.ProjectorRequestFramebufferMessage; -import li.cil.oc2.common.network.message.ProjectorStateMessage; -import li.cil.oc2.jcodec.codecs.h264.H264Decoder; -import li.cil.oc2.jcodec.codecs.h264.H264Encoder; -import li.cil.oc2.jcodec.codecs.h264.encode.CQPRateControl; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.block.ProjectorBlock; +import li.cil.oc2r.common.bus.device.vm.block.ProjectorDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.ProjectorLoadBalancer; +import li.cil.oc2r.common.network.message.ProjectorRequestFramebufferMessage; +import li.cil.oc2r.common.network.message.ProjectorStateMessage; +import li.cil.oc2r.jcodec.codecs.h264.H264Decoder; +import li.cil.oc2r.jcodec.codecs.h264.H264Encoder; +import li.cil.oc2r.jcodec.codecs.h264.encode.CQPRateControl; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.SectionPos; diff --git a/src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java similarity index 94% rename from src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java index a9b1ef0c..c9481531 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.DocumentedDevice; -import li.cil.oc2.api.bus.device.object.NamedDevice; -import li.cil.oc2.api.bus.device.object.Parameter; -import li.cil.oc2.api.util.Side; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.util.HorizontalBlockUtils; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.DocumentedDevice; +import li.cil.oc2r.api.bus.device.object.NamedDevice; +import li.cil.oc2r.api.bus.device.object.Parameter; +import li.cil.oc2r.api.util.Side; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.util.HorizontalBlockUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/blockentity/TickableBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/TickableBlockEntity.java similarity index 97% rename from src/main/java/li/cil/oc2/common/blockentity/TickableBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/TickableBlockEntity.java index 3841b0f3..21141d89 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/TickableBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/TickableBlockEntity.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.common.util.BlockEntityUtils; +import li.cil.oc2r.common.util.BlockEntityUtils; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; diff --git a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java similarity index 93% rename from src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java rename to src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java index bef7aac5..8422e88e 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java @@ -1,12 +1,12 @@ -package li.cil.oc2.common.blockentity; +package li.cil.oc2r.common.blockentity; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.util.LazyOptionalUtils; -import li.cil.oc2.common.util.LevelUtils; -import li.cil.oc2.common.vxlan.TunnelManager; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.util.LazyOptionalUtils; +import li.cil.oc2r.common.util.LevelUtils; +import li.cil.oc2r.common.vxlan.TunnelManager; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/blockentity/package-info.java b/src/main/java/li/cil/oc2r/common/blockentity/package-info.java new file mode 100644 index 00000000..5fafa638 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/blockentity/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.blockentity; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/AbstractBlockDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractBlockDeviceBusElement.java similarity index 92% rename from src/main/java/li/cil/oc2/common/bus/AbstractBlockDeviceBusElement.java rename to src/main/java/li/cil/oc2r/common/bus/AbstractBlockDeviceBusElement.java index 8a1b26ec..cae6cab2 100644 --- a/src/main/java/li/cil/oc2/common/bus/AbstractBlockDeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/common/bus/AbstractBlockDeviceBusElement.java @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus; +package li.cil.oc2r.common.bus; -import li.cil.oc2.api.bus.BlockDeviceBusElement; -import li.cil.oc2.api.bus.DeviceBusElement; -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.util.Invalidatable; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.provider.Providers; -import li.cil.oc2.common.bus.device.rpc.TypeNameRPCDevice; -import li.cil.oc2.common.bus.device.util.BlockDeviceInfo; -import li.cil.oc2.common.bus.device.util.Devices; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.util.LevelUtils; +import li.cil.oc2r.api.bus.BlockDeviceBusElement; +import li.cil.oc2r.api.bus.DeviceBusElement; +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.util.Invalidatable; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.provider.Providers; +import li.cil.oc2r.common.bus.device.rpc.TypeNameRPCDevice; +import li.cil.oc2r.common.bus.device.util.BlockDeviceInfo; +import li.cil.oc2r.common.bus.device.util.Devices; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -28,7 +28,7 @@ import net.minecraftforge.registries.IForgeRegistry; import javax.annotation.Nullable; import java.util.*; -import static li.cil.oc2.common.util.RegistryUtils.optionalKey; +import static li.cil.oc2r.common.util.RegistryUtils.optionalKey; public abstract class AbstractBlockDeviceBusElement extends AbstractGroupingDeviceBusElement implements BlockDeviceBusElement { public AbstractBlockDeviceBusElement() { diff --git a/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractDeviceBusElement.java similarity index 93% rename from src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusElement.java rename to src/main/java/li/cil/oc2r/common/bus/AbstractDeviceBusElement.java index 7681d016..b219d18e 100644 --- a/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/common/bus/AbstractDeviceBusElement.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus; +package li.cil.oc2r.common.bus; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import li.cil.oc2.api.bus.DeviceBusController; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2r.api.bus.DeviceBusController; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.api.bus.device.Device; import net.minecraftforge.common.util.LazyOptional; import java.util.*; diff --git a/src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractGroupingDeviceBusElement.java similarity index 98% rename from src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java rename to src/main/java/li/cil/oc2r/common/bus/AbstractGroupingDeviceBusElement.java index 86be7a21..1b77afa1 100644 --- a/src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/common/bus/AbstractGroupingDeviceBusElement.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus; +package li.cil.oc2r.common.bus; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/li/cil/oc2/common/bus/AbstractItemDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractItemDeviceBusElement.java similarity index 89% rename from src/main/java/li/cil/oc2/common/bus/AbstractItemDeviceBusElement.java rename to src/main/java/li/cil/oc2r/common/bus/AbstractItemDeviceBusElement.java index 5229b628..c500149d 100644 --- a/src/main/java/li/cil/oc2/common/bus/AbstractItemDeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/common/bus/AbstractItemDeviceBusElement.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus; +package li.cil.oc2r.common.bus; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.provider.Providers; -import li.cil.oc2.common.bus.device.rpc.TypeNameRPCDevice; -import li.cil.oc2.common.bus.device.util.Devices; -import li.cil.oc2.common.bus.device.util.ItemDeviceInfo; -import li.cil.oc2.common.util.ItemDeviceUtils; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.provider.Providers; +import li.cil.oc2r.common.bus.device.rpc.TypeNameRPCDevice; +import li.cil.oc2r.common.bus.device.util.Devices; +import li.cil.oc2r.common.bus.device.util.ItemDeviceInfo; +import li.cil.oc2r.common.util.ItemDeviceUtils; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; @@ -20,7 +20,7 @@ import net.minecraftforge.registries.IForgeRegistry; import javax.annotation.Nullable; import java.util.*; -import static li.cil.oc2.common.util.RegistryUtils.optionalKey; +import static li.cil.oc2r.common.util.RegistryUtils.optionalKey; public abstract class AbstractItemDeviceBusElement extends AbstractGroupingDeviceBusElement { public AbstractItemDeviceBusElement(final int groupCount) { diff --git a/src/main/java/li/cil/oc2/common/bus/BlockDeviceBusController.java b/src/main/java/li/cil/oc2r/common/bus/BlockDeviceBusController.java similarity index 95% rename from src/main/java/li/cil/oc2/common/bus/BlockDeviceBusController.java rename to src/main/java/li/cil/oc2r/common/bus/BlockDeviceBusController.java index 9a6bfad4..a13cdf83 100644 --- a/src/main/java/li/cil/oc2/common/bus/BlockDeviceBusController.java +++ b/src/main/java/li/cil/oc2r/common/bus/BlockDeviceBusController.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus; +package li.cil.oc2r.common.bus; -import li.cil.oc2.api.bus.BlockDeviceBusElement; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.common.util.ChunkLocation; -import li.cil.oc2.common.util.ChunkUtils; -import li.cil.oc2.common.util.ServerScheduler; +import li.cil.oc2r.api.bus.BlockDeviceBusElement; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.common.util.ChunkLocation; +import li.cil.oc2r.common.util.ChunkUtils; +import li.cil.oc2r.common.util.ServerScheduler; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2/common/bus/CommonDeviceBusController.java b/src/main/java/li/cil/oc2r/common/bus/CommonDeviceBusController.java similarity index 97% rename from src/main/java/li/cil/oc2/common/bus/CommonDeviceBusController.java rename to src/main/java/li/cil/oc2r/common/bus/CommonDeviceBusController.java index f1590fd3..006941c2 100644 --- a/src/main/java/li/cil/oc2/common/bus/CommonDeviceBusController.java +++ b/src/main/java/li/cil/oc2r/common/bus/CommonDeviceBusController.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus; +package li.cil.oc2r.common.bus; -import li.cil.oc2.api.bus.DeviceBusController; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.common.util.Event; -import li.cil.oc2.common.util.LazyOptionalUtils; -import li.cil.oc2.common.util.ParameterizedEvent; -import li.cil.oc2.common.util.TickUtils; +import li.cil.oc2r.api.bus.DeviceBusController; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.common.util.Event; +import li.cil.oc2r.common.util.LazyOptionalUtils; +import li.cil.oc2r.common.util.ParameterizedEvent; +import li.cil.oc2r.common.util.TickUtils; import net.minecraftforge.common.util.LazyOptional; import java.time.Duration; diff --git a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java b/src/main/java/li/cil/oc2r/common/bus/RPCDeviceBusAdapter.java similarity index 97% rename from src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java rename to src/main/java/li/cil/oc2r/common/bus/RPCDeviceBusAdapter.java index 1ac8b717..880885ad 100644 --- a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java +++ b/src/main/java/li/cil/oc2r/common/bus/RPCDeviceBusAdapter.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus; +package li.cil.oc2r.common.bus; import com.google.gson.Gson; import com.google.gson.JsonArray; import li.cil.ceres.api.Serialized; -import li.cil.oc2.api.bus.DeviceBusController; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.rpc.*; -import li.cil.oc2.api.util.Side; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.rpc.RPCDeviceList; -import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; -import li.cil.oc2.common.serialization.gson.*; +import li.cil.oc2r.api.bus.DeviceBusController; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.rpc.*; +import li.cil.oc2r.api.util.Side; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.rpc.RPCDeviceList; +import li.cil.oc2r.common.bus.device.rpc.RPCMethodParameterTypeAdapters; +import li.cil.oc2r.common.serialization.gson.*; import li.cil.sedna.api.device.Steppable; import li.cil.sedna.api.device.serial.SerialDevice; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java new file mode 100644 index 00000000..101ebc44 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java @@ -0,0 +1,8 @@ +package li.cil.oc2r.common.bus.device; + +import li.cil.oc2r.common.bus.AbstractDeviceBusElement; + + +public class BlockDeviceBusElement extends AbstractDeviceBusElement { + +} diff --git a/src/main/java/li/cil/oc2/common/bus/device/DeviceGroup.java b/src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java similarity index 77% rename from src/main/java/li/cil/oc2/common/bus/device/DeviceGroup.java rename to src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java index c985153c..57faa113 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/DeviceGroup.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java @@ -1,7 +1,7 @@ -package li.cil.oc2.common.bus.device; +package li.cil.oc2r.common.bus.device; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; import net.minecraft.world.level.block.entity.BlockEntity; import java.util.*; diff --git a/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2r/common/bus/device/DeviceTypes.java similarity index 86% rename from src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java rename to src/main/java/li/cil/oc2r/common/bus/device/DeviceTypes.java index 62985505..a2c569a0 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/DeviceTypes.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device; +package li.cil.oc2r.common.bus.device; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.DeviceType; -import li.cil.oc2.common.bus.device.util.DeviceTypeImpl; -import li.cil.oc2.common.tags.ItemTags; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2r.common.bus.device.util.DeviceTypeImpl; +import li.cil.oc2r.common.tags.ItemTags; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -16,7 +16,7 @@ import net.minecraftforge.registries.RegistryBuilder; import java.util.function.Supplier; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class DeviceTypes { private static final DeferredRegister DEVICE_TYPES = DeferredRegister.create(DeviceType.REGISTRY, API.MOD_ID); diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/BlockDeviceDataRegistry.java b/src/main/java/li/cil/oc2r/common/bus/device/data/BlockDeviceDataRegistry.java similarity index 92% rename from src/main/java/li/cil/oc2/common/bus/device/data/BlockDeviceDataRegistry.java rename to src/main/java/li/cil/oc2r/common/bus/device/data/BlockDeviceDataRegistry.java index e1fecdc0..1a02ab63 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/data/BlockDeviceDataRegistry.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/data/BlockDeviceDataRegistry.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.data; +package li.cil.oc2r.common.bus.device.data; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.data.BlockDeviceData; -import li.cil.oc2.api.util.Registries; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.data.BlockDeviceData; +import li.cil.oc2r.api.util.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/BuildrootBlockDeviceData.java b/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootBlockDeviceData.java similarity index 92% rename from src/main/java/li/cil/oc2/common/bus/device/data/BuildrootBlockDeviceData.java rename to src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootBlockDeviceData.java index 1efbff26..ee438465 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/data/BuildrootBlockDeviceData.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootBlockDeviceData.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.data; +package li.cil.oc2r.common.bus.device.data; -import li.cil.oc2.api.bus.device.data.BlockDeviceData; +import li.cil.oc2r.api.bus.device.data.BlockDeviceData; import li.cil.sedna.api.device.BlockDevice; import li.cil.sedna.buildroot.Buildroot; import li.cil.sedna.device.block.ByteBufferBlockDevice; diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/BuildrootFirmware.java b/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootFirmware.java similarity index 90% rename from src/main/java/li/cil/oc2/common/bus/device/data/BuildrootFirmware.java rename to src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootFirmware.java index 143e4553..f4d9cff5 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/data/BuildrootFirmware.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootFirmware.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.data; +package li.cil.oc2r.common.bus.device.data; -import li.cil.oc2.api.bus.device.data.Firmware; +import li.cil.oc2r.api.bus.device.data.Firmware; import li.cil.sedna.api.memory.MemoryMap; import li.cil.sedna.buildroot.Buildroot; import li.cil.sedna.memory.MemoryMaps; diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/FileSystems.java b/src/main/java/li/cil/oc2r/common/bus/device/data/FileSystems.java similarity index 96% rename from src/main/java/li/cil/oc2/common/bus/device/data/FileSystems.java rename to src/main/java/li/cil/oc2r/common/bus/device/data/FileSystems.java index fc05b9ee..9cb6f06a 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/data/FileSystems.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/data/FileSystems.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.data; +package li.cil.oc2r.common.bus.device.data; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.data.BlockDeviceData; -import li.cil.oc2.common.vm.fs.LayeredFileSystem; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.data.BlockDeviceData; +import li.cil.oc2r.common.vm.fs.LayeredFileSystem; import li.cil.sedna.fs.FileSystem; import li.cil.sedna.fs.ZipStreamFileSystem; import net.minecraft.resources.ResourceLocation; @@ -29,7 +29,7 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import static li.cil.oc2.common.util.TextFormatUtils.formatSize; +import static li.cil.oc2r.common.util.TextFormatUtils.formatSize; @Mod.EventBusSubscriber(modid = API.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public final class FileSystems { diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/FirmwareRegistry.java b/src/main/java/li/cil/oc2r/common/bus/device/data/FirmwareRegistry.java similarity index 90% rename from src/main/java/li/cil/oc2/common/bus/device/data/FirmwareRegistry.java rename to src/main/java/li/cil/oc2r/common/bus/device/data/FirmwareRegistry.java index 893f3626..15f78665 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/data/FirmwareRegistry.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/data/FirmwareRegistry.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.data; +package li.cil.oc2r.common.bus.device.data; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.data.Firmware; -import li.cil.oc2.api.util.Registries; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.data.Firmware; +import li.cil.oc2r.api.util.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/ResourceBlockDeviceData.java b/src/main/java/li/cil/oc2r/common/bus/device/data/ResourceBlockDeviceData.java similarity index 91% rename from src/main/java/li/cil/oc2/common/bus/device/data/ResourceBlockDeviceData.java rename to src/main/java/li/cil/oc2r/common/bus/device/data/ResourceBlockDeviceData.java index a84526e6..f177b787 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/data/ResourceBlockDeviceData.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/data/ResourceBlockDeviceData.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.data; +package li.cil.oc2r.common.bus.device.data; -import li.cil.oc2.api.bus.device.data.BlockDeviceData; +import li.cil.oc2r.api.bus.device.data.BlockDeviceData; import li.cil.sedna.api.device.BlockDevice; import li.cil.sedna.device.block.ByteBufferBlockDevice; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/data/package-info.java new file mode 100644 index 00000000..ab514c86 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/data/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.data; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/package-info.java new file mode 100644 index 00000000..84a8a6e7 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/ProviderRegistry.java similarity index 89% rename from src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/ProviderRegistry.java index 547227f9..16041138 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/ProviderRegistry.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider; +package li.cil.oc2r.common.bus.device.provider; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; -import li.cil.oc2.api.util.Registries; -import li.cil.oc2.common.bus.device.provider.block.BlockEntityCapabilityDeviceProvider; -import li.cil.oc2.common.bus.device.provider.item.*; -import li.cil.oc2.common.bus.device.rpc.block.*; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.util.Registries; +import li.cil.oc2r.common.bus.device.provider.block.BlockEntityCapabilityDeviceProvider; +import li.cil.oc2r.common.bus.device.provider.item.*; +import li.cil.oc2r.common.bus.device.rpc.block.*; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/Providers.java similarity index 81% rename from src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/Providers.java index f253d68a..8c23b5e8 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/Providers.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider; +package li.cil.oc2r.common.bus.device.provider; -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; import net.minecraftforge.registries.IForgeRegistry; import java.util.function.BiConsumer; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java similarity index 61% rename from src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java index a88254b4..b433c5e2 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.block; +package li.cil.oc2r.common.bus.device.provider.block; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraft.world.level.block.entity.BlockEntity; public final class BlockEntityCapabilityDeviceProvider extends AbstractBlockEntityCapabilityDeviceProvider { diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/block/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/block/package-info.java new file mode 100644 index 00000000..aeb017c1 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/block/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.provider.block; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java similarity index 85% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java index 51451426..2f30949a 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java similarity index 64% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java index 79c4a9a8..d3d4c9f1 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.item.BlockOperationsModuleDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.item.BlockOperationsModuleDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.item.Items; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/CPUItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java similarity index 61% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/CPUItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java index 21067a06..8edeb750 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/CPUItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java @@ -1,10 +1,10 @@ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.item.CPUItemDevice; -import li.cil.oc2.common.item.CPUItem; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.item.CPUItemDevice; +import li.cil.oc2r.common.item.CPUItem; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java similarity index 65% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java index 4c412dfe..40d1843f 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.rpc.EnergyStorageDevice; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.rpc.EnergyStorageDevice; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraftforge.energy.IEnergyStorage; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java similarity index 78% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java index 04018c5a..c98beee2 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.api.capabilities.TerminalUserProvider; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.item.FileImportExportCardItemDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.capabilities.TerminalUserProvider; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.item.Items; import net.minecraftforge.common.util.LazyOptional; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java similarity index 67% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java index 1818b7c2..07a75b3b 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.ByteBufferFlashStorageDevice; -import li.cil.oc2.common.item.FlashMemoryItem; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.ByteBufferFlashStorageDevice; +import li.cil.oc2r.common.item.FlashMemoryItem; import net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java similarity index 67% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java index 583b6446..d073757c 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.data.Firmware; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.FirmwareFlashStorageDevice; -import li.cil.oc2.common.item.FlashMemoryWithExternalDataItem; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.data.Firmware; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.FirmwareFlashStorageDevice; +import li.cil.oc2r.common.item.FlashMemoryWithExternalDataItem; import net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java similarity index 65% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java index 68700bdc..10d12f34 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.rpc.FluidHandlerDevice; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.rpc.FluidHandlerDevice; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraftforge.fluids.capability.IFluidHandler; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveItemDeviceProvider.java similarity index 75% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveItemDeviceProvider.java index 0d4dfad4..7e842b9d 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveItemDeviceProvider.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.HardDriveDevice; -import li.cil.oc2.common.item.HardDriveItem; -import li.cil.oc2.common.util.LocationSupplierUtils; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.HardDriveDevice; +import li.cil.oc2r.common.item.HardDriveItem; +import li.cil.oc2r.common.util.LocationSupplierUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java similarity index 76% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java index c82919b4..281ff82f 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.data.BlockDeviceData; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.HardDriveDeviceWithInitialData; -import li.cil.oc2.common.item.HardDriveWithExternalDataItem; -import li.cil.oc2.common.util.LocationSupplierUtils; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.data.BlockDeviceData; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.HardDriveDeviceWithInitialData; +import li.cil.oc2r.common.item.HardDriveWithExternalDataItem; +import li.cil.oc2r.common.util.LocationSupplierUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java similarity index 65% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java index dad09f1b..0799e74b 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.item.InventoryOperationsModuleDevice; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.item.InventoryOperationsModuleDevice; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.item.Items; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java similarity index 64% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java index 32e72a48..3707dc0d 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.bus.device.rpc.ItemHandlerDevice; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.bus.device.rpc.ItemHandlerDevice; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraftforge.items.IItemHandler; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java similarity index 71% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java index 84c4981e..7ae76b4e 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.capabilities.Capabilities; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/MemoryItemDeviceProvider.java similarity index 72% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/MemoryItemDeviceProvider.java index 9c1ac114..9e162980 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/MemoryItemDeviceProvider.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.MemoryDevice; -import li.cil.oc2.common.item.MemoryItem; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.MemoryDevice; +import li.cil.oc2r.common.item.MemoryItem; import net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java similarity index 63% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java index f89ef106..aa962d03 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.NetworkInterfaceCardDevice; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.NetworkInterfaceCardDevice; +import li.cil.oc2r.common.item.Items; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java similarity index 63% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java index 381c0a01..03ae94b3 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.NetworkTunnelDevice; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.NetworkTunnelDevice; +import li.cil.oc2r.common.item.Items; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java similarity index 63% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java index 49a770d6..ad7319ce 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.vm.item.NetworkTunnelDevice; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.vm.item.NetworkTunnelDevice; +import li.cil.oc2r.common.item.Items; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java similarity index 65% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java index c1d6811e..eff3d9fa 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.item.RedstoneInterfaceCardItemDevice; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.item.RedstoneInterfaceCardItemDevice; +import li.cil.oc2r.common.item.Items; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/SoundCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/SoundCardItemDeviceProvider.java similarity index 60% rename from src/main/java/li/cil/oc2/common/bus/device/provider/item/SoundCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/item/SoundCardItemDeviceProvider.java index aa079fed..f6508bc8 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/SoundCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/SoundCardItemDeviceProvider.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.item; +package li.cil.oc2r.common.bus.device.provider.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.item.SoundCardItemDevice; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.util.LocationSupplierUtils; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.device.provider.util.AbstractItemDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.item.SoundCardItemDevice; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.util.LocationSupplierUtils; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/package-info.java new file mode 100644 index 00000000..9b960759 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.provider.item; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/package-info.java new file mode 100644 index 00000000..51ebc486 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.provider; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockDeviceProvider.java similarity index 51% rename from src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockDeviceProvider.java index 442fbaef..61372eb9 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockDeviceProvider.java @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.util; +package li.cil.oc2r.common.bus.device.provider.util; -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; public abstract class AbstractBlockDeviceProvider implements BlockDeviceProvider { } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java similarity index 89% rename from src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java index aadd6685..1fbc55e8 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.util; +package li.cil.oc2r.common.bus.device.provider.util; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.util.LazyOptionalUtils; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.util.LazyOptionalUtils; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java similarity index 87% rename from src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java index 92ab734e..ce140895 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.util; +package li.cil.oc2r.common.bus.device.provider.util; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractItemDeviceProvider.java similarity index 88% rename from src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractItemDeviceProvider.java index eadb2932..4e1092b3 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractItemDeviceProvider.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.provider.util; +package li.cil.oc2r.common.bus.device.provider.util; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/package-info.java new file mode 100644 index 00000000..7eff3003 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.provider.util; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/EnergyStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/EnergyStorageDevice.java similarity index 81% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/EnergyStorageDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/EnergyStorageDevice.java index b1c57ab8..c263df6e 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/EnergyStorageDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/EnergyStorageDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.NamedDevice; -import li.cil.oc2.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.NamedDevice; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; import net.minecraftforge.energy.IEnergyStorage; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/FluidHandlerDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/FluidHandlerDevice.java similarity index 80% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/FluidHandlerDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/FluidHandlerDevice.java index 1c62f902..51e6384b 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/FluidHandlerDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/FluidHandlerDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.NamedDevice; -import li.cil.oc2.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.NamedDevice; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/ItemHandlerDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/ItemHandlerDevice.java similarity index 80% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/ItemHandlerDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/ItemHandlerDevice.java index 5b2979e4..3fdbeb4a 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/ItemHandlerDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/ItemHandlerDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.NamedDevice; -import li.cil.oc2.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.NamedDevice; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCDeviceList.java similarity index 91% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCDeviceList.java index deb283f7..da7ec89c 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCDeviceList.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; -import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.rpc.RPCMethodGroup; import net.minecraft.nbt.CompoundTag; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilter.java similarity index 96% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilter.java index 0543c662..f648ca14 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilter.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilters.java similarity index 97% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilters.java index 890becae..41e758fa 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilters.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java similarity index 83% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java index f3fbfe8d..bd178441 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; import com.google.gson.GsonBuilder; -import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; -import li.cil.oc2.common.serialization.gson.DirectionJsonSerializer; -import li.cil.oc2.common.serialization.gson.ItemStackJsonSerializer; +import li.cil.oc2r.api.imc.RPCMethodParameterTypeAdapter; +import li.cil.oc2r.common.serialization.gson.DirectionJsonSerializer; +import li.cil.oc2r.common.serialization.gson.ItemStackJsonSerializer; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/TypeNameRPCDevice.java similarity index 70% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/TypeNameRPCDevice.java index 891e43f0..b0b0a987 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/TypeNameRPCDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc; +package li.cil.oc2r.common.bus.device.rpc; -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.RPCMethodGroup; +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.RPCMethodGroup; import java.util.List; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java similarity index 57% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java index 599690b7..c7aa858d 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.block; +package li.cil.oc2r.common.bus.device.rpc.block; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.object.Callbacks; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.bus.device.provider.util.AbstractBlockEntityDeviceProvider; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.object.Callbacks; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.bus.device.provider.util.AbstractBlockEntityDeviceProvider; import net.minecraft.world.level.block.entity.BlockEntity; public final class BlockEntityObjectDeviceProvider extends AbstractBlockEntityDeviceProvider { diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java similarity index 69% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java index cbfc658d..52752411 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.block; +package li.cil.oc2r.common.bus.device.rpc.block; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.object.Callbacks; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.bus.device.provider.util.AbstractBlockDeviceProvider; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.object.Callbacks; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.bus.device.provider.util.AbstractBlockDeviceProvider; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java similarity index 59% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java index 5b68a060..ecace198 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.block; +package li.cil.oc2r.common.bus.device.rpc.block; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.EnergyStorageDevice; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.EnergyStorageDevice; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.energy.IEnergyStorage; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java similarity index 59% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java index a98de15d..42f06bd3 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.block; +package li.cil.oc2r.common.bus.device.rpc.block; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.FluidHandlerDevice; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.FluidHandlerDevice; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java similarity index 58% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java index 037b9b63..dfc15d97 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.block; +package li.cil.oc2r.common.bus.device.rpc.block; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; -import li.cil.oc2.common.bus.device.rpc.ItemHandlerDevice; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.bus.device.provider.util.AbstractBlockEntityCapabilityDeviceProvider; +import li.cil.oc2r.common.bus.device.rpc.ItemHandlerDevice; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/package-info.java new file mode 100644 index 00000000..740e932b --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.rpc.block; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/AbstractItemRPCDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/AbstractItemRPCDevice.java similarity index 71% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/item/AbstractItemRPCDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/item/AbstractItemRPCDevice.java index 967013bc..f30dbbe3 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/AbstractItemRPCDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/AbstractItemRPCDevice.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.item; +package li.cil.oc2r.common.bus.device.rpc.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; -import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup; -import li.cil.oc2.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.rpc.RPCMethodGroup; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; import net.minecraft.world.item.ItemStack; import java.util.List; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/BlockOperationsModuleDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/BlockOperationsModuleDevice.java similarity index 96% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/item/BlockOperationsModuleDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/item/BlockOperationsModuleDevice.java index d00cb565..6430b8e4 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/BlockOperationsModuleDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/BlockOperationsModuleDevice.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.item; +package li.cil.oc2r.common.bus.device.rpc.item; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.Parameter; -import li.cil.oc2.api.capabilities.Robot; -import li.cil.oc2.api.util.RobotOperationSide; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.util.FakePlayerUtils; -import li.cil.oc2.common.util.TickUtils; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.Parameter; +import li.cil.oc2r.api.capabilities.Robot; +import li.cil.oc2r.api.util.RobotOperationSide; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.util.FakePlayerUtils; +import li.cil.oc2r.common.util.TickUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/CPUItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/CPUItemDevice.java similarity index 73% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/item/CPUItemDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/item/CPUItemDevice.java index 865acd26..b63c7973 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/CPUItemDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/CPUItemDevice.java @@ -1,7 +1,7 @@ -package li.cil.oc2.common.bus.device.rpc.item; +package li.cil.oc2r.common.bus.device.rpc.item; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.common.item.CPUItem; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.common.item.CPUItem; import net.minecraft.world.item.ItemStack; public class CPUItemDevice extends AbstractItemRPCDevice { diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/FileImportExportCardItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/FileImportExportCardItemDevice.java similarity index 95% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/item/FileImportExportCardItemDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/item/FileImportExportCardItemDevice.java index deba9c40..0b5e2e1c 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/FileImportExportCardItemDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/FileImportExportCardItemDevice.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.item; +package li.cil.oc2r.common.bus.device.rpc.item; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.DocumentedDevice; -import li.cil.oc2.api.bus.device.object.Parameter; -import li.cil.oc2.api.capabilities.TerminalUserProvider; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.ExportedFileMessage; -import li.cil.oc2.common.network.message.RequestImportedFileMessage; -import li.cil.oc2.common.network.message.ServerCanceledImportFileMessage; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.DocumentedDevice; +import li.cil.oc2r.api.bus.device.object.Parameter; +import li.cil.oc2r.api.capabilities.TerminalUserProvider; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.ExportedFileMessage; +import li.cil.oc2r.common.network.message.RequestImportedFileMessage; +import li.cil.oc2r.common.network.message.ServerCanceledImportFileMessage; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.StringUtil; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java similarity index 97% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java index 28929a9f..91209b14 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.item; +package li.cil.oc2r.common.bus.device.rpc.item; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.Parameter; -import li.cil.oc2.api.capabilities.Robot; -import li.cil.oc2.api.util.RobotOperationSide; -import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.Parameter; +import li.cil.oc2r.api.capabilities.Robot; +import li.cil.oc2r.api.util.RobotOperationSide; +import li.cil.oc2r.common.capabilities.Capabilities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java similarity index 93% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java index b5b04648..3164e7dd 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.item; +package li.cil.oc2r.common.bus.device.rpc.item; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.DocumentedDevice; -import li.cil.oc2.api.bus.device.object.Parameter; -import li.cil.oc2.api.capabilities.RedstoneEmitter; -import li.cil.oc2.api.util.Side; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.util.HorizontalBlockUtils; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.DocumentedDevice; +import li.cil.oc2r.api.bus.device.object.Parameter; +import li.cil.oc2r.api.capabilities.RedstoneEmitter; +import li.cil.oc2r.api.util.Side; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.util.HorizontalBlockUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java similarity index 92% rename from src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java index 43fe006d..c32e1ded 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.rpc.item; +package li.cil.oc2r.common.bus.device.rpc.item; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.Parameter; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.util.BlockLocation; -import li.cil.oc2.common.util.TickUtils; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.Parameter; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.util.BlockLocation; +import li.cil.oc2r.common.util.TickUtils; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/package-info.java new file mode 100644 index 00000000..943da86c --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.rpc.item; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/package-info.java new file mode 100644 index 00000000..3a355392 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/rpc/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.rpc; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/AbstractDeviceInfo.java b/src/main/java/li/cil/oc2r/common/bus/device/util/AbstractDeviceInfo.java similarity index 92% rename from src/main/java/li/cil/oc2/common/bus/device/util/AbstractDeviceInfo.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/AbstractDeviceInfo.java index 1c3e9fcb..8dc52217 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/AbstractDeviceInfo.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/AbstractDeviceInfo.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; -import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.Device; import javax.annotation.Nullable; import java.util.Objects; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/BlockDeviceInfo.java b/src/main/java/li/cil/oc2r/common/bus/device/util/BlockDeviceInfo.java similarity index 68% rename from src/main/java/li/cil/oc2/common/bus/device/util/BlockDeviceInfo.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/BlockDeviceInfo.java index 862b8984..fc20e26c 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/BlockDeviceInfo.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/BlockDeviceInfo.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java b/src/main/java/li/cil/oc2r/common/bus/device/util/DeviceTypeImpl.java similarity index 89% rename from src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/DeviceTypeImpl.java index f314dad4..e7d9108f 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/DeviceTypeImpl.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; -import li.cil.oc2.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.DeviceType; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java b/src/main/java/li/cil/oc2r/common/bus/device/util/Devices.java similarity index 91% rename from src/main/java/li/cil/oc2/common/bus/device/util/Devices.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/Devices.java index 69ed68f6..c03d7ff4 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/Devices.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.ItemDevice; -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.provider.ItemDeviceProvider; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.api.util.Invalidatable; -import li.cil.oc2.common.bus.device.DeviceGroup; -import li.cil.oc2.common.bus.device.provider.Providers; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.ItemDevice; +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.provider.ItemDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2r.common.bus.device.DeviceGroup; +import li.cil.oc2r.common.bus.device.provider.Providers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/IdentityProxy.java b/src/main/java/li/cil/oc2r/common/bus/device/util/IdentityProxy.java similarity index 94% rename from src/main/java/li/cil/oc2/common/bus/device/util/IdentityProxy.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/IdentityProxy.java index 74f0de4e..7574bfde 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/IdentityProxy.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/IdentityProxy.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; import javax.annotation.Nullable; import java.util.Objects; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/ItemDeviceInfo.java b/src/main/java/li/cil/oc2r/common/bus/device/util/ItemDeviceInfo.java similarity index 81% rename from src/main/java/li/cil/oc2/common/bus/device/util/ItemDeviceInfo.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/ItemDeviceInfo.java index f35e0156..e08b87e3 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/ItemDeviceInfo.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/ItemDeviceInfo.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/OptionalAddress.java b/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalAddress.java similarity index 91% rename from src/main/java/li/cil/oc2/common/bus/device/util/OptionalAddress.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/OptionalAddress.java index e2d56680..8ff8bd5b 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/OptionalAddress.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalAddress.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; -import li.cil.oc2.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; import li.cil.sedna.api.device.MemoryMappedDevice; import java.util.OptionalLong; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/OptionalInterrupt.java b/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalInterrupt.java similarity index 90% rename from src/main/java/li/cil/oc2/common/bus/device/util/OptionalInterrupt.java rename to src/main/java/li/cil/oc2r/common/bus/device/util/OptionalInterrupt.java index 2cd709ad..5bc10ef1 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/OptionalInterrupt.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalInterrupt.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.util; +package li.cil.oc2r.common.bus.device.util; -import li.cil.oc2.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; import java.util.OptionalInt; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/util/package-info.java new file mode 100644 index 00000000..a5c4d2b7 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/util/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.util; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveContainer.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveContainer.java similarity index 79% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveContainer.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveContainer.java index 924fbdc8..5e4bc848 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveContainer.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveContainer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveDevice.java similarity index 93% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveDevice.java index a8bfbf27..64d7ac12 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; -import li.cil.oc2.common.bus.device.vm.item.AbstractBlockStorageDevice; -import li.cil.oc2.common.item.FloppyItem; -import li.cil.oc2.common.serialization.BlobStorage; +import li.cil.oc2r.common.bus.device.vm.item.AbstractBlockStorageDevice; +import li.cil.oc2r.common.item.FloppyItem; +import li.cil.oc2r.common.serialization.BlobStorage; import li.cil.sedna.api.device.BlockDevice; import li.cil.sedna.device.block.ByteBufferBlockDevice; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherContainer.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherContainer.java similarity index 80% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherContainer.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherContainer.java index 57243cc9..a9e82c1f 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherContainer.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherContainer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherDevice.java similarity index 93% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherDevice.java index 07e30b8f..5bc38c4d 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; -import li.cil.oc2.common.bus.device.vm.item.AbstractBlockStorageDevice; -import li.cil.oc2.common.item.FlashMemoryItem; -import li.cil.oc2.common.serialization.BlobStorage; +import li.cil.oc2r.common.bus.device.vm.item.AbstractBlockStorageDevice; +import li.cil.oc2r.common.item.FlashMemoryItem; +import li.cil.oc2r.common.serialization.BlobStorage; import li.cil.sedna.api.device.BlockDevice; import li.cil.sedna.device.block.ByteBufferBlockDevice; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/KeyboardDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/KeyboardDevice.java similarity index 86% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/KeyboardDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/KeyboardDevice.java index 416ab8a4..68d535ee 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/KeyboardDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/KeyboardDevice.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.bus.device.util.OptionalInterrupt; -import li.cil.oc2.common.serialization.NBTSerialization; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.bus.device.util.OptionalInterrupt; +import li.cil.oc2r.common.serialization.NBTSerialization; +import li.cil.oc2r.common.util.NBTTagIds; import li.cil.sedna.device.virtio.VirtIOKeyboardDevice; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/MonitorDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/MonitorDevice.java similarity index 88% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/MonitorDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/MonitorDevice.java index da75c96e..79de3970 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/MonitorDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/MonitorDevice.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.serialization.BlobStorage; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.vm.device.SimpleFramebufferDevice; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.serialization.BlobStorage; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.vm.device.SimpleFramebufferDevice; +import li.cil.oc2r.jcodec.common.model.Picture; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/PciCardCageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/PciCardCageDevice.java similarity index 88% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/PciCardCageDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/PciCardCageDevice.java index 2bfb8050..4b0f3bad 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/PciCardCageDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/PciCardCageDevice.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.serialization.BlobStorage; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.vm.device.PciRootPortDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.serialization.BlobStorage; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.vm.device.PciRootPortDevice; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/ProjectorDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/ProjectorDevice.java similarity index 88% rename from src/main/java/li/cil/oc2/common/bus/device/vm/block/ProjectorDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/block/ProjectorDevice.java index 09379400..939f5a83 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/ProjectorDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/ProjectorDevice.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.block; +package li.cil.oc2r.common.bus.device.vm.block; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.serialization.BlobStorage; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.vm.device.SimpleFramebufferDevice; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.serialization.BlobStorage; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.vm.device.SimpleFramebufferDevice; +import li.cil.oc2r.jcodec.common.model.Picture; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/package-info.java new file mode 100644 index 00000000..857d6367 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.vm.block; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractBlockStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractBlockStorageDevice.java similarity index 93% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractBlockStorageDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractBlockStorageDevice.java index cf295d71..93af0716 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractBlockStorageDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractBlockStorageDevice.java @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; import com.google.common.eventbus.Subscribe; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.api.bus.device.vm.event.VMResumedRunningEvent; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.bus.device.util.OptionalInterrupt; -import li.cil.oc2.common.serialization.BlobStorage; -import li.cil.oc2.common.serialization.NBTSerialization; -import li.cil.oc2.common.util.Event; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.event.VMResumedRunningEvent; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.bus.device.util.OptionalInterrupt; +import li.cil.oc2r.common.serialization.BlobStorage; +import li.cil.oc2r.common.serialization.NBTSerialization; +import li.cil.oc2r.common.util.Event; +import li.cil.oc2r.common.util.NBTTagIds; import li.cil.sedna.api.device.BlockDevice; import li.cil.sedna.device.virtio.VirtIOBlockDevice; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java similarity index 87% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java index 97ffe50f..bb50bb39 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.bus.device.util.OptionalInterrupt; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.serialization.NBTSerialization; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.bus.device.util.OptionalInterrupt; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.serialization.NBTSerialization; +import li.cil.oc2r.common.util.NBTTagIds; import li.cil.sedna.device.virtio.VirtIONetworkDevice; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java similarity index 85% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java index 72dab850..087b0518 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; import com.google.common.eventbus.Subscribe; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.vm.FirmwareLoader; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.api.bus.device.vm.event.VMInitializationException; -import li.cil.oc2.api.bus.device.vm.event.VMInitializingEvent; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.serialization.BlobStorage; -import li.cil.oc2.common.util.ItemStackUtils; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.vm.FirmwareLoader; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.event.VMInitializationException; +import li.cil.oc2r.api.bus.device.vm.event.VMInitializingEvent; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.serialization.BlobStorage; +import li.cil.oc2r.common.util.ItemStackUtils; import li.cil.sedna.api.memory.MemoryAccessException; import li.cil.sedna.api.memory.MemoryMap; import li.cil.sedna.device.flash.FlashMemoryDevice; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/FirmwareFlashStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/FirmwareFlashStorageDevice.java similarity index 71% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/FirmwareFlashStorageDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/FirmwareFlashStorageDevice.java index 05b670ef..22422806 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/FirmwareFlashStorageDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/FirmwareFlashStorageDevice.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; import com.google.common.eventbus.Subscribe; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.data.Firmware; -import li.cil.oc2.api.bus.device.vm.FirmwareLoader; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.api.bus.device.vm.event.VMInitializationException; -import li.cil.oc2.api.bus.device.vm.event.VMInitializingEvent; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.data.Firmware; +import li.cil.oc2r.api.bus.device.vm.FirmwareLoader; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.bus.device.vm.event.VMInitializationException; +import li.cil.oc2r.api.bus.device.vm.event.VMInitializingEvent; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; import li.cil.sedna.api.memory.MemoryMap; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDevice.java similarity index 87% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDevice.java index 9fabae4f..a786eb3c 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDevice.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; -import li.cil.oc2.common.serialization.BlobStorage; -import li.cil.oc2.common.util.BlockLocation; -import li.cil.oc2.common.util.SoundEvents; -import li.cil.oc2.common.util.ThrottledSoundEmitter; +import li.cil.oc2r.common.serialization.BlobStorage; +import li.cil.oc2r.common.util.BlockLocation; +import li.cil.oc2r.common.util.SoundEvents; +import li.cil.oc2r.common.util.ThrottledSoundEmitter; import li.cil.sedna.device.block.ByteBufferBlockDevice; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java similarity index 94% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java index 4c405b6b..b4428638 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; import com.google.common.io.ByteStreams; -import li.cil.oc2.common.util.BlockLocation; +import li.cil.oc2r.common.util.BlockLocation; import li.cil.sedna.api.device.BlockDevice; import li.cil.sedna.device.block.ByteBufferBlockDevice; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/MemoryDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/MemoryDevice.java similarity index 87% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/MemoryDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/MemoryDevice.java index 5ed766ef..efac476f 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/MemoryDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/MemoryDevice.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.device.util.IdentityProxy; -import li.cil.oc2.common.bus.device.util.OptionalAddress; -import li.cil.oc2.common.serialization.BlobStorage; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2r.common.bus.device.util.OptionalAddress; +import li.cil.oc2r.common.serialization.BlobStorage; +import li.cil.oc2r.common.util.NBTTagIds; import li.cil.sedna.api.device.PhysicalMemory; import li.cil.sedna.device.memory.ByteBufferMemory; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkInterfaceCardDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java similarity index 89% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkInterfaceCardDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java index 30d80ba6..1b656b06 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkInterfaceCardDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; -import li.cil.oc2.common.item.NetworkInterfaceCardItem; +import li.cil.oc2r.common.item.NetworkInterfaceCardItem; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkTunnelDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkTunnelDevice.java similarity index 92% rename from src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkTunnelDevice.java rename to src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkTunnelDevice.java index d75af425..d86d0d8d 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkTunnelDevice.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkTunnelDevice.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.bus.device.vm.item; +package li.cil.oc2r.common.bus.device.vm.item; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.api.bus.device.vm.context.VMContext; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.common.item.NetworkTunnelItem; -import li.cil.oc2.common.util.TickUtils; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.common.item.NetworkTunnelItem; +import li.cil.oc2r.common.util.TickUtils; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/package-info.java new file mode 100644 index 00000000..f0a39ac7 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.vm.item; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/package-info.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/package-info.java new file mode 100644 index 00000000..853d5311 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/device/vm/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus.device.vm; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/package-info.java b/src/main/java/li/cil/oc2r/common/bus/package-info.java new file mode 100644 index 00000000..34166f44 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/bus/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.bus; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java b/src/main/java/li/cil/oc2r/common/capabilities/Capabilities.java similarity index 83% rename from src/main/java/li/cil/oc2/common/capabilities/Capabilities.java rename to src/main/java/li/cil/oc2r/common/capabilities/Capabilities.java index f285b50b..d02fa511 100644 --- a/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java +++ b/src/main/java/li/cil/oc2r/common/capabilities/Capabilities.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.capabilities; +package li.cil.oc2r.common.capabilities; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.api.capabilities.RedstoneEmitter; -import li.cil.oc2.api.capabilities.Robot; -import li.cil.oc2.api.capabilities.TerminalUserProvider; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.api.capabilities.RedstoneEmitter; +import li.cil.oc2r.api.capabilities.Robot; +import li.cil.oc2r.api.capabilities.TerminalUserProvider; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java b/src/main/java/li/cil/oc2r/common/capabilities/CapabilityRegistry.java similarity index 84% rename from src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java rename to src/main/java/li/cil/oc2r/common/capabilities/CapabilityRegistry.java index 8c1067e8..7e7ca0e2 100644 --- a/src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java +++ b/src/main/java/li/cil/oc2r/common/capabilities/CapabilityRegistry.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.capabilities; +package li.cil.oc2r.common.capabilities; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.api.capabilities.RedstoneEmitter; -import li.cil.oc2.api.capabilities.Robot; -import li.cil.oc2.api.capabilities.TerminalUserProvider; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.api.capabilities.RedstoneEmitter; +import li.cil.oc2r.api.capabilities.Robot; +import li.cil.oc2r.api.capabilities.TerminalUserProvider; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.capabilities.CapabilityToken; diff --git a/src/main/java/li/cil/oc2r/common/capabilities/package-info.java b/src/main/java/li/cil/oc2r/common/capabilities/package-info.java new file mode 100644 index 00000000..a8c6a191 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/capabilities/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.capabilities; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractComputerContainer.java similarity index 83% rename from src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java rename to src/main/java/li/cil/oc2r/common/container/AbstractComputerContainer.java index 8446379c..a725675b 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractComputerContainer.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.ComputerPowerMessage; -import li.cil.oc2.common.network.message.ComputerTerminalInputMessage; -import li.cil.oc2.common.network.message.OpenComputerInventoryMessage; -import li.cil.oc2.common.network.message.OpenComputerTerminalMessage; -import li.cil.oc2.common.vm.Terminal; -import li.cil.oc2.common.vm.VirtualMachine; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.ComputerPowerMessage; +import li.cil.oc2r.common.network.message.ComputerTerminalInputMessage; +import li.cil.oc2r.common.network.message.OpenComputerInventoryMessage; +import li.cil.oc2r.common.network.message.OpenComputerTerminalMessage; +import li.cil.oc2r.common.vm.Terminal; +import li.cil.oc2r.common.vm.VirtualMachine; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.inventory.MenuType; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractContainer.java similarity index 99% rename from src/main/java/li/cil/oc2/common/container/AbstractContainer.java rename to src/main/java/li/cil/oc2r/common/container/AbstractContainer.java index 82c205da..edc853cf 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractContainer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractDeviceItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/AbstractDeviceItemStackHandler.java similarity index 96% rename from src/main/java/li/cil/oc2/common/container/AbstractDeviceItemStackHandler.java rename to src/main/java/li/cil/oc2r/common/container/AbstractDeviceItemStackHandler.java index e3d3015f..299ac7b0 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractDeviceItemStackHandler.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractDeviceItemStackHandler.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.bus.AbstractItemDeviceBusElement; +import li.cil.oc2r.common.bus.AbstractItemDeviceBusElement; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractMachineContainer.java similarity index 95% rename from src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java rename to src/main/java/li/cil/oc2r/common/container/AbstractMachineContainer.java index 4ecd7003..9959087e 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractMachineContainer.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.vm.VirtualMachine; +import li.cil.oc2r.common.vm.VirtualMachine; import net.minecraft.world.inventory.MenuType; public abstract class AbstractMachineContainer extends AbstractContainer { diff --git a/src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractMachineTerminalContainer.java similarity index 88% rename from src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java rename to src/main/java/li/cil/oc2r/common/container/AbstractMachineTerminalContainer.java index 3c96f5fd..e6f0f78d 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractMachineTerminalContainer.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.vm.Terminal; +import li.cil.oc2r.common.vm.Terminal; import net.minecraft.world.inventory.MenuType; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractMonitorContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractMonitorContainer.java similarity index 91% rename from src/main/java/li/cil/oc2/common/container/AbstractMonitorContainer.java rename to src/main/java/li/cil/oc2r/common/container/AbstractMonitorContainer.java index 7cdf219b..914e294d 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractMonitorContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractMonitorContainer.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.*; -import li.cil.oc2.common.vm.VirtualMachine; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.*; +import li.cil.oc2r.common.vm.VirtualMachine; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.inventory.MenuType; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractRobotContainer.java similarity index 82% rename from src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java rename to src/main/java/li/cil/oc2r/common/container/AbstractRobotContainer.java index 267d61fb..046c5fc9 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractRobotContainer.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.OpenRobotInventoryMessage; -import li.cil.oc2.common.network.message.OpenRobotTerminalMessage; -import li.cil.oc2.common.network.message.RobotPowerMessage; -import li.cil.oc2.common.network.message.RobotTerminalInputMessage; -import li.cil.oc2.common.vm.Terminal; -import li.cil.oc2.common.vm.VirtualMachine; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.OpenRobotInventoryMessage; +import li.cil.oc2r.common.network.message.OpenRobotTerminalMessage; +import li.cil.oc2r.common.network.message.RobotPowerMessage; +import li.cil.oc2r.common.network.message.RobotTerminalInputMessage; +import li.cil.oc2r.common.vm.Terminal; +import li.cil.oc2r.common.vm.VirtualMachine; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; diff --git a/src/main/java/li/cil/oc2/common/container/AbstractTypedDeviceItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/AbstractTypedDeviceItemStackHandler.java similarity index 89% rename from src/main/java/li/cil/oc2/common/container/AbstractTypedDeviceItemStackHandler.java rename to src/main/java/li/cil/oc2r/common/container/AbstractTypedDeviceItemStackHandler.java index 012a462d..0ebfce69 100644 --- a/src/main/java/li/cil/oc2/common/container/AbstractTypedDeviceItemStackHandler.java +++ b/src/main/java/li/cil/oc2r/common/container/AbstractTypedDeviceItemStackHandler.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.DeviceType; import net.minecraft.world.item.ItemStack; public abstract class AbstractTypedDeviceItemStackHandler extends AbstractDeviceItemStackHandler { diff --git a/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java b/src/main/java/li/cil/oc2r/common/container/ComputerInventoryContainer.java similarity index 93% rename from src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java rename to src/main/java/li/cil/oc2r/common/container/ComputerInventoryContainer.java index 2e8b99ed..72b3e91b 100644 --- a/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/ComputerInventoryContainer.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.vm.VMItemStackHandlers; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.vm.VMItemStackHandlers; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java b/src/main/java/li/cil/oc2r/common/container/ComputerTerminalContainer.java similarity index 93% rename from src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java rename to src/main/java/li/cil/oc2r/common/container/ComputerTerminalContainer.java index b96a3207..3b09985b 100644 --- a/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/ComputerTerminalContainer.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.bus.CommonDeviceBusController; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/container/Containers.java b/src/main/java/li/cil/oc2r/common/container/Containers.java similarity index 96% rename from src/main/java/li/cil/oc2/common/container/Containers.java rename to src/main/java/li/cil/oc2r/common/container/Containers.java index a25eaeab..7156b1a7 100644 --- a/src/main/java/li/cil/oc2/common/container/Containers.java +++ b/src/main/java/li/cil/oc2r/common/container/Containers.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.world.inventory.MenuType; import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/src/main/java/li/cil/oc2/common/container/DeviceTypeSlot.java b/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlot.java similarity index 93% rename from src/main/java/li/cil/oc2/common/container/DeviceTypeSlot.java rename to src/main/java/li/cil/oc2r/common/container/DeviceTypeSlot.java index 7adc1a2b..5eedc3db 100644 --- a/src/main/java/li/cil/oc2/common/container/DeviceTypeSlot.java +++ b/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlot.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; import com.mojang.datafixers.util.Pair; -import li.cil.oc2.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.DeviceType; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.Container; import net.minecraft.world.inventory.InventoryMenu; diff --git a/src/main/java/li/cil/oc2/common/container/DeviceTypeSlotItemHandler.java b/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlotItemHandler.java similarity index 92% rename from src/main/java/li/cil/oc2/common/container/DeviceTypeSlotItemHandler.java rename to src/main/java/li/cil/oc2r/common/container/DeviceTypeSlotItemHandler.java index a98116b1..ea3c018e 100644 --- a/src/main/java/li/cil/oc2/common/container/DeviceTypeSlotItemHandler.java +++ b/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlotItemHandler.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; import com.mojang.datafixers.util.Pair; -import li.cil.oc2.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.DeviceType; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.InventoryMenu; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/FixedSizeItemStackHandler.java similarity index 94% rename from src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java rename to src/main/java/li/cil/oc2r/common/container/FixedSizeItemStackHandler.java index e6171b2c..f9f592a1 100644 --- a/src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java +++ b/src/main/java/li/cil/oc2r/common/container/FixedSizeItemStackHandler.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/container/IntPrecisionContainerData.java b/src/main/java/li/cil/oc2r/common/container/IntPrecisionContainerData.java similarity index 97% rename from src/main/java/li/cil/oc2/common/container/IntPrecisionContainerData.java rename to src/main/java/li/cil/oc2r/common/container/IntPrecisionContainerData.java index 0bc99a3e..23da0140 100644 --- a/src/main/java/li/cil/oc2/common/container/IntPrecisionContainerData.java +++ b/src/main/java/li/cil/oc2r/common/container/IntPrecisionContainerData.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; import net.minecraft.world.inventory.ContainerData; import net.minecraft.world.inventory.SimpleContainerData; diff --git a/src/main/java/li/cil/oc2/common/container/LockedSlot.java b/src/main/java/li/cil/oc2r/common/container/LockedSlot.java similarity index 94% rename from src/main/java/li/cil/oc2/common/container/LockedSlot.java rename to src/main/java/li/cil/oc2r/common/container/LockedSlot.java index 94963092..6da31ea3 100644 --- a/src/main/java/li/cil/oc2/common/container/LockedSlot.java +++ b/src/main/java/li/cil/oc2r/common/container/LockedSlot.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/li/cil/oc2/common/container/MonitorDisplayContainer.java b/src/main/java/li/cil/oc2r/common/container/MonitorDisplayContainer.java similarity index 95% rename from src/main/java/li/cil/oc2/common/container/MonitorDisplayContainer.java rename to src/main/java/li/cil/oc2r/common/container/MonitorDisplayContainer.java index db172181..2ca6c3e5 100644 --- a/src/main/java/li/cil/oc2/common/container/MonitorDisplayContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/MonitorDisplayContainer.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/container/NetworkTunnelContainer.java b/src/main/java/li/cil/oc2r/common/container/NetworkTunnelContainer.java similarity index 95% rename from src/main/java/li/cil/oc2/common/container/NetworkTunnelContainer.java rename to src/main/java/li/cil/oc2r/common/container/NetworkTunnelContainer.java index c24db235..d67454de 100644 --- a/src/main/java/li/cil/oc2/common/container/NetworkTunnelContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/NetworkTunnelContainer.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.common.item.NetworkTunnelItem; -import li.cil.oc2.common.tags.ItemTags; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.common.item.NetworkTunnelItem; +import li.cil.oc2r.common.tags.ItemTags; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java b/src/main/java/li/cil/oc2r/common/container/RobotInventoryContainer.java similarity index 93% rename from src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java rename to src/main/java/li/cil/oc2r/common/container/RobotInventoryContainer.java index 43ad00c2..71009f59 100644 --- a/src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/RobotInventoryContainer.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.vm.VMItemStackHandlers; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.vm.VMItemStackHandlers; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/li/cil/oc2/common/container/RobotSlot.java b/src/main/java/li/cil/oc2r/common/container/RobotSlot.java similarity index 93% rename from src/main/java/li/cil/oc2/common/container/RobotSlot.java rename to src/main/java/li/cil/oc2r/common/container/RobotSlot.java index 360c55fe..b32c8c68 100644 --- a/src/main/java/li/cil/oc2/common/container/RobotSlot.java +++ b/src/main/java/li/cil/oc2r/common/container/RobotSlot.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java b/src/main/java/li/cil/oc2r/common/container/RobotTerminalContainer.java similarity index 92% rename from src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java rename to src/main/java/li/cil/oc2r/common/container/RobotTerminalContainer.java index 31f80e76..01ddf325 100644 --- a/src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java +++ b/src/main/java/li/cil/oc2r/common/container/RobotTerminalContainer.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; -import li.cil.oc2.client.gui.Sprites; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.client.gui.Sprites; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/TypedItemStackHandler.java similarity index 95% rename from src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java rename to src/main/java/li/cil/oc2r/common/container/TypedItemStackHandler.java index c5a0b33d..5a2ffb38 100644 --- a/src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java +++ b/src/main/java/li/cil/oc2r/common/container/TypedItemStackHandler.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.container; +package li.cil.oc2r.common.container; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/li/cil/oc2r/common/container/package-info.java b/src/main/java/li/cil/oc2r/common/container/package-info.java new file mode 100644 index 00000000..b1769d13 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/container/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.container; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java b/src/main/java/li/cil/oc2r/common/energy/EnergyStorageItemStack.java similarity index 94% rename from src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java rename to src/main/java/li/cil/oc2r/common/energy/EnergyStorageItemStack.java index c3a902ff..5b91bcd2 100644 --- a/src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java +++ b/src/main/java/li/cil/oc2r/common/energy/EnergyStorageItemStack.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.energy; +package li.cil.oc2r.common.energy; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.util.NBTUtils; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.util.NBTUtils; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/li/cil/oc2/common/energy/FixedEnergyStorage.java b/src/main/java/li/cil/oc2r/common/energy/FixedEnergyStorage.java similarity index 96% rename from src/main/java/li/cil/oc2/common/energy/FixedEnergyStorage.java rename to src/main/java/li/cil/oc2r/common/energy/FixedEnergyStorage.java index 652d95f7..0a11c7f9 100644 --- a/src/main/java/li/cil/oc2/common/energy/FixedEnergyStorage.java +++ b/src/main/java/li/cil/oc2r/common/energy/FixedEnergyStorage.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.energy; +package li.cil.oc2r.common.energy; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/li/cil/oc2r/common/energy/package-info.java b/src/main/java/li/cil/oc2r/common/energy/package-info.java new file mode 100644 index 00000000..b5f60ef4 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/energy/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.energy; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/entity/Entities.java b/src/main/java/li/cil/oc2r/common/entity/Entities.java similarity index 95% rename from src/main/java/li/cil/oc2/common/entity/Entities.java rename to src/main/java/li/cil/oc2r/common/entity/Entities.java index 4bcb392c..999d0e03 100644 --- a/src/main/java/li/cil/oc2/common/entity/Entities.java +++ b/src/main/java/li/cil/oc2r/common/entity/Entities.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity; +package li.cil.oc2r.common.entity; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; diff --git a/src/main/java/li/cil/oc2/common/entity/Robot.java b/src/main/java/li/cil/oc2r/common/entity/Robot.java similarity index 95% rename from src/main/java/li/cil/oc2/common/entity/Robot.java rename to src/main/java/li/cil/oc2r/common/entity/Robot.java index 584f24da..a69428a3 100644 --- a/src/main/java/li/cil/oc2/common/entity/Robot.java +++ b/src/main/java/li/cil/oc2r/common/entity/Robot.java @@ -1,35 +1,35 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity; +package li.cil.oc2r.common.entity; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.DeviceTypes; -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.object.Parameter; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.api.capabilities.TerminalUserProvider; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.bus.AbstractDeviceBusElement; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.bus.device.util.Devices; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.container.FixedSizeItemStackHandler; -import li.cil.oc2.common.container.RobotInventoryContainer; -import li.cil.oc2.common.container.RobotTerminalContainer; -import li.cil.oc2.common.energy.FixedEnergyStorage; -import li.cil.oc2.common.entity.robot.*; -import li.cil.oc2.common.integration.Wrenches; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.message.*; -import li.cil.oc2.common.serialization.NBTSerialization; -import li.cil.oc2.common.util.LevelUtils; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.util.NBTUtils; -import li.cil.oc2.common.util.TerminalUtils; -import li.cil.oc2.common.vm.*; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.DeviceTypes; +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.object.Parameter; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.capabilities.TerminalUserProvider; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.bus.AbstractDeviceBusElement; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.bus.device.util.Devices; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.container.FixedSizeItemStackHandler; +import li.cil.oc2r.common.container.RobotInventoryContainer; +import li.cil.oc2r.common.container.RobotTerminalContainer; +import li.cil.oc2r.common.energy.FixedEnergyStorage; +import li.cil.oc2r.common.entity.robot.*; +import li.cil.oc2r.common.integration.Wrenches; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.network.Network; +import li.cil.oc2r.common.network.message.*; +import li.cil.oc2r.common.serialization.NBTSerialization; +import li.cil.oc2r.common.util.LevelUtils; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTUtils; +import li.cil.oc2r.common.util.TerminalUtils; +import li.cil.oc2r.common.vm.*; import net.minecraft.core.BlockPos; import net.minecraft.core.Cursor3D; import net.minecraft.core.Direction; @@ -83,9 +83,9 @@ import java.util.*; import java.util.function.Consumer; import static java.util.Collections.singleton; -import static li.cil.oc2.common.Constants.*; +import static li.cil.oc2r.common.Constants.*; -public final class Robot extends Entity implements li.cil.oc2.api.capabilities.Robot, TerminalUserProvider { +public final class Robot extends Entity implements li.cil.oc2r.api.capabilities.Robot, TerminalUserProvider { public static final EntityDataAccessor TARGET_POSITION = SynchedEntityData.defineId(Robot.class, EntityDataSerializers.BLOCK_POS); public static final EntityDataAccessor TARGET_DIRECTION = SynchedEntityData.defineId(Robot.class, EntityDataSerializers.DIRECTION); public static final EntityDataAccessor SELECTED_SLOT = SynchedEntityData.defineId(Robot.class, EntityDataSerializers.BYTE); diff --git a/src/main/java/li/cil/oc2r/common/entity/package-info.java b/src/main/java/li/cil/oc2r/common/entity/package-info.java new file mode 100644 index 00000000..d9e1f464 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/entity/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.entity; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotAction.java b/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotAction.java similarity index 94% rename from src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotAction.java rename to src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotAction.java index 0095e424..734c58a4 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotAction.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotAction.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.nbt.CompoundTag; public abstract class AbstractRobotAction { diff --git a/src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotActionType.java b/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotActionType.java similarity index 89% rename from src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotActionType.java rename to src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotActionType.java index 23d3a736..cc60a7d2 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotActionType.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotActionType.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.nbt.CompoundTag; public abstract class AbstractRobotActionType { diff --git a/src/main/java/li/cil/oc2/common/entity/robot/MovementDirection.java b/src/main/java/li/cil/oc2r/common/entity/robot/MovementDirection.java similarity index 96% rename from src/main/java/li/cil/oc2/common/entity/robot/MovementDirection.java rename to src/main/java/li/cil/oc2r/common/entity/robot/MovementDirection.java index a928f395..e95f04a2 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/MovementDirection.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/MovementDirection.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotActionResult.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotActionResult.java similarity index 73% rename from src/main/java/li/cil/oc2/common/entity/robot/RobotActionResult.java rename to src/main/java/li/cil/oc2r/common/entity/robot/RobotActionResult.java index 9218ff55..467213ac 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotActionResult.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/RobotActionResult.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; public enum RobotActionResult { INCOMPLETE, diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotActions.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotActions.java similarity index 96% rename from src/main/java/li/cil/oc2/common/entity/robot/RobotActions.java rename to src/main/java/li/cil/oc2r/common/entity/robot/RobotActions.java index 44a5e8aa..cde76a34 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotActions.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/RobotActions.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.nbt.CompoundTag; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementAction.java similarity index 96% rename from src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java rename to src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementAction.java index c7240c33..8fd01aaf 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementAction.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; -import li.cil.oc2.common.entity.Entities; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.util.NBTUtils; -import li.cil.oc2.common.util.TickUtils; +import li.cil.oc2r.common.entity.Entities; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTUtils; +import li.cil.oc2r.common.util.TickUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementActionType.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementActionType.java similarity index 93% rename from src/main/java/li/cil/oc2/common/entity/robot/RobotMovementActionType.java rename to src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementActionType.java index 10048178..0b6430d5 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementActionType.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementActionType.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationAction.java similarity index 93% rename from src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java rename to src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationAction.java index 4be8dc6a..b7b2bdbc 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationAction.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.util.NBTUtils; -import li.cil.oc2.common.util.TickUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTUtils; +import li.cil.oc2r.common.util.TickUtils; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationActionType.java similarity index 94% rename from src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java rename to src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationActionType.java index 29ab37d8..99d75aed 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationActionType.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; -import li.cil.oc2.common.entity.Robot; +import li.cil.oc2r.common.entity.Robot; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/RotationDirection.java b/src/main/java/li/cil/oc2r/common/entity/robot/RotationDirection.java similarity index 95% rename from src/main/java/li/cil/oc2/common/entity/robot/RotationDirection.java rename to src/main/java/li/cil/oc2r/common/entity/robot/RotationDirection.java index c4c39a24..140d52a5 100644 --- a/src/main/java/li/cil/oc2/common/entity/robot/RotationDirection.java +++ b/src/main/java/li/cil/oc2r/common/entity/robot/RotationDirection.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.entity.robot; +package li.cil.oc2r.common.entity.robot; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/package-info.java b/src/main/java/li/cil/oc2r/common/entity/robot/package-info.java new file mode 100644 index 00000000..b24c25c7 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/entity/robot/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.entity.robot; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/ext/MinecraftExt.java b/src/main/java/li/cil/oc2r/common/ext/MinecraftExt.java similarity index 87% rename from src/main/java/li/cil/oc2/common/ext/MinecraftExt.java rename to src/main/java/li/cil/oc2r/common/ext/MinecraftExt.java index 6234a57f..4acbfa83 100644 --- a/src/main/java/li/cil/oc2/common/ext/MinecraftExt.java +++ b/src/main/java/li/cil/oc2r/common/ext/MinecraftExt.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.ext; +package li.cil.oc2r.common.ext; import com.mojang.blaze3d.pipeline.RenderTarget; diff --git a/src/main/java/li/cil/oc2r/common/ext/package-info.java b/src/main/java/li/cil/oc2r/common/ext/package-info.java new file mode 100644 index 00000000..946e1fdb --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/ext/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.ext; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/integration/IMC.java b/src/main/java/li/cil/oc2r/common/integration/IMC.java similarity index 93% rename from src/main/java/li/cil/oc2/common/integration/IMC.java rename to src/main/java/li/cil/oc2r/common/integration/IMC.java index 142fad22..06d9dc4a 100644 --- a/src/main/java/li/cil/oc2/common/integration/IMC.java +++ b/src/main/java/li/cil/oc2r/common/integration/IMC.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.integration; +package li.cil.oc2r.common.integration; -import li.cil.oc2.api.API; -import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; -import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.imc.RPCMethodParameterTypeAdapter; +import li.cil.oc2r.common.bus.device.rpc.RPCMethodParameterTypeAdapters; import net.minecraft.Util; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; diff --git a/src/main/java/li/cil/oc2/common/integration/Wrenches.java b/src/main/java/li/cil/oc2r/common/integration/Wrenches.java similarity index 87% rename from src/main/java/li/cil/oc2/common/integration/Wrenches.java rename to src/main/java/li/cil/oc2r/common/integration/Wrenches.java index e7743f10..190ffa61 100644 --- a/src/main/java/li/cil/oc2/common/integration/Wrenches.java +++ b/src/main/java/li/cil/oc2r/common/integration/Wrenches.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.integration; +package li.cil.oc2r.common.integration; -import li.cil.oc2.common.tags.ItemTags; +import li.cil.oc2r.common.tags.ItemTags; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/integration/jei/ExtraGuiAreasJEIPlugin.java b/src/main/java/li/cil/oc2r/common/integration/jei/ExtraGuiAreasJEIPlugin.java similarity index 89% rename from src/main/java/li/cil/oc2/common/integration/jei/ExtraGuiAreasJEIPlugin.java rename to src/main/java/li/cil/oc2r/common/integration/jei/ExtraGuiAreasJEIPlugin.java index b633e9a1..06a9efe5 100644 --- a/src/main/java/li/cil/oc2/common/integration/jei/ExtraGuiAreasJEIPlugin.java +++ b/src/main/java/li/cil/oc2r/common/integration/jei/ExtraGuiAreasJEIPlugin.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.integration.jei; +package li.cil.oc2r.common.integration.jei; -import li.cil.oc2.api.API; -import li.cil.oc2.client.gui.AbstractMachineInventoryScreen; -import li.cil.oc2.client.gui.AbstractMachineTerminalScreen; -import li.cil.oc2.common.block.ComputerBlock; +import li.cil.oc2r.api.API; +import li.cil.oc2r.client.gui.AbstractMachineInventoryScreen; +import li.cil.oc2r.client.gui.AbstractMachineTerminalScreen; +import li.cil.oc2r.common.block.ComputerBlock; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaTypes; diff --git a/src/main/java/li/cil/oc2/common/integration/jei/ExtraItemsJEIPlugin.java b/src/main/java/li/cil/oc2r/common/integration/jei/ExtraItemsJEIPlugin.java similarity index 91% rename from src/main/java/li/cil/oc2/common/integration/jei/ExtraItemsJEIPlugin.java rename to src/main/java/li/cil/oc2r/common/integration/jei/ExtraItemsJEIPlugin.java index b202b6d2..14b4b34a 100644 --- a/src/main/java/li/cil/oc2/common/integration/jei/ExtraItemsJEIPlugin.java +++ b/src/main/java/li/cil/oc2r/common/integration/jei/ExtraItemsJEIPlugin.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.integration.jei; +package li.cil.oc2r.common.integration.jei; import com.google.common.base.Strings; -import li.cil.oc2.api.API; -import li.cil.oc2.common.item.AbstractBlockDeviceItem; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.NBTUtils; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.item.AbstractBlockDeviceItem; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.NBTUtils; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaTypes; @@ -23,8 +23,8 @@ import net.minecraft.world.item.ItemStack; import javax.annotation.Nullable; -import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; -import static li.cil.oc2.common.Constants.ITEMS_TAG_NAME; +import static li.cil.oc2r.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; +import static li.cil.oc2r.common.Constants.ITEMS_TAG_NAME; @JeiPlugin public class ExtraItemsJEIPlugin implements IModPlugin { diff --git a/src/main/java/li/cil/oc2r/common/integration/jei/package-info.java b/src/main/java/li/cil/oc2r/common/integration/jei/package-info.java new file mode 100644 index 00000000..0593ab8f --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/integration/jei/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.integration.jei; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/integration/package-info.java b/src/main/java/li/cil/oc2r/common/integration/package-info.java new file mode 100644 index 00000000..477c4867 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/integration/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.integration; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java b/src/main/java/li/cil/oc2r/common/item/AbstractBlockDeviceItem.java similarity index 93% rename from src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java rename to src/main/java/li/cil/oc2r/common/item/AbstractBlockDeviceItem.java index 8b7b7354..65fe2cd6 100644 --- a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java +++ b/src/main/java/li/cil/oc2r/common/item/AbstractBlockDeviceItem.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.bus.device.data.BlockDeviceData; -import li.cil.oc2.common.bus.device.data.BlockDeviceDataRegistry; -import li.cil.oc2.common.util.ItemStackUtils; +import li.cil.oc2r.api.bus.device.data.BlockDeviceData; +import li.cil.oc2r.common.bus.device.data.BlockDeviceDataRegistry; +import li.cil.oc2r.common.util.ItemStackUtils; import net.minecraft.ResourceLocationException; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java b/src/main/java/li/cil/oc2r/common/item/AbstractStorageItem.java similarity index 91% rename from src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java rename to src/main/java/li/cil/oc2r/common/item/AbstractStorageItem.java index a5007b3b..9caa2839 100644 --- a/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java +++ b/src/main/java/li/cil/oc2r/common/item/AbstractStorageItem.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.util.TextFormatUtils; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.util.TextFormatUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/item/BlockOperationsModule.java b/src/main/java/li/cil/oc2r/common/item/BlockOperationsModule.java similarity index 90% rename from src/main/java/li/cil/oc2/common/item/BlockOperationsModule.java rename to src/main/java/li/cil/oc2r/common/item/BlockOperationsModule.java index 14983655..7612bae7 100644 --- a/src/main/java/li/cil/oc2/common/item/BlockOperationsModule.java +++ b/src/main/java/li/cil/oc2r/common/item/BlockOperationsModule.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; public final class BlockOperationsModule extends ModItem { public static final int DURABILITY = 2500; diff --git a/src/main/java/li/cil/oc2/common/item/BusCableItem.java b/src/main/java/li/cil/oc2r/common/item/BusCableItem.java similarity index 93% rename from src/main/java/li/cil/oc2/common/item/BusCableItem.java rename to src/main/java/li/cil/oc2r/common/item/BusCableItem.java index a4ba73b7..835c6a4b 100644 --- a/src/main/java/li/cil/oc2/common/item/BusCableItem.java +++ b/src/main/java/li/cil/oc2r/common/item/BusCableItem.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.util.LevelUtils; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.block.BusCableBlock; +import li.cil.oc2r.common.util.LevelUtils; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java b/src/main/java/li/cil/oc2r/common/item/BusInterfaceItem.java similarity index 93% rename from src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java rename to src/main/java/li/cil/oc2r/common/item/BusInterfaceItem.java index 53fc1ac7..2877f6ff 100644 --- a/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java +++ b/src/main/java/li/cil/oc2r/common/item/BusInterfaceItem.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.block.BusCableBlock.ConnectionType; -import li.cil.oc2.common.util.LevelUtils; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.block.BusCableBlock; +import li.cil.oc2r.common.block.BusCableBlock.ConnectionType; +import li.cil.oc2r.common.util.LevelUtils; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2/common/item/CPUItem.java b/src/main/java/li/cil/oc2r/common/item/CPUItem.java similarity index 94% rename from src/main/java/li/cil/oc2/common/item/CPUItem.java rename to src/main/java/li/cil/oc2r/common/item/CPUItem.java index 3d9d1b94..3b2f8978 100644 --- a/src/main/java/li/cil/oc2/common/item/CPUItem.java +++ b/src/main/java/li/cil/oc2r/common/item/CPUItem.java @@ -1,4 +1,4 @@ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/item/ChargerItem.java b/src/main/java/li/cil/oc2r/common/item/ChargerItem.java similarity index 89% rename from src/main/java/li/cil/oc2/common/item/ChargerItem.java rename to src/main/java/li/cil/oc2r/common/item/ChargerItem.java index 644da7e6..aaa2b4e4 100644 --- a/src/main/java/li/cil/oc2/common/item/ChargerItem.java +++ b/src/main/java/li/cil/oc2r/common/item/ChargerItem.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java b/src/main/java/li/cil/oc2r/common/item/FlashMemoryItem.java similarity index 86% rename from src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java rename to src/main/java/li/cil/oc2r/common/item/FlashMemoryItem.java index 54992ae2..1d8744b5 100644 --- a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java +++ b/src/main/java/li/cil/oc2r/common/item/FlashMemoryItem.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; -import li.cil.oc2.common.bus.device.vm.item.ByteBufferFlashStorageDevice; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.bus.device.vm.item.ByteBufferFlashStorageDevice; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.Util; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java b/src/main/java/li/cil/oc2r/common/item/FlashMemoryWithExternalDataItem.java similarity index 93% rename from src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java rename to src/main/java/li/cil/oc2r/common/item/FlashMemoryWithExternalDataItem.java index d1c3a10b..4fe2d005 100644 --- a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java +++ b/src/main/java/li/cil/oc2r/common/item/FlashMemoryWithExternalDataItem.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.bus.device.data.Firmware; -import li.cil.oc2.common.bus.device.data.FirmwareRegistry; -import li.cil.oc2.common.util.ItemStackUtils; +import li.cil.oc2r.api.bus.device.data.Firmware; +import li.cil.oc2r.common.bus.device.data.FirmwareRegistry; +import li.cil.oc2r.common.util.ItemStackUtils; import net.minecraft.ResourceLocationException; import net.minecraft.Util; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/item/FloppyItem.java b/src/main/java/li/cil/oc2r/common/item/FloppyItem.java similarity index 88% rename from src/main/java/li/cil/oc2/common/item/FloppyItem.java rename to src/main/java/li/cil/oc2r/common/item/FloppyItem.java index 3b5cd72c..79a6f9b2 100644 --- a/src/main/java/li/cil/oc2/common/item/FloppyItem.java +++ b/src/main/java/li/cil/oc2r/common/item/FloppyItem.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; import net.minecraft.world.item.DyeableLeatherItem; diff --git a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java b/src/main/java/li/cil/oc2r/common/item/HardDriveItem.java similarity index 92% rename from src/main/java/li/cil/oc2/common/item/HardDriveItem.java rename to src/main/java/li/cil/oc2r/common/item/HardDriveItem.java index aacff7da..b109a57c 100644 --- a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java +++ b/src/main/java/li/cil/oc2r/common/item/HardDriveItem.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; -import li.cil.oc2.common.util.ColorUtils; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.util.ColorUtils; import net.minecraft.Util; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java b/src/main/java/li/cil/oc2r/common/item/HardDriveWithExternalDataItem.java similarity index 92% rename from src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java rename to src/main/java/li/cil/oc2r/common/item/HardDriveWithExternalDataItem.java index 2cf91160..93d8ae84 100644 --- a/src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java +++ b/src/main/java/li/cil/oc2r/common/item/HardDriveWithExternalDataItem.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; -import li.cil.oc2.common.util.ColorUtils; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.util.ColorUtils; import net.minecraft.Util; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/li/cil/oc2/common/item/ItemGroup.java b/src/main/java/li/cil/oc2r/common/item/ItemGroup.java similarity index 97% rename from src/main/java/li/cil/oc2/common/item/ItemGroup.java rename to src/main/java/li/cil/oc2r/common/item/ItemGroup.java index 920bcf7f..5ba1cd4d 100644 --- a/src/main/java/li/cil/oc2/common/item/ItemGroup.java +++ b/src/main/java/li/cil/oc2r/common/item/ItemGroup.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; -import li.cil.oc2.common.block.ComputerBlock; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.block.ComputerBlock; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; diff --git a/src/main/java/li/cil/oc2/common/item/ItemRenameHandler.java b/src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java similarity index 96% rename from src/main/java/li/cil/oc2/common/item/ItemRenameHandler.java rename to src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java index 2f26df71..d091b25d 100644 --- a/src/main/java/li/cil/oc2/common/item/ItemRenameHandler.java +++ b/src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java @@ -1,6 +1,6 @@ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.Util; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/common/item/Items.java b/src/main/java/li/cil/oc2r/common/item/Items.java similarity index 96% rename from src/main/java/li/cil/oc2/common/item/Items.java rename to src/main/java/li/cil/oc2r/common/item/Items.java index 369243db..2c36fcf7 100644 --- a/src/main/java/li/cil/oc2/common/item/Items.java +++ b/src/main/java/li/cil/oc2r/common/item/Items.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.bus.device.data.BlockDeviceDataRegistry; -import li.cil.oc2.common.bus.device.data.FirmwareRegistry; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.bus.device.data.BlockDeviceDataRegistry; +import li.cil.oc2r.common.bus.device.data.FirmwareRegistry; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/li/cil/oc2/common/item/ManualItem.java b/src/main/java/li/cil/oc2r/common/item/ManualItem.java similarity index 87% rename from src/main/java/li/cil/oc2/common/item/ManualItem.java rename to src/main/java/li/cil/oc2r/common/item/ManualItem.java index 33bc0a82..bac9b155 100644 --- a/src/main/java/li/cil/oc2/common/item/ManualItem.java +++ b/src/main/java/li/cil/oc2r/common/item/ManualItem.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; import li.cil.manual.api.ManualModel; import li.cil.manual.api.ManualScreenStyle; import li.cil.manual.api.ManualStyle; import li.cil.manual.api.prefab.item.AbstractManualItem; -import li.cil.oc2.client.manual.Manuals; -import li.cil.oc2.client.manual.ModManualScreenStyle; -import li.cil.oc2.client.manual.ModManualStyle; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.client.manual.Manuals; +import li.cil.oc2r.client.manual.ModManualScreenStyle; +import li.cil.oc2r.client.manual.ModManualStyle; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/item/MemoryItem.java b/src/main/java/li/cil/oc2r/common/item/MemoryItem.java similarity index 92% rename from src/main/java/li/cil/oc2/common/item/MemoryItem.java rename to src/main/java/li/cil/oc2r/common/item/MemoryItem.java index a8aee5bc..07eaad58 100644 --- a/src/main/java/li/cil/oc2/common/item/MemoryItem.java +++ b/src/main/java/li/cil/oc2r/common/item/MemoryItem.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.Util; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/common/item/ModBlockItem.java b/src/main/java/li/cil/oc2r/common/item/ModBlockItem.java similarity index 94% rename from src/main/java/li/cil/oc2/common/item/ModBlockItem.java rename to src/main/java/li/cil/oc2r/common/item/ModBlockItem.java index 356565a7..5d244bc1 100644 --- a/src/main/java/li/cil/oc2/common/item/ModBlockItem.java +++ b/src/main/java/li/cil/oc2r/common/item/ModBlockItem.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.network.chat.Component; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/item/ModItem.java b/src/main/java/li/cil/oc2r/common/item/ModItem.java similarity index 93% rename from src/main/java/li/cil/oc2/common/item/ModItem.java rename to src/main/java/li/cil/oc2r/common/item/ModItem.java index 393e9e45..1895d37f 100644 --- a/src/main/java/li/cil/oc2/common/item/ModItem.java +++ b/src/main/java/li/cil/oc2r/common/item/ModItem.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/item/NetworkCableItem.java b/src/main/java/li/cil/oc2r/common/item/NetworkCableItem.java similarity index 95% rename from src/main/java/li/cil/oc2/common/item/NetworkCableItem.java rename to src/main/java/li/cil/oc2r/common/item/NetworkCableItem.java index 20be21b8..8d9200d4 100644 --- a/src/main/java/li/cil/oc2/common/item/NetworkCableItem.java +++ b/src/main/java/li/cil/oc2r/common/item/NetworkCableItem.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; -import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity.ConnectionResult; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity; +import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity.ConnectionResult; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; diff --git a/src/main/java/li/cil/oc2/common/item/NetworkInterfaceCardItem.java b/src/main/java/li/cil/oc2r/common/item/NetworkInterfaceCardItem.java similarity index 91% rename from src/main/java/li/cil/oc2/common/item/NetworkInterfaceCardItem.java rename to src/main/java/li/cil/oc2r/common/item/NetworkInterfaceCardItem.java index 8e11ff3c..62893fb9 100644 --- a/src/main/java/li/cil/oc2/common/item/NetworkInterfaceCardItem.java +++ b/src/main/java/li/cil/oc2r/common/item/NetworkInterfaceCardItem.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.client.gui.NetworkInterfaceCardScreen; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.client.gui.NetworkInterfaceCardScreen; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; @@ -24,8 +24,8 @@ import javax.annotation.Nullable; import java.util.Arrays; import java.util.List; -import static li.cil.oc2.common.util.TextFormatUtils.withFormat; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class NetworkInterfaceCardItem extends ModItem { private static final String SIDE_CONFIGURATION_TAG_NAME = "sides"; diff --git a/src/main/java/li/cil/oc2/common/item/NetworkTunnelItem.java b/src/main/java/li/cil/oc2r/common/item/NetworkTunnelItem.java similarity index 92% rename from src/main/java/li/cil/oc2/common/item/NetworkTunnelItem.java rename to src/main/java/li/cil/oc2r/common/item/NetworkTunnelItem.java index 813cf97e..65af1eec 100644 --- a/src/main/java/li/cil/oc2/common/item/NetworkTunnelItem.java +++ b/src/main/java/li/cil/oc2r/common/item/NetworkTunnelItem.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.common.container.NetworkTunnelContainer; -import li.cil.oc2.common.util.ItemStackUtils; -import li.cil.oc2.common.util.TextFormatUtils; +import li.cil.oc2r.common.container.NetworkTunnelContainer; +import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2r.common.util.TextFormatUtils; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -23,7 +23,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; -import static li.cil.oc2.common.util.TranslationUtils.key; +import static li.cil.oc2r.common.util.TranslationUtils.key; public final class NetworkTunnelItem extends ModItem { private static final String TUNNEL_ID_TAG_NAME = "tunnel"; diff --git a/src/main/java/li/cil/oc2/common/item/RobotItem.java b/src/main/java/li/cil/oc2r/common/item/RobotItem.java similarity index 86% rename from src/main/java/li/cil/oc2/common/item/RobotItem.java rename to src/main/java/li/cil/oc2r/common/item/RobotItem.java index d4c74a29..42059e1b 100644 --- a/src/main/java/li/cil/oc2/common/item/RobotItem.java +++ b/src/main/java/li/cil/oc2r/common/item/RobotItem.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.client.renderer.entity.RobotWithoutLevelRenderer; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.energy.EnergyStorageItemStack; -import li.cil.oc2.common.entity.Entities; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.entity.robot.RobotActions; -import li.cil.oc2.common.util.LevelUtils; -import li.cil.oc2.common.util.NBTUtils; -import li.cil.oc2.common.util.TooltipUtils; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.client.renderer.entity.RobotWithoutLevelRenderer; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.energy.EnergyStorageItemStack; +import li.cil.oc2r.common.entity.Entities; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.entity.robot.RobotActions; +import li.cil.oc2r.common.util.LevelUtils; +import li.cil.oc2r.common.util.NBTUtils; +import li.cil.oc2r.common.util.TooltipUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.core.BlockPos; @@ -36,9 +36,9 @@ import javax.annotation.Nullable; import java.util.List; import java.util.function.Consumer; -import static li.cil.oc2.common.Constants.*; -import static li.cil.oc2.common.util.NBTUtils.makeInventoryTag; -import static li.cil.oc2.common.util.RegistryUtils.key; +import static li.cil.oc2r.common.Constants.*; +import static li.cil.oc2r.common.util.NBTUtils.makeInventoryTag; +import static li.cil.oc2r.common.util.RegistryUtils.key; public final class RobotItem extends ModItem { @Override diff --git a/src/main/java/li/cil/oc2/common/item/WrenchItem.java b/src/main/java/li/cil/oc2r/common/item/WrenchItem.java similarity index 97% rename from src/main/java/li/cil/oc2/common/item/WrenchItem.java rename to src/main/java/li/cil/oc2r/common/item/WrenchItem.java index 71f9a9b3..2b3901af 100644 --- a/src/main/java/li/cil/oc2/common/item/WrenchItem.java +++ b/src/main/java/li/cil/oc2r/common/item/WrenchItem.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item; +package li.cil.oc2r.common.item; -import li.cil.oc2.common.tags.BlockTags; +import li.cil.oc2r.common.tags.BlockTags; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.MultiPlayerGameMode; import net.minecraft.core.BlockPos; diff --git a/src/main/java/li/cil/oc2/common/item/crafting/RecipeSerializers.java b/src/main/java/li/cil/oc2r/common/item/crafting/RecipeSerializers.java similarity index 93% rename from src/main/java/li/cil/oc2/common/item/crafting/RecipeSerializers.java rename to src/main/java/li/cil/oc2r/common/item/crafting/RecipeSerializers.java index d0e70608..7887be3d 100644 --- a/src/main/java/li/cil/oc2/common/item/crafting/RecipeSerializers.java +++ b/src/main/java/li/cil/oc2r/common/item/crafting/RecipeSerializers.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item.crafting; +package li.cil.oc2r.common.item.crafting; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/li/cil/oc2/common/item/crafting/WrenchRecipe.java b/src/main/java/li/cil/oc2r/common/item/crafting/WrenchRecipe.java similarity index 96% rename from src/main/java/li/cil/oc2/common/item/crafting/WrenchRecipe.java rename to src/main/java/li/cil/oc2r/common/item/crafting/WrenchRecipe.java index 8c4339ad..25e129e6 100644 --- a/src/main/java/li/cil/oc2/common/item/crafting/WrenchRecipe.java +++ b/src/main/java/li/cil/oc2r/common/item/crafting/WrenchRecipe.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.item.crafting; +package li.cil.oc2r.common.item.crafting; import com.google.gson.JsonObject; -import li.cil.oc2.common.integration.Wrenches; +import li.cil.oc2r.common.integration.Wrenches; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/li/cil/oc2r/common/item/crafting/package-info.java b/src/main/java/li/cil/oc2r/common/item/crafting/package-info.java new file mode 100644 index 00000000..f7e8dd3d --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/item/crafting/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.item.crafting; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/item/package-info.java b/src/main/java/li/cil/oc2r/common/item/package-info.java new file mode 100644 index 00000000..79a62f6a --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/item/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.item; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/mixin/FrustumMixin.java b/src/main/java/li/cil/oc2r/common/mixin/FrustumMixin.java similarity index 91% rename from src/main/java/li/cil/oc2/common/mixin/FrustumMixin.java rename to src/main/java/li/cil/oc2r/common/mixin/FrustumMixin.java index 8e51ebd0..0201a067 100644 --- a/src/main/java/li/cil/oc2/common/mixin/FrustumMixin.java +++ b/src/main/java/li/cil/oc2r/common/mixin/FrustumMixin.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.mixin; +package li.cil.oc2r.common.mixin; -import li.cil.oc2.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2r.client.renderer.ProjectorDepthRenderer; import net.minecraft.client.renderer.culling.Frustum; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/li/cil/oc2/common/mixin/LevelRendererMixin.java b/src/main/java/li/cil/oc2r/common/mixin/LevelRendererMixin.java similarity index 98% rename from src/main/java/li/cil/oc2/common/mixin/LevelRendererMixin.java rename to src/main/java/li/cil/oc2r/common/mixin/LevelRendererMixin.java index 9a32b200..4c84d638 100644 --- a/src/main/java/li/cil/oc2/common/mixin/LevelRendererMixin.java +++ b/src/main/java/li/cil/oc2r/common/mixin/LevelRendererMixin.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.mixin; +package li.cil.oc2r.common.mixin; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import org.joml.Matrix4f; -import li.cil.oc2.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2r.client.renderer.ProjectorDepthRenderer; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; diff --git a/src/main/java/li/cil/oc2/common/mixin/MinecraftMixin.java b/src/main/java/li/cil/oc2r/common/mixin/MinecraftMixin.java similarity index 92% rename from src/main/java/li/cil/oc2/common/mixin/MinecraftMixin.java rename to src/main/java/li/cil/oc2r/common/mixin/MinecraftMixin.java index bd60a451..132312c8 100644 --- a/src/main/java/li/cil/oc2/common/mixin/MinecraftMixin.java +++ b/src/main/java/li/cil/oc2r/common/mixin/MinecraftMixin.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.mixin; +package li.cil.oc2r.common.mixin; import com.mojang.blaze3d.pipeline.RenderTarget; -import li.cil.oc2.client.renderer.ProjectorDepthRenderer; -import li.cil.oc2.common.ext.MinecraftExt; +import li.cil.oc2r.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2r.common.ext.MinecraftExt; import net.minecraft.client.Minecraft; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/li/cil/oc2/common/mixin/ServerChunkCacheMixin.java b/src/main/java/li/cil/oc2r/common/mixin/ServerChunkCacheMixin.java similarity index 88% rename from src/main/java/li/cil/oc2/common/mixin/ServerChunkCacheMixin.java rename to src/main/java/li/cil/oc2r/common/mixin/ServerChunkCacheMixin.java index a2aec04f..460113c5 100644 --- a/src/main/java/li/cil/oc2/common/mixin/ServerChunkCacheMixin.java +++ b/src/main/java/li/cil/oc2r/common/mixin/ServerChunkCacheMixin.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.mixin; +package li.cil.oc2r.common.mixin; -import li.cil.oc2.common.util.ChunkUtils; +import li.cil.oc2r.common.util.ChunkUtils; import net.minecraft.server.level.ServerChunkCache; import net.minecraft.world.level.chunk.ChunkSource; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/li/cil/oc2r/common/mixin/package-info.java b/src/main/java/li/cil/oc2r/common/mixin/package-info.java new file mode 100644 index 00000000..74d1e9fc --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/mixin/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.mixin; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/network/MessageUtils.java b/src/main/java/li/cil/oc2r/common/network/MessageUtils.java similarity index 97% rename from src/main/java/li/cil/oc2/common/network/MessageUtils.java rename to src/main/java/li/cil/oc2r/common/network/MessageUtils.java index 7981fdfe..6f606268 100644 --- a/src/main/java/li/cil/oc2/common/network/MessageUtils.java +++ b/src/main/java/li/cil/oc2r/common/network/MessageUtils.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network; +package li.cil.oc2r.common.network; -import li.cil.oc2.common.util.LevelUtils; +import li.cil.oc2r.common.util.LevelUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; diff --git a/src/main/java/li/cil/oc2/common/network/MonitorLoadBalancer.java b/src/main/java/li/cil/oc2r/common/network/MonitorLoadBalancer.java similarity index 98% rename from src/main/java/li/cil/oc2/common/network/MonitorLoadBalancer.java rename to src/main/java/li/cil/oc2r/common/network/MonitorLoadBalancer.java index 5bcf6b4d..2e29d5a1 100644 --- a/src/main/java/li/cil/oc2/common/network/MonitorLoadBalancer.java +++ b/src/main/java/li/cil/oc2r/common/network/MonitorLoadBalancer.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network; +package li.cil.oc2r.common.network; -import li.cil.oc2.api.API; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.network.message.MonitorFramebufferMessage; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.network.message.MonitorFramebufferMessage; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2/common/network/Network.java b/src/main/java/li/cil/oc2r/common/network/Network.java similarity index 98% rename from src/main/java/li/cil/oc2/common/network/Network.java rename to src/main/java/li/cil/oc2r/common/network/Network.java index d49e3db0..984841a3 100644 --- a/src/main/java/li/cil/oc2/common/network/Network.java +++ b/src/main/java/li/cil/oc2r/common/network/Network.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network; +package li.cil.oc2r.common.network; -import li.cil.oc2.api.API; -import li.cil.oc2.common.network.message.*; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.network.message.*; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/li/cil/oc2/common/network/ProjectorLoadBalancer.java b/src/main/java/li/cil/oc2r/common/network/ProjectorLoadBalancer.java similarity index 98% rename from src/main/java/li/cil/oc2/common/network/ProjectorLoadBalancer.java rename to src/main/java/li/cil/oc2r/common/network/ProjectorLoadBalancer.java index ec0076d5..b338a7c7 100644 --- a/src/main/java/li/cil/oc2/common/network/ProjectorLoadBalancer.java +++ b/src/main/java/li/cil/oc2r/common/network/ProjectorLoadBalancer.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network; +package li.cil.oc2r.common.network; -import li.cil.oc2.api.API; -import li.cil.oc2.common.Config; -import li.cil.oc2.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2.common.network.message.ProjectorFramebufferMessage; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.Config; +import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2r.common.network.message.ProjectorFramebufferMessage; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2/common/network/message/AbstractMessage.java b/src/main/java/li/cil/oc2r/common/network/message/AbstractMessage.java similarity index 94% rename from src/main/java/li/cil/oc2/common/network/message/AbstractMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/AbstractMessage.java index 88b06ce5..e7d7a0fb 100644 --- a/src/main/java/li/cil/oc2/common/network/message/AbstractMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/AbstractMessage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.network.Network; +import li.cil.oc2r.common.network.Network; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; import org.apache.commons.lang3.NotImplementedException; diff --git a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java b/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalBlockMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalBlockMessage.java index 8525452c..fba54677 100644 --- a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalBlockMessage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java b/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalEntityMessage.java similarity index 95% rename from src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalEntityMessage.java index 3515b72c..1e8594cf 100644 --- a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalEntityMessage.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java b/src/main/java/li/cil/oc2r/common/network/message/BusCableFacadeMessage.java similarity index 89% rename from src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/BusCableFacadeMessage.java index b1568242..0098082b 100644 --- a/src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/BusCableFacadeMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.BusCableBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java b/src/main/java/li/cil/oc2r/common/network/message/BusInterfaceNameMessage.java similarity index 94% rename from src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/BusInterfaceNameMessage.java index 782ee58d..67164c45 100644 --- a/src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/BusInterfaceNameMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.BusCableBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.BusCableBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ClientCanceledImportFileMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ClientCanceledImportFileMessage.java index 5f662e9d..d4d0fc40 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ClientCanceledImportFileMessage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerBootErrorMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ComputerBootErrorMessage.java index 5840e07e..759ebec9 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ComputerBootErrorMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerBusStateMessage.java similarity index 87% rename from src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ComputerBusStateMessage.java index 2f3cb569..8cfce9ba 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ComputerBusStateMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerPowerMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ComputerPowerMessage.java index 6a8bf3e7..0b127812 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ComputerPowerMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerRunStateMessage.java similarity index 87% rename from src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ComputerRunStateMessage.java index aeb821e2..3e217649 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ComputerRunStateMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.network.MessageUtils; -import li.cil.oc2.common.vm.VMRunState; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2r.common.vm.VMRunState; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalInputMessage.java similarity index 84% rename from src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalInputMessage.java index 773e2fcd..0254c72e 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalInputMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalOutputMessage.java similarity index 84% rename from src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalOutputMessage.java index c596e4ce..d0103f62 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalOutputMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java b/src/main/java/li/cil/oc2r/common/network/message/DiskDriveFloppyMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/DiskDriveFloppyMessage.java index b84df1a9..6a5df7c1 100644 --- a/src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/DiskDriveFloppyMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.DiskDriveBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/li/cil/oc2/common/network/message/ExportedFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ExportedFileMessage.java similarity index 94% rename from src/main/java/li/cil/oc2/common/network/message/ExportedFileMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ExportedFileMessage.java index c0b755bb..1f03629e 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ExportedFileMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ExportedFileMessage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.client.gui.FileChooserScreen; +import li.cil.oc2r.client.gui.FileChooserScreen; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/li/cil/oc2/common/network/message/FirmwareFlasherMessage.java b/src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java similarity index 86% rename from src/main/java/li/cil/oc2/common/network/message/FirmwareFlasherMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java index 807ebc39..ca3dece1 100644 --- a/src/main/java/li/cil/oc2/common/network/message/FirmwareFlasherMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java @@ -1,10 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; -import li.cil.oc2.common.blockentity.FlashMemoryFlasherBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.FlashMemoryFlasherBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ImportedFileMessage.java similarity index 92% rename from src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ImportedFileMessage.java index 6c463250..4f444fe9 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ImportedFileMessage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/KeyboardInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/KeyboardInputMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/KeyboardInputMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/KeyboardInputMessage.java index 14f044bd..be43d948 100644 --- a/src/main/java/li/cil/oc2/common/network/message/KeyboardInputMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/KeyboardInputMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.KeyboardBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.KeyboardBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/MonitorFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorFramebufferMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/MonitorFramebufferMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/MonitorFramebufferMessage.java index 564743e1..ce127bd6 100644 --- a/src/main/java/li/cil/oc2/common/network/message/MonitorFramebufferMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/MonitorFramebufferMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/MonitorInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorInputMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/MonitorInputMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/MonitorInputMessage.java index 817e6764..e4d336be 100644 --- a/src/main/java/li/cil/oc2/common/network/message/MonitorInputMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/MonitorInputMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessage.java similarity index 89% rename from src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessage.java index f4c26d5d..21997784 100644 --- a/src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; -import li.cil.oc2.common.network.Network; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2r.common.network.Network; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessageForwarded.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessageForwarded.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessageForwarded.java rename to src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessageForwarded.java index afcf9445..b67af8ee 100644 --- a/src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessageForwarded.java +++ b/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessageForwarded.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/MonitorRequestFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorRequestFramebufferMessage.java similarity index 85% rename from src/main/java/li/cil/oc2/common/network/message/MonitorRequestFramebufferMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/MonitorRequestFramebufferMessage.java index a7f72ccc..00e56345 100644 --- a/src/main/java/li/cil/oc2/common/network/message/MonitorRequestFramebufferMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/MonitorRequestFramebufferMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; -import li.cil.oc2.common.network.MonitorLoadBalancer; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2r.common.network.MonitorLoadBalancer; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/MonitorStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorStateMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/MonitorStateMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/MonitorStateMessage.java index bbdb3acf..3b67a328 100644 --- a/src/main/java/li/cil/oc2/common/network/message/MonitorStateMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/MonitorStateMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.MonitorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/MultipartMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MultipartMessage.java similarity index 98% rename from src/main/java/li/cil/oc2/common/network/message/MultipartMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/MultipartMessage.java index f32be822..db5aeb06 100644 --- a/src/main/java/li/cil/oc2/common/network/message/MultipartMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/MultipartMessage.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -8,8 +8,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.network.Network; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.network.Network; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java b/src/main/java/li/cil/oc2r/common/network/message/NetworkConnectorConnectionsMessage.java similarity index 92% rename from src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/NetworkConnectorConnectionsMessage.java index 83fc70aa..ce27d87f 100644 --- a/src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/NetworkConnectorConnectionsMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/NetworkInterfaceCardConfigurationMessage.java b/src/main/java/li/cil/oc2r/common/network/message/NetworkInterfaceCardConfigurationMessage.java similarity index 93% rename from src/main/java/li/cil/oc2/common/network/message/NetworkInterfaceCardConfigurationMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/NetworkInterfaceCardConfigurationMessage.java index d858d3c7..e0d257ba 100644 --- a/src/main/java/li/cil/oc2/common/network/message/NetworkInterfaceCardConfigurationMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/NetworkInterfaceCardConfigurationMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.item.NetworkInterfaceCardItem; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.item.NetworkInterfaceCardItem; import net.minecraft.core.Direction; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/li/cil/oc2/common/network/message/NetworkTunnelLinkMessage.java b/src/main/java/li/cil/oc2r/common/network/message/NetworkTunnelLinkMessage.java similarity index 93% rename from src/main/java/li/cil/oc2/common/network/message/NetworkTunnelLinkMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/NetworkTunnelLinkMessage.java index a8df2b4e..59db128c 100644 --- a/src/main/java/li/cil/oc2/common/network/message/NetworkTunnelLinkMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/NetworkTunnelLinkMessage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.container.NetworkTunnelContainer; +import li.cil.oc2r.common.container.NetworkTunnelContainer; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenComputerInventoryMessage.java similarity index 88% rename from src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/OpenComputerInventoryMessage.java index 04b3aa08..351bb60d 100644 --- a/src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/OpenComputerInventoryMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenComputerTerminalMessage.java similarity index 88% rename from src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/OpenComputerTerminalMessage.java index d16f165a..54fe452d 100644 --- a/src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/OpenComputerTerminalMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ComputerBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/OpenRobotInventoryMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenRobotInventoryMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/OpenRobotInventoryMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/OpenRobotInventoryMessage.java index b2bd15d4..8b38538a 100644 --- a/src/main/java/li/cil/oc2/common/network/message/OpenRobotInventoryMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/OpenRobotInventoryMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/OpenRobotTerminalMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenRobotTerminalMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/OpenRobotTerminalMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/OpenRobotTerminalMessage.java index f1411ffd..eecf0f9b 100644 --- a/src/main/java/li/cil/oc2/common/network/message/OpenRobotTerminalMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/OpenRobotTerminalMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ProjectorFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ProjectorFramebufferMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/ProjectorFramebufferMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ProjectorFramebufferMessage.java index c1b9463c..605cb3bf 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ProjectorFramebufferMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ProjectorFramebufferMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ProjectorRequestFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ProjectorRequestFramebufferMessage.java similarity index 85% rename from src/main/java/li/cil/oc2/common/network/message/ProjectorRequestFramebufferMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ProjectorRequestFramebufferMessage.java index 1ac3445e..da1ac171 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ProjectorRequestFramebufferMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ProjectorRequestFramebufferMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; -import li.cil.oc2.common.network.ProjectorLoadBalancer; +import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2r.common.network.ProjectorLoadBalancer; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ProjectorStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ProjectorStateMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/ProjectorStateMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ProjectorStateMessage.java index 20a4c797..a9e3c2a8 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ProjectorStateMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ProjectorStateMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RequestImportedFileMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RequestImportedFileMessage.java index 2b03b5e5..577195dc 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RequestImportedFileMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.client.gui.FileChooserScreen; -import li.cil.oc2.common.bus.device.rpc.item.FileImportExportCardItemDevice; -import li.cil.oc2.common.network.Network; +import li.cil.oc2r.client.gui.FileChooserScreen; +import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2r.common.network.Network; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.TextColor; @@ -17,7 +17,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import static li.cil.oc2.common.util.TranslationUtils.text; +import static li.cil.oc2r.common.util.TranslationUtils.text; public final class RequestImportedFileMessage extends AbstractMessage { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotBootErrorMessage.java similarity index 91% rename from src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotBootErrorMessage.java index a3957c0f..22619172 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotBootErrorMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotBusStateMessage.java similarity index 87% rename from src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotBusStateMessage.java index 880f4ce7..fafa8f51 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotBusStateMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationMessage.java similarity index 88% rename from src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotInitializationMessage.java index 8704b329..f9180cb2 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationMessage.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; -import li.cil.oc2.common.serialization.NBTSerialization; -import li.cil.oc2.common.vm.VMRunState; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2r.common.serialization.NBTSerialization; +import li.cil.oc2r.common.vm.VMRunState; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationRequestMessage.java similarity index 89% rename from src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotInitializationRequestMessage.java index 45b337e9..f2df82d5 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationRequestMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotPowerMessage.java similarity index 91% rename from src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotPowerMessage.java index 92d18945..6fb45264 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotPowerMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotRunStateMessage.java similarity index 87% rename from src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotRunStateMessage.java index 9846b74c..fca9d5c5 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotRunStateMessage.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; -import li.cil.oc2.common.vm.VMRunState; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2r.common.vm.VMRunState; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotTerminalInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalInputMessage.java similarity index 85% rename from src/main/java/li/cil/oc2/common/network/message/RobotTerminalInputMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotTerminalInputMessage.java index 35765d98..d6a08abf 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotTerminalInputMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalInputMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalOutputMessage.java similarity index 85% rename from src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/RobotTerminalOutputMessage.java index 152f57ae..3f652085 100644 --- a/src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalOutputMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.entity.Robot; -import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2r.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ServerCanceledImportFileMessage.java similarity index 90% rename from src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java rename to src/main/java/li/cil/oc2r/common/network/message/ServerCanceledImportFileMessage.java index 6b8b19ca..c5559458 100644 --- a/src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/ServerCanceledImportFileMessage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.network.message; +package li.cil.oc2r.common.network.message; -import li.cil.oc2.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/package-info.java b/src/main/java/li/cil/oc2r/common/network/message/package-info.java new file mode 100644 index 00000000..5f4aa607 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/network/message/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.network.message; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/network/package-info.java b/src/main/java/li/cil/oc2r/common/network/package-info.java new file mode 100644 index 00000000..0b463b0b --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/network/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.network; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/imc/package-info.java b/src/main/java/li/cil/oc2r/common/package-info.java similarity index 88% rename from src/main/java/li/cil/oc2/api/imc/package-info.java rename to src/main/java/li/cil/oc2r/common/package-info.java index b08fdc78..e536160d 100644 --- a/src/main/java/li/cil/oc2/api/imc/package-info.java +++ b/src/main/java/li/cil/oc2r/common/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.imc; +package li.cil.oc2r.common; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java b/src/main/java/li/cil/oc2r/common/serialization/BlobStorage.java similarity index 98% rename from src/main/java/li/cil/oc2/common/serialization/BlobStorage.java rename to src/main/java/li/cil/oc2r/common/serialization/BlobStorage.java index 6f63d475..d5c3d114 100644 --- a/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java +++ b/src/main/java/li/cil/oc2r/common/serialization/BlobStorage.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization; +package li.cil.oc2r.common.serialization; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.server.MinecraftServer; import net.minecraft.world.level.storage.LevelResource; import net.minecraftforge.event.server.ServerAboutToStartEvent; diff --git a/src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java b/src/main/java/li/cil/oc2r/common/serialization/NBTSerialization.java similarity index 99% rename from src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java rename to src/main/java/li/cil/oc2r/common/serialization/NBTSerialization.java index 2e704fd7..15eaaa50 100644 --- a/src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java +++ b/src/main/java/li/cil/oc2r/common/serialization/NBTSerialization.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization; +package li.cil.oc2r.common.serialization; import it.unimi.dsi.fastutil.ints.IntArrayList; import li.cil.ceres.Ceres; import li.cil.ceres.api.DeserializationVisitor; import li.cil.ceres.api.SerializationException; import li.cil.ceres.api.SerializationVisitor; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.nbt.*; import org.jetbrains.annotations.Contract; diff --git a/src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java b/src/main/java/li/cil/oc2r/common/serialization/NBTToJsonConverter.java similarity index 97% rename from src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java rename to src/main/java/li/cil/oc2r/common/serialization/NBTToJsonConverter.java index a6086037..b3cfb156 100644 --- a/src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java +++ b/src/main/java/li/cil/oc2r/common/serialization/NBTToJsonConverter.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization; +package li.cil.oc2r.common.serialization; import com.google.gson.*; -import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTTagIds; import net.minecraft.nbt.*; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/serialization/ceres/JsonArraySerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/JsonArraySerializer.java similarity index 96% rename from src/main/java/li/cil/oc2/common/serialization/ceres/JsonArraySerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/ceres/JsonArraySerializer.java index 1ef9534b..e9b7ac24 100644 --- a/src/main/java/li/cil/oc2/common/serialization/ceres/JsonArraySerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/ceres/JsonArraySerializer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.ceres; +package li.cil.oc2r.common.serialization.ceres; import com.google.gson.JsonArray; import com.google.gson.JsonParser; diff --git a/src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeListSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeListSerializer.java similarity index 92% rename from src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeListSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeListSerializer.java index 2ed366db..f41bc32c 100644 --- a/src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeListSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeListSerializer.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.ceres; +package li.cil.oc2r.common.serialization.ceres; import li.cil.ceres.api.DeserializationVisitor; import li.cil.ceres.api.SerializationException; import li.cil.ceres.api.SerializationVisitor; import li.cil.ceres.api.Serializer; -import li.cil.oc2.common.vm.context.global.MemoryRangeList; +import li.cil.oc2r.common.vm.context.global.MemoryRangeList; import li.cil.sedna.api.memory.MemoryRange; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeSerializer.java similarity index 95% rename from src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeSerializer.java index 9f65bd57..3f3024d1 100644 --- a/src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeSerializer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.ceres; +package li.cil.oc2r.common.serialization.ceres; import li.cil.ceres.api.DeserializationVisitor; import li.cil.ceres.api.SerializationException; diff --git a/src/main/java/li/cil/oc2/common/serialization/ceres/Serializers.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/Serializers.java similarity index 87% rename from src/main/java/li/cil/oc2/common/serialization/ceres/Serializers.java rename to src/main/java/li/cil/oc2r/common/serialization/ceres/Serializers.java index 7dddaf78..52289655 100644 --- a/src/main/java/li/cil/oc2/common/serialization/ceres/Serializers.java +++ b/src/main/java/li/cil/oc2r/common/serialization/ceres/Serializers.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.ceres; +package li.cil.oc2r.common.serialization.ceres; import com.google.gson.JsonArray; import li.cil.ceres.Ceres; -import li.cil.oc2.common.vm.context.global.MemoryRangeList; +import li.cil.oc2r.common.vm.context.global.MemoryRangeList; import li.cil.sedna.api.memory.MemoryRange; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/serialization/ceres/TextComponentSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/TextComponentSerializer.java similarity index 96% rename from src/main/java/li/cil/oc2/common/serialization/ceres/TextComponentSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/ceres/TextComponentSerializer.java index f3ee6ed1..ca797e67 100644 --- a/src/main/java/li/cil/oc2/common/serialization/ceres/TextComponentSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/ceres/TextComponentSerializer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.ceres; +package li.cil.oc2r.common.serialization.ceres; import li.cil.ceres.api.DeserializationVisitor; import li.cil.ceres.api.SerializationException; diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/package-info.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/package-info.java new file mode 100644 index 00000000..8d46a68d --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/serialization/ceres/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.serialization.ceres; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/DirectionJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/DirectionJsonSerializer.java similarity index 96% rename from src/main/java/li/cil/oc2/common/serialization/gson/DirectionJsonSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/DirectionJsonSerializer.java index a9741e73..b4dbae05 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/DirectionJsonSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/DirectionJsonSerializer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.*; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/EmptyRPCMethodGroupSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/EmptyRPCMethodGroupSerializer.java similarity index 89% rename from src/main/java/li/cil/oc2/common/serialization/gson/EmptyRPCMethodGroupSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/EmptyRPCMethodGroupSerializer.java index df87b4cc..e2622e30 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/EmptyRPCMethodGroupSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/EmptyRPCMethodGroupSerializer.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/ItemStackJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/ItemStackJsonSerializer.java similarity index 84% rename from src/main/java/li/cil/oc2/common/serialization/gson/ItemStackJsonSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/ItemStackJsonSerializer.java index 1bd59733..92f30eaf 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/ItemStackJsonSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/ItemStackJsonSerializer.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.JsonElement; import com.google.gson.JsonNull; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import li.cil.oc2.common.bus.device.rpc.RPCItemStackTagFilters; -import li.cil.oc2.common.serialization.NBTToJsonConverter; +import li.cil.oc2r.common.bus.device.rpc.RPCItemStackTagFilters; +import li.cil.oc2r.common.serialization.NBTToJsonConverter; import net.minecraft.world.item.ItemStack; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/MessageJsonDeserializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/MessageJsonDeserializer.java similarity index 92% rename from src/main/java/li/cil/oc2/common/serialization/gson/MessageJsonDeserializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/MessageJsonDeserializer.java index edcb7b42..1ddba9c9 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/MessageJsonDeserializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/MessageJsonDeserializer.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/MethodInvocationJsonDeserializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/MethodInvocationJsonDeserializer.java similarity index 90% rename from src/main/java/li/cil/oc2/common/serialization/gson/MethodInvocationJsonDeserializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/MethodInvocationJsonDeserializer.java index b70bd859..9d38eaf6 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/MethodInvocationJsonDeserializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/MethodInvocationJsonDeserializer.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java similarity index 88% rename from src/main/java/li/cil/oc2/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java index f0995d9d..b640d47c 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import li.cil.oc2.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/RPCMethodJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/RPCMethodJsonSerializer.java similarity index 90% rename from src/main/java/li/cil/oc2/common/serialization/gson/RPCMethodJsonSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/RPCMethodJsonSerializer.java index 28fcd609..58b77b20 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/RPCMethodJsonSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/RPCMethodJsonSerializer.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2.api.bus.device.rpc.RPCMethod; -import li.cil.oc2.api.bus.device.rpc.RPCParameter; +import li.cil.oc2r.api.bus.device.rpc.RPCMethod; +import li.cil.oc2r.api.bus.device.rpc.RPCParameter; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/SideJsonDeserializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/SideJsonDeserializer.java similarity index 90% rename from src/main/java/li/cil/oc2/common/serialization/gson/SideJsonDeserializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/SideJsonDeserializer.java index f2b483f9..851dd951 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/SideJsonDeserializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/SideJsonDeserializer.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.*; import com.google.gson.internal.bind.TypeAdapters; import com.google.gson.reflect.TypeToken; -import li.cil.oc2.api.util.Side; +import li.cil.oc2r.api.util.Side; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/UnsignedByteArrayJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/UnsignedByteArrayJsonSerializer.java similarity index 92% rename from src/main/java/li/cil/oc2/common/serialization/gson/UnsignedByteArrayJsonSerializer.java rename to src/main/java/li/cil/oc2r/common/serialization/gson/UnsignedByteArrayJsonSerializer.java index 8a901408..588eb6f9 100644 --- a/src/main/java/li/cil/oc2/common/serialization/gson/UnsignedByteArrayJsonSerializer.java +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/UnsignedByteArrayJsonSerializer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.serialization.gson; +package li.cil.oc2r.common.serialization.gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/package-info.java b/src/main/java/li/cil/oc2r/common/serialization/gson/package-info.java new file mode 100644 index 00000000..f776d638 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/serialization/gson/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.serialization.gson; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/serialization/package-info.java b/src/main/java/li/cil/oc2r/common/serialization/package-info.java new file mode 100644 index 00000000..b74a7906 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/serialization/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.serialization; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/tags/BlockTags.java b/src/main/java/li/cil/oc2r/common/tags/BlockTags.java similarity index 92% rename from src/main/java/li/cil/oc2/common/tags/BlockTags.java rename to src/main/java/li/cil/oc2r/common/tags/BlockTags.java index 18fed1e6..e5add4c3 100644 --- a/src/main/java/li/cil/oc2/common/tags/BlockTags.java +++ b/src/main/java/li/cil/oc2r/common/tags/BlockTags.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.tags; +package li.cil.oc2r.common.tags; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/li/cil/oc2/common/tags/ItemTags.java b/src/main/java/li/cil/oc2r/common/tags/ItemTags.java similarity index 96% rename from src/main/java/li/cil/oc2/common/tags/ItemTags.java rename to src/main/java/li/cil/oc2r/common/tags/ItemTags.java index 6a96597b..a2cdc92f 100644 --- a/src/main/java/li/cil/oc2/common/tags/ItemTags.java +++ b/src/main/java/li/cil/oc2r/common/tags/ItemTags.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.tags; +package li.cil.oc2r.common.tags; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/li/cil/oc2r/common/tags/package-info.java b/src/main/java/li/cil/oc2r/common/tags/package-info.java new file mode 100644 index 00000000..e00a6216 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/tags/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.tags; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/util/BlockEntityUtils.java b/src/main/java/li/cil/oc2r/common/util/BlockEntityUtils.java similarity index 95% rename from src/main/java/li/cil/oc2/common/util/BlockEntityUtils.java rename to src/main/java/li/cil/oc2r/common/util/BlockEntityUtils.java index 044ec90a..567980df 100644 --- a/src/main/java/li/cil/oc2/common/util/BlockEntityUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/BlockEntityUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; diff --git a/src/main/java/li/cil/oc2/common/util/BlockLocation.java b/src/main/java/li/cil/oc2r/common/util/BlockLocation.java similarity index 98% rename from src/main/java/li/cil/oc2/common/util/BlockLocation.java rename to src/main/java/li/cil/oc2r/common/util/BlockLocation.java index 71f79801..2b18ecab 100644 --- a/src/main/java/li/cil/oc2/common/util/BlockLocation.java +++ b/src/main/java/li/cil/oc2r/common/util/BlockLocation.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2/common/util/ChainableVertexConsumer.java b/src/main/java/li/cil/oc2r/common/util/ChainableVertexConsumer.java similarity index 99% rename from src/main/java/li/cil/oc2/common/util/ChainableVertexConsumer.java rename to src/main/java/li/cil/oc2r/common/util/ChainableVertexConsumer.java index 60d96aa5..85d47607 100644 --- a/src/main/java/li/cil/oc2/common/util/ChainableVertexConsumer.java +++ b/src/main/java/li/cil/oc2r/common/util/ChainableVertexConsumer.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/li/cil/oc2/common/util/ChunkLocation.java b/src/main/java/li/cil/oc2r/common/util/ChunkLocation.java similarity index 97% rename from src/main/java/li/cil/oc2/common/util/ChunkLocation.java rename to src/main/java/li/cil/oc2r/common/util/ChunkLocation.java index 78ed25a7..de5e1c98 100644 --- a/src/main/java/li/cil/oc2/common/util/ChunkLocation.java +++ b/src/main/java/li/cil/oc2r/common/util/ChunkLocation.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.core.BlockPos; import net.minecraft.world.level.ChunkPos; diff --git a/src/main/java/li/cil/oc2/common/util/ChunkUtils.java b/src/main/java/li/cil/oc2r/common/util/ChunkUtils.java similarity index 97% rename from src/main/java/li/cil/oc2/common/util/ChunkUtils.java rename to src/main/java/li/cil/oc2r/common/util/ChunkUtils.java index 694107a6..817f21e6 100644 --- a/src/main/java/li/cil/oc2/common/util/ChunkUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/ChunkUtils.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.api.API; -import li.cil.oc2.common.mixin.ServerChunkCacheMixin; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.mixin.ServerChunkCacheMixin; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; import net.minecraft.world.level.ChunkPos; diff --git a/src/main/java/li/cil/oc2/common/util/ColorUtils.java b/src/main/java/li/cil/oc2r/common/util/ColorUtils.java similarity index 91% rename from src/main/java/li/cil/oc2/common/util/ColorUtils.java rename to src/main/java/li/cil/oc2r/common/util/ColorUtils.java index 96a94d17..f3177d94 100644 --- a/src/main/java/li/cil/oc2/common/util/ColorUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/ColorUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; public final class ColorUtils { public static int textureDiffuseColorsToRGB(final float[] colors) { diff --git a/src/main/java/li/cil/oc2/common/util/Event.java b/src/main/java/li/cil/oc2r/common/util/Event.java similarity index 89% rename from src/main/java/li/cil/oc2/common/util/Event.java rename to src/main/java/li/cil/oc2r/common/util/Event.java index 22a3aeee..3e113625 100644 --- a/src/main/java/li/cil/oc2/common/util/Event.java +++ b/src/main/java/li/cil/oc2r/common/util/Event.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import java.util.HashSet; diff --git a/src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java b/src/main/java/li/cil/oc2r/common/util/FakePlayerUtils.java similarity index 92% rename from src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java rename to src/main/java/li/cil/oc2r/common/util/FakePlayerUtils.java index 74ff9a5b..986814fc 100644 --- a/src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/FakePlayerUtils.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import com.mojang.authlib.GameProfile; -import li.cil.oc2.api.API; -import li.cil.oc2.common.Config; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.Config; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java b/src/main/java/li/cil/oc2r/common/util/HorizontalBlockUtils.java similarity index 96% rename from src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java rename to src/main/java/li/cil/oc2r/common/util/HorizontalBlockUtils.java index 8a82d3f5..d1118a34 100644 --- a/src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/HorizontalBlockUtils.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.api.util.Side; +import li.cil.oc2r.api.util.Side; import net.minecraft.core.Direction; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java b/src/main/java/li/cil/oc2r/common/util/ItemDeviceUtils.java similarity index 95% rename from src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java rename to src/main/java/li/cil/oc2r/common/util/ItemDeviceUtils.java index be531c89..db7c5103 100644 --- a/src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/ItemDeviceUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/common/util/ItemStackUtils.java b/src/main/java/li/cil/oc2r/common/util/ItemStackUtils.java similarity index 97% rename from src/main/java/li/cil/oc2/common/util/ItemStackUtils.java rename to src/main/java/li/cil/oc2r/common/util/ItemStackUtils.java index 35474f72..76e4b0f7 100644 --- a/src/main/java/li/cil/oc2/common/util/ItemStackUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/ItemStackUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -16,7 +16,7 @@ import net.minecraft.world.phys.Vec3; import javax.annotation.Nullable; import java.util.Optional; -import static li.cil.oc2.common.Constants.MOD_TAG_NAME; +import static li.cil.oc2r.common.Constants.MOD_TAG_NAME; public final class ItemStackUtils { public static CompoundTag getModDataTag(final ItemStack stack) { diff --git a/src/main/java/li/cil/oc2/common/util/LazyOptionalUtils.java b/src/main/java/li/cil/oc2r/common/util/LazyOptionalUtils.java similarity index 98% rename from src/main/java/li/cil/oc2/common/util/LazyOptionalUtils.java rename to src/main/java/li/cil/oc2r/common/util/LazyOptionalUtils.java index fda70525..8bbb9dcf 100644 --- a/src/main/java/li/cil/oc2/common/util/LazyOptionalUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/LazyOptionalUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.util.NonNullConsumer; diff --git a/src/main/java/li/cil/oc2/common/util/LevelUtils.java b/src/main/java/li/cil/oc2r/common/util/LevelUtils.java similarity index 98% rename from src/main/java/li/cil/oc2/common/util/LevelUtils.java rename to src/main/java/li/cil/oc2r/common/util/LevelUtils.java index 7cc7433c..a372e8d3 100644 --- a/src/main/java/li/cil/oc2/common/util/LevelUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/LevelUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/common/util/LocationSupplierUtils.java b/src/main/java/li/cil/oc2r/common/util/LocationSupplierUtils.java similarity index 89% rename from src/main/java/li/cil/oc2/common/util/LocationSupplierUtils.java rename to src/main/java/li/cil/oc2r/common/util/LocationSupplierUtils.java index d83b008a..a96a33d0 100644 --- a/src/main/java/li/cil/oc2/common/util/LocationSupplierUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/LocationSupplierUtils.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/common/util/NBTTagIds.java b/src/main/java/li/cil/oc2r/common/util/NBTTagIds.java similarity index 96% rename from src/main/java/li/cil/oc2/common/util/NBTTagIds.java rename to src/main/java/li/cil/oc2r/common/util/NBTTagIds.java index 21bab57d..ebcd3637 100644 --- a/src/main/java/li/cil/oc2/common/util/NBTTagIds.java +++ b/src/main/java/li/cil/oc2r/common/util/NBTTagIds.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.nbt.Tag; diff --git a/src/main/java/li/cil/oc2/common/util/NBTUtils.java b/src/main/java/li/cil/oc2r/common/util/NBTUtils.java similarity index 98% rename from src/main/java/li/cil/oc2/common/util/NBTUtils.java rename to src/main/java/li/cil/oc2r/common/util/NBTUtils.java index 34d8efd8..1888b66d 100644 --- a/src/main/java/li/cil/oc2/common/util/NBTUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/NBTUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/util/ParameterizedEvent.java b/src/main/java/li/cil/oc2r/common/util/ParameterizedEvent.java similarity index 92% rename from src/main/java/li/cil/oc2/common/util/ParameterizedEvent.java rename to src/main/java/li/cil/oc2r/common/util/ParameterizedEvent.java index 11d8dc17..259dac94 100644 --- a/src/main/java/li/cil/oc2/common/util/ParameterizedEvent.java +++ b/src/main/java/li/cil/oc2r/common/util/ParameterizedEvent.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import java.util.HashSet; import java.util.function.Consumer; diff --git a/src/main/java/li/cil/oc2/common/util/RegistryUtils.java b/src/main/java/li/cil/oc2r/common/util/RegistryUtils.java similarity index 90% rename from src/main/java/li/cil/oc2/common/util/RegistryUtils.java rename to src/main/java/li/cil/oc2r/common/util/RegistryUtils.java index 0598ce9e..3ba2109a 100644 --- a/src/main/java/li/cil/oc2/common/util/RegistryUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/RegistryUtils.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.api.API; -import li.cil.oc2.api.bus.device.DeviceType; -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; -import li.cil.oc2.common.bus.device.provider.ProviderRegistry; +import li.cil.oc2r.api.API; +import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.common.bus.device.provider.ProviderRegistry; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/src/main/java/li/cil/oc2/common/util/RunnableUtils.java b/src/main/java/li/cil/oc2r/common/util/RunnableUtils.java similarity index 78% rename from src/main/java/li/cil/oc2/common/util/RunnableUtils.java rename to src/main/java/li/cil/oc2r/common/util/RunnableUtils.java index 3296798c..2c69ed23 100644 --- a/src/main/java/li/cil/oc2/common/util/RunnableUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/RunnableUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; public final class RunnableUtils { public static void doNothing() { diff --git a/src/main/java/li/cil/oc2/common/util/ServerScheduler.java b/src/main/java/li/cil/oc2r/common/util/ServerScheduler.java similarity index 99% rename from src/main/java/li/cil/oc2/common/util/ServerScheduler.java rename to src/main/java/li/cil/oc2r/common/util/ServerScheduler.java index ade3a86b..96845475 100644 --- a/src/main/java/li/cil/oc2/common/util/ServerScheduler.java +++ b/src/main/java/li/cil/oc2r/common/util/ServerScheduler.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2/common/util/SoundEvents.java b/src/main/java/li/cil/oc2r/common/util/SoundEvents.java similarity index 96% rename from src/main/java/li/cil/oc2/common/util/SoundEvents.java rename to src/main/java/li/cil/oc2r/common/util/SoundEvents.java index ac1e32de..67cb0311 100644 --- a/src/main/java/li/cil/oc2/common/util/SoundEvents.java +++ b/src/main/java/li/cil/oc2r/common/util/SoundEvents.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/src/main/java/li/cil/oc2/common/util/TerminalUtils.java b/src/main/java/li/cil/oc2r/common/util/TerminalUtils.java similarity index 90% rename from src/main/java/li/cil/oc2/common/util/TerminalUtils.java rename to src/main/java/li/cil/oc2r/common/util/TerminalUtils.java index e0cb0d88..e8986c3d 100644 --- a/src/main/java/li/cil/oc2/common/util/TerminalUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/TerminalUtils.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.common.vm.Terminal; +import li.cil.oc2r.common.vm.Terminal; import java.nio.ByteBuffer; import java.util.function.Consumer; diff --git a/src/main/java/li/cil/oc2/common/util/TextFormatUtils.java b/src/main/java/li/cil/oc2r/common/util/TextFormatUtils.java similarity index 97% rename from src/main/java/li/cil/oc2/common/util/TextFormatUtils.java rename to src/main/java/li/cil/oc2r/common/util/TextFormatUtils.java index 350a3a6e..682a8629 100644 --- a/src/main/java/li/cil/oc2/common/util/TextFormatUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/TextFormatUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java b/src/main/java/li/cil/oc2r/common/util/ThrottledSoundEmitter.java similarity index 98% rename from src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java rename to src/main/java/li/cil/oc2r/common/util/ThrottledSoundEmitter.java index 45df056f..43049b18 100644 --- a/src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java +++ b/src/main/java/li/cil/oc2r/common/util/ThrottledSoundEmitter.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/li/cil/oc2/common/util/TickUtils.java b/src/main/java/li/cil/oc2r/common/util/TickUtils.java similarity index 77% rename from src/main/java/li/cil/oc2/common/util/TickUtils.java rename to src/main/java/li/cil/oc2r/common/util/TickUtils.java index abb61ac3..d49890fb 100644 --- a/src/main/java/li/cil/oc2/common/util/TickUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/TickUtils.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.common.Constants; +import li.cil.oc2r.common.Constants; import java.time.Duration; diff --git a/src/main/java/li/cil/oc2/common/util/TooltipUtils.java b/src/main/java/li/cil/oc2r/common/util/TooltipUtils.java similarity index 94% rename from src/main/java/li/cil/oc2/common/util/TooltipUtils.java rename to src/main/java/li/cil/oc2r/common/util/TooltipUtils.java index ee7d512d..5a762f1d 100644 --- a/src/main/java/li/cil/oc2/common/util/TooltipUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/TooltipUtils.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; -import li.cil.oc2.api.bus.device.DeviceType; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.block.EnergyConsumingBlock; -import li.cil.oc2.common.bus.device.util.Devices; -import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.tags.ItemTags; +import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.block.EnergyConsumingBlock; +import li.cil.oc2r.common.bus.device.util.Devices; +import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2r.common.tags.ItemTags; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.StringSplitter; @@ -31,8 +31,8 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; -import static li.cil.oc2.common.Constants.*; -import static li.cil.oc2.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2r.common.Constants.*; +import static li.cil.oc2r.common.util.TextFormatUtils.withFormat; @SuppressWarnings("UnstableApiUsage") public final class TooltipUtils { diff --git a/src/main/java/li/cil/oc2/common/util/TranslationUtils.java b/src/main/java/li/cil/oc2r/common/util/TranslationUtils.java similarity index 88% rename from src/main/java/li/cil/oc2/common/util/TranslationUtils.java rename to src/main/java/li/cil/oc2r/common/util/TranslationUtils.java index d2816471..46dcd73e 100644 --- a/src/main/java/li/cil/oc2/common/util/TranslationUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/TranslationUtils.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/li/cil/oc2/common/util/Vec3Utils.java b/src/main/java/li/cil/oc2r/common/util/Vec3Utils.java similarity index 88% rename from src/main/java/li/cil/oc2/common/util/Vec3Utils.java rename to src/main/java/li/cil/oc2r/common/util/Vec3Utils.java index e2b321f8..7bc254a5 100644 --- a/src/main/java/li/cil/oc2/common/util/Vec3Utils.java +++ b/src/main/java/li/cil/oc2r/common/util/Vec3Utils.java @@ -1,4 +1,4 @@ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.core.Vec3i; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java b/src/main/java/li/cil/oc2r/common/util/VoxelShapeUtils.java similarity index 95% rename from src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java rename to src/main/java/li/cil/oc2r/common/util/VoxelShapeUtils.java index 1f90577c..cfadc120 100644 --- a/src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java +++ b/src/main/java/li/cil/oc2r/common/util/VoxelShapeUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.util; +package li.cil.oc2r.common.util; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; diff --git a/src/main/java/li/cil/oc2r/common/util/package-info.java b/src/main/java/li/cil/oc2r/common/util/package-info.java new file mode 100644 index 00000000..e9026345 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/util/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.util; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/AbstractTerminalVMRunner.java b/src/main/java/li/cil/oc2r/common/vm/AbstractTerminalVMRunner.java similarity index 98% rename from src/main/java/li/cil/oc2/common/vm/AbstractTerminalVMRunner.java rename to src/main/java/li/cil/oc2r/common/vm/AbstractTerminalVMRunner.java index 0928f717..0dc78426 100644 --- a/src/main/java/li/cil/oc2/common/vm/AbstractTerminalVMRunner.java +++ b/src/main/java/li/cil/oc2r/common/vm/AbstractTerminalVMRunner.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue; import li.cil.sedna.device.serial.UART16550A; diff --git a/src/main/java/li/cil/oc2/common/vm/AbstractVMItemStackHandlers.java b/src/main/java/li/cil/oc2r/common/vm/AbstractVMItemStackHandlers.java similarity index 92% rename from src/main/java/li/cil/oc2/common/vm/AbstractVMItemStackHandlers.java rename to src/main/java/li/cil/oc2r/common/vm/AbstractVMItemStackHandlers.java index 3d8e2dff..92b876dc 100644 --- a/src/main/java/li/cil/oc2/common/vm/AbstractVMItemStackHandlers.java +++ b/src/main/java/li/cil/oc2r/common/vm/AbstractVMItemStackHandlers.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; -import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.device.DeviceType; -import li.cil.oc2.api.bus.device.DeviceTypes; -import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.common.bus.AbstractDeviceBusElement; -import li.cil.oc2.common.bus.AbstractItemDeviceBusElement; -import li.cil.oc2.common.container.AbstractDeviceItemStackHandler; -import li.cil.oc2.common.container.AbstractTypedDeviceItemStackHandler; +import li.cil.oc2r.api.bus.DeviceBusElement; +import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.DeviceTypes; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.common.bus.AbstractDeviceBusElement; +import li.cil.oc2r.common.bus.AbstractItemDeviceBusElement; +import li.cil.oc2r.common.container.AbstractDeviceItemStackHandler; +import li.cil.oc2r.common.container.AbstractTypedDeviceItemStackHandler; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java b/src/main/java/li/cil/oc2r/common/vm/AbstractVirtualMachine.java similarity index 95% rename from src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java rename to src/main/java/li/cil/oc2r/common/vm/AbstractVirtualMachine.java index 3ec3cc17..ae91d028 100644 --- a/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java +++ b/src/main/java/li/cil/oc2r/common/vm/AbstractVirtualMachine.java @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; import li.cil.ceres.api.Serialized; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.vm.FirmwareLoader; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.CommonDeviceBusController; -import li.cil.oc2.common.bus.RPCDeviceBusAdapter; -import li.cil.oc2.common.bus.device.rpc.item.CPUItemDevice; -import li.cil.oc2.common.serialization.NBTSerialization; -import li.cil.oc2.common.util.NBTTagIds; -import li.cil.oc2.common.util.NBTUtils; -import li.cil.oc2.common.util.TickUtils; -import li.cil.oc2.common.vm.context.global.GlobalVMContext; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.vm.FirmwareLoader; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2r.common.bus.device.rpc.item.CPUItemDevice; +import li.cil.oc2r.common.serialization.NBTSerialization; +import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2r.common.util.NBTUtils; +import li.cil.oc2r.common.util.TickUtils; +import li.cil.oc2r.common.vm.context.global.GlobalVMContext; import li.cil.sedna.api.memory.MemoryAccessException; import li.cil.sedna.riscv.R5Board; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2/common/vm/Allocator.java b/src/main/java/li/cil/oc2r/common/vm/Allocator.java similarity index 97% rename from src/main/java/li/cil/oc2/common/vm/Allocator.java rename to src/main/java/li/cil/oc2r/common/vm/Allocator.java index 6ba4649b..1c15f7b5 100644 --- a/src/main/java/li/cil/oc2/common/vm/Allocator.java +++ b/src/main/java/li/cil/oc2r/common/vm/Allocator.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; -import li.cil.oc2.api.API; -import li.cil.oc2.common.Config; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.Config; import net.minecraftforge.event.server.ServerStoppedEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/li/cil/oc2/common/vm/BaseAddressProvider.java b/src/main/java/li/cil/oc2r/common/vm/BaseAddressProvider.java similarity index 68% rename from src/main/java/li/cil/oc2/common/vm/BaseAddressProvider.java rename to src/main/java/li/cil/oc2r/common/vm/BaseAddressProvider.java index 31e835b6..1817556c 100644 --- a/src/main/java/li/cil/oc2/common/vm/BaseAddressProvider.java +++ b/src/main/java/li/cil/oc2r/common/vm/BaseAddressProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; -import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; import java.util.OptionalLong; diff --git a/src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java b/src/main/java/li/cil/oc2r/common/vm/BuiltinDevices.java similarity index 94% rename from src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java rename to src/main/java/li/cil/oc2r/common/vm/BuiltinDevices.java index 272a1c53..83925d57 100644 --- a/src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java +++ b/src/main/java/li/cil/oc2r/common/vm/BuiltinDevices.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; import li.cil.ceres.api.Serialized; -import li.cil.oc2.common.bus.device.data.FileSystems; -import li.cil.oc2.common.vm.context.global.GlobalVMContext; +import li.cil.oc2r.common.bus.device.data.FileSystems; +import li.cil.oc2r.common.vm.context.global.GlobalVMContext; import li.cil.sedna.api.Interrupt; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.device.rtc.GoldfishRTC; diff --git a/src/main/java/li/cil/oc2/common/vm/MinecraftRealTimeCounter.java b/src/main/java/li/cil/oc2r/common/vm/MinecraftRealTimeCounter.java similarity index 96% rename from src/main/java/li/cil/oc2/common/vm/MinecraftRealTimeCounter.java rename to src/main/java/li/cil/oc2r/common/vm/MinecraftRealTimeCounter.java index 6148b58f..babceff4 100644 --- a/src/main/java/li/cil/oc2/common/vm/MinecraftRealTimeCounter.java +++ b/src/main/java/li/cil/oc2r/common/vm/MinecraftRealTimeCounter.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; import li.cil.sedna.api.device.rtc.RealTimeCounter; import net.minecraft.world.level.Level; diff --git a/src/main/java/li/cil/oc2/common/vm/Terminal.java b/src/main/java/li/cil/oc2r/common/vm/Terminal.java similarity index 99% rename from src/main/java/li/cil/oc2/common/vm/Terminal.java rename to src/main/java/li/cil/oc2r/common/vm/Terminal.java index c5007c09..f4e99c5c 100644 --- a/src/main/java/li/cil/oc2/common/vm/Terminal.java +++ b/src/main/java/li/cil/oc2r/common/vm/Terminal.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; import org.joml.Matrix4f; import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue; import li.cil.ceres.api.Serialized; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.ShaderInstance; diff --git a/src/main/java/li/cil/oc2/common/vm/VMDeviceBusAdapter.java b/src/main/java/li/cil/oc2r/common/vm/VMDeviceBusAdapter.java similarity index 91% rename from src/main/java/li/cil/oc2/common/vm/VMDeviceBusAdapter.java rename to src/main/java/li/cil/oc2r/common/vm/VMDeviceBusAdapter.java index ac9e6521..a1711597 100644 --- a/src/main/java/li/cil/oc2/common/vm/VMDeviceBusAdapter.java +++ b/src/main/java/li/cil/oc2r/common/vm/VMDeviceBusAdapter.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.vm.VMDevice; -import li.cil.oc2.api.bus.device.vm.VMDeviceLoadResult; -import li.cil.oc2.common.vm.context.global.GlobalVMContext; -import li.cil.oc2.common.vm.context.managed.ManagedVMContext; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.vm.VMDeviceLoadResult; +import li.cil.oc2r.common.vm.context.global.GlobalVMContext; +import li.cil.oc2r.common.vm.context.managed.ManagedVMContext; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2/common/vm/VMItemStackHandlers.java b/src/main/java/li/cil/oc2r/common/vm/VMItemStackHandlers.java similarity index 78% rename from src/main/java/li/cil/oc2/common/vm/VMItemStackHandlers.java rename to src/main/java/li/cil/oc2r/common/vm/VMItemStackHandlers.java index d3281eff..ce855492 100644 --- a/src/main/java/li/cil/oc2/common/vm/VMItemStackHandlers.java +++ b/src/main/java/li/cil/oc2r/common/vm/VMItemStackHandlers.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; -import li.cil.oc2.api.bus.device.DeviceType; +import li.cil.oc2r.api.bus.device.DeviceType; import net.minecraftforge.items.IItemHandler; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2/common/vm/VMRunState.java b/src/main/java/li/cil/oc2r/common/vm/VMRunState.java similarity index 78% rename from src/main/java/li/cil/oc2/common/vm/VMRunState.java rename to src/main/java/li/cil/oc2r/common/vm/VMRunState.java index be1e7057..ff87897a 100644 --- a/src/main/java/li/cil/oc2/common/vm/VMRunState.java +++ b/src/main/java/li/cil/oc2r/common/vm/VMRunState.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; public enum VMRunState { STOPPED, diff --git a/src/main/java/li/cil/oc2/common/vm/VMRunner.java b/src/main/java/li/cil/oc2r/common/vm/VMRunner.java similarity index 91% rename from src/main/java/li/cil/oc2/common/vm/VMRunner.java rename to src/main/java/li/cil/oc2r/common/vm/VMRunner.java index 866d24af..5a6dfcbe 100644 --- a/src/main/java/li/cil/oc2/common/vm/VMRunner.java +++ b/src/main/java/li/cil/oc2r/common/vm/VMRunner.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; import li.cil.ceres.api.Serialized; -import li.cil.oc2.api.bus.device.vm.event.VMInitializationException; -import li.cil.oc2.api.bus.device.vm.event.VMInitializingEvent; -import li.cil.oc2.api.bus.device.vm.event.VMResumedRunningEvent; -import li.cil.oc2.api.bus.device.vm.event.VMSynchronizeEvent; -import li.cil.oc2.common.Constants; -import li.cil.oc2.common.bus.RPCDeviceBusAdapter; -import li.cil.oc2.common.vm.context.global.GlobalVMContext; +import li.cil.oc2r.api.bus.device.vm.event.VMInitializationException; +import li.cil.oc2r.api.bus.device.vm.event.VMInitializingEvent; +import li.cil.oc2r.api.bus.device.vm.event.VMResumedRunningEvent; +import li.cil.oc2r.api.bus.device.vm.event.VMSynchronizeEvent; +import li.cil.oc2r.common.Constants; +import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2r.common.vm.context.global.GlobalVMContext; import li.cil.sedna.riscv.R5Board; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/common/vm/VirtualMachine.java b/src/main/java/li/cil/oc2r/common/vm/VirtualMachine.java similarity index 89% rename from src/main/java/li/cil/oc2/common/vm/VirtualMachine.java rename to src/main/java/li/cil/oc2r/common/vm/VirtualMachine.java index 3076fa84..699b75bd 100644 --- a/src/main/java/li/cil/oc2/common/vm/VirtualMachine.java +++ b/src/main/java/li/cil/oc2r/common/vm/VirtualMachine.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm; +package li.cil.oc2r.common.vm; -import li.cil.oc2.common.bus.CommonDeviceBusController; +import li.cil.oc2r.common.bus.CommonDeviceBusController; import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/li/cil/oc2/common/vm/context/EventManager.java b/src/main/java/li/cil/oc2r/common/vm/context/EventManager.java similarity index 74% rename from src/main/java/li/cil/oc2/common/vm/context/EventManager.java rename to src/main/java/li/cil/oc2r/common/vm/context/EventManager.java index 28378cb5..3d3275c5 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/EventManager.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/EventManager.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context; +package li.cil.oc2r.common.vm.context; public interface EventManager { void unregister(Object subscriber); diff --git a/src/main/java/li/cil/oc2/common/vm/context/InterruptManager.java b/src/main/java/li/cil/oc2r/common/vm/context/InterruptManager.java similarity index 82% rename from src/main/java/li/cil/oc2/common/vm/context/InterruptManager.java rename to src/main/java/li/cil/oc2r/common/vm/context/InterruptManager.java index 027cf4a1..f5d75668 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/InterruptManager.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/InterruptManager.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context; +package li.cil.oc2r.common.vm.context; import java.util.BitSet; diff --git a/src/main/java/li/cil/oc2/common/vm/context/InterruptValidator.java b/src/main/java/li/cil/oc2r/common/vm/context/InterruptValidator.java similarity index 80% rename from src/main/java/li/cil/oc2/common/vm/context/InterruptValidator.java rename to src/main/java/li/cil/oc2r/common/vm/context/InterruptValidator.java index c52bddfc..368369e8 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/InterruptValidator.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/InterruptValidator.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context; +package li.cil.oc2r.common.vm.context; public interface InterruptValidator { boolean isMaskValid(int mask); diff --git a/src/main/java/li/cil/oc2/common/vm/context/MemoryRangeManager.java b/src/main/java/li/cil/oc2r/common/vm/context/MemoryRangeManager.java similarity index 88% rename from src/main/java/li/cil/oc2/common/vm/context/MemoryRangeManager.java rename to src/main/java/li/cil/oc2r/common/vm/context/MemoryRangeManager.java index bfc9bad4..59691a55 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/MemoryRangeManager.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/MemoryRangeManager.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context; +package li.cil.oc2r.common.vm.context; import li.cil.sedna.api.device.MemoryMappedDevice; diff --git a/src/main/java/li/cil/oc2/common/vm/context/VMContextManagerCollection.java b/src/main/java/li/cil/oc2r/common/vm/context/VMContextManagerCollection.java similarity index 84% rename from src/main/java/li/cil/oc2/common/vm/context/VMContextManagerCollection.java rename to src/main/java/li/cil/oc2r/common/vm/context/VMContextManagerCollection.java index 6c77ee26..58fceb80 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/VMContextManagerCollection.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/VMContextManagerCollection.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context; +package li.cil.oc2r.common.vm.context; public interface VMContextManagerCollection { InterruptManager getInterruptManager(); diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalEventBus.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalEventBus.java similarity index 87% rename from src/main/java/li/cil/oc2/common/vm/context/global/GlobalEventBus.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/GlobalEventBus.java index f4144b2f..7ee24193 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalEventBus.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalEventBus.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.SubscriberExceptionContext; -import li.cil.oc2.api.bus.device.vm.context.VMLifecycleEventBus; -import li.cil.oc2.api.bus.device.vm.event.VMInitializationException; -import li.cil.oc2.common.vm.context.EventManager; +import li.cil.oc2r.api.bus.device.vm.context.VMLifecycleEventBus; +import li.cil.oc2r.api.bus.device.vm.event.VMInitializationException; +import li.cil.oc2r.common.vm.context.EventManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptAllocator.java similarity index 91% rename from src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptAllocator.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptAllocator.java index eadf97ef..c14b426a 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptAllocator.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptAllocator.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; -import li.cil.oc2.api.bus.device.vm.context.InterruptAllocator; -import li.cil.oc2.common.vm.context.InterruptManager; -import li.cil.oc2.common.vm.context.InterruptValidator; +import li.cil.oc2r.api.bus.device.vm.context.InterruptAllocator; +import li.cil.oc2r.common.vm.context.InterruptManager; +import li.cil.oc2r.common.vm.context.InterruptValidator; import java.util.BitSet; import java.util.OptionalInt; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptController.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptController.java similarity index 94% rename from src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptController.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptController.java index 56d08aeb..5744c07a 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptController.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptController.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; -import li.cil.oc2.common.vm.context.InterruptValidator; +import li.cil.oc2r.common.vm.context.InterruptValidator; import li.cil.sedna.api.device.InterruptController; final class GlobalInterruptController implements InterruptController { diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryAllocator.java similarity index 83% rename from src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryAllocator.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryAllocator.java index ceb4e1a1..ccf3877c 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryAllocator.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryAllocator.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; -import li.cil.oc2.api.bus.device.vm.context.MemoryAllocator; -import li.cil.oc2.common.vm.Allocator; +import li.cil.oc2r.api.bus.device.vm.context.MemoryAllocator; +import li.cil.oc2r.common.vm.Allocator; import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryMap.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryMap.java similarity index 97% rename from src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryMap.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryMap.java index 793c6fb6..9a35563e 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryMap.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryMap.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.memory.MappedMemoryRange; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryRangeAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryRangeAllocator.java similarity index 94% rename from src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryRangeAllocator.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryRangeAllocator.java index d9d5816a..822c2b82 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryRangeAllocator.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryRangeAllocator.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; import it.unimi.dsi.fastutil.objects.Object2LongArrayMap; import it.unimi.dsi.fastutil.objects.Object2LongMap; -import li.cil.oc2.api.bus.device.vm.context.MemoryRangeAllocator; -import li.cil.oc2.common.vm.context.MemoryRangeManager; +import li.cil.oc2r.api.bus.device.vm.context.MemoryRangeAllocator; +import li.cil.oc2r.common.vm.context.MemoryRangeManager; import li.cil.sedna.api.Board; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.memory.MemoryRange; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalVMContext.java similarity index 91% rename from src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/GlobalVMContext.java index 1a8ca029..4e39763f 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalVMContext.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; import li.cil.ceres.api.Serialized; -import li.cil.oc2.api.bus.device.vm.context.*; -import li.cil.oc2.common.vm.context.EventManager; -import li.cil.oc2.common.vm.context.InterruptManager; -import li.cil.oc2.common.vm.context.MemoryRangeManager; -import li.cil.oc2.common.vm.context.VMContextManagerCollection; +import li.cil.oc2r.api.bus.device.vm.context.*; +import li.cil.oc2r.common.vm.context.EventManager; +import li.cil.oc2r.common.vm.context.InterruptManager; +import li.cil.oc2r.common.vm.context.MemoryRangeManager; +import li.cil.oc2r.common.vm.context.VMContextManagerCollection; import li.cil.sedna.api.Board; import li.cil.sedna.api.device.InterruptController; import li.cil.sedna.api.memory.MemoryMap; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/MemoryRangeList.java b/src/main/java/li/cil/oc2r/common/vm/context/global/MemoryRangeList.java similarity index 79% rename from src/main/java/li/cil/oc2/common/vm/context/global/MemoryRangeList.java rename to src/main/java/li/cil/oc2r/common/vm/context/global/MemoryRangeList.java index 32f841e5..0b7dcf83 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/global/MemoryRangeList.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/MemoryRangeList.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.global; +package li.cil.oc2r.common.vm.context.global; import li.cil.sedna.api.memory.MemoryRange; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/package-info.java b/src/main/java/li/cil/oc2r/common/vm/context/global/package-info.java new file mode 100644 index 00000000..1b53b7ad --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/vm/context/global/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.vm.context.global; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedEventBus.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedEventBus.java similarity index 86% rename from src/main/java/li/cil/oc2/common/vm/context/managed/ManagedEventBus.java rename to src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedEventBus.java index d0fe29ce..81b9fadd 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedEventBus.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedEventBus.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.managed; +package li.cil.oc2r.common.vm.context.managed; -import li.cil.oc2.api.bus.device.vm.context.VMLifecycleEventBus; -import li.cil.oc2.common.vm.context.EventManager; +import li.cil.oc2r.api.bus.device.vm.context.VMLifecycleEventBus; +import li.cil.oc2r.common.vm.context.EventManager; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptAllocator.java similarity index 90% rename from src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptAllocator.java rename to src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptAllocator.java index 0064ad88..e8cbe162 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptAllocator.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptAllocator.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.managed; +package li.cil.oc2r.common.vm.context.managed; -import li.cil.oc2.api.bus.device.vm.context.InterruptAllocator; -import li.cil.oc2.common.vm.context.InterruptManager; -import li.cil.oc2.common.vm.context.InterruptValidator; +import li.cil.oc2r.api.bus.device.vm.context.InterruptAllocator; +import li.cil.oc2r.common.vm.context.InterruptManager; +import li.cil.oc2r.common.vm.context.InterruptValidator; import java.util.BitSet; import java.util.OptionalInt; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptController.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptController.java similarity index 94% rename from src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptController.java rename to src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptController.java index c73082f9..26d9f71a 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptController.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptController.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.managed; +package li.cil.oc2r.common.vm.context.managed; -import li.cil.oc2.common.vm.context.InterruptValidator; +import li.cil.oc2r.common.vm.context.InterruptValidator; import li.cil.sedna.api.device.InterruptController; public final class ManagedInterruptController implements InterruptController { diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryAllocator.java similarity index 85% rename from src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryAllocator.java rename to src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryAllocator.java index 98ed2a5c..40d9fc70 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryAllocator.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryAllocator.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.managed; +package li.cil.oc2r.common.vm.context.managed; -import li.cil.oc2.api.bus.device.vm.context.MemoryAllocator; -import li.cil.oc2.common.vm.Allocator; +import li.cil.oc2r.api.bus.device.vm.context.MemoryAllocator; +import li.cil.oc2r.common.vm.Allocator; import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryMap.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryMap.java similarity index 97% rename from src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryMap.java rename to src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryMap.java index bd91d907..a9be28d5 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryMap.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryMap.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.managed; +package li.cil.oc2r.common.vm.context.managed; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.memory.MappedMemoryRange; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryRangeAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryRangeAllocator.java similarity index 93% rename from src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryRangeAllocator.java rename to src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryRangeAllocator.java index 4a9907bb..60e0b0f6 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryRangeAllocator.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryRangeAllocator.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.managed; +package li.cil.oc2r.common.vm.context.managed; -import li.cil.oc2.api.bus.device.vm.context.MemoryRangeAllocator; -import li.cil.oc2.common.vm.context.MemoryRangeManager; +import li.cil.oc2r.api.bus.device.vm.context.MemoryRangeAllocator; +import li.cil.oc2r.common.vm.context.MemoryRangeManager; import li.cil.sedna.api.device.MemoryMappedDevice; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedVMContext.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedVMContext.java similarity index 94% rename from src/main/java/li/cil/oc2/common/vm/context/managed/ManagedVMContext.java rename to src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedVMContext.java index eaa6c061..76c9632e 100644 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedVMContext.java +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedVMContext.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.context.managed; +package li.cil.oc2r.common.vm.context.managed; -import li.cil.oc2.api.bus.device.vm.context.*; -import li.cil.oc2.common.vm.context.VMContextManagerCollection; +import li.cil.oc2r.api.bus.device.vm.context.*; +import li.cil.oc2r.common.vm.context.VMContextManagerCollection; import li.cil.sedna.api.device.InterruptController; import li.cil.sedna.api.memory.MemoryMap; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/package-info.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/package-info.java new file mode 100644 index 00000000..f0201dc0 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/vm/context/managed/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.vm.context.managed; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/package-info.java b/src/main/java/li/cil/oc2r/common/vm/context/package-info.java new file mode 100644 index 00000000..ba9a8427 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/vm/context/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.vm.context; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/device/PciRootPortDevice.java b/src/main/java/li/cil/oc2r/common/vm/device/PciRootPortDevice.java similarity index 98% rename from src/main/java/li/cil/oc2/common/vm/device/PciRootPortDevice.java rename to src/main/java/li/cil/oc2r/common/vm/device/PciRootPortDevice.java index 34605d62..e97ef0d8 100644 --- a/src/main/java/li/cil/oc2/common/vm/device/PciRootPortDevice.java +++ b/src/main/java/li/cil/oc2r/common/vm/device/PciRootPortDevice.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.device; +package li.cil.oc2r.common.vm.device; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.memory.MemoryAccessException; diff --git a/src/main/java/li/cil/oc2/common/vm/device/SimpleFramebufferDevice.java b/src/main/java/li/cil/oc2r/common/vm/device/SimpleFramebufferDevice.java similarity index 97% rename from src/main/java/li/cil/oc2/common/vm/device/SimpleFramebufferDevice.java rename to src/main/java/li/cil/oc2r/common/vm/device/SimpleFramebufferDevice.java index 2e680851..ea34837c 100644 --- a/src/main/java/li/cil/oc2/common/vm/device/SimpleFramebufferDevice.java +++ b/src/main/java/li/cil/oc2r/common/vm/device/SimpleFramebufferDevice.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.device; +package li.cil.oc2r.common.vm.device; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.scale.RgbToYuv420j; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.scale.RgbToYuv420j; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.memory.MemoryAccessException; import li.cil.sedna.utils.DirectByteBufferUtils; diff --git a/src/main/java/li/cil/oc2/common/vm/fs/LayeredFileSystem.java b/src/main/java/li/cil/oc2r/common/vm/fs/LayeredFileSystem.java similarity index 99% rename from src/main/java/li/cil/oc2/common/vm/fs/LayeredFileSystem.java rename to src/main/java/li/cil/oc2r/common/vm/fs/LayeredFileSystem.java index 1555f3a7..03daaec4 100644 --- a/src/main/java/li/cil/oc2/common/vm/fs/LayeredFileSystem.java +++ b/src/main/java/li/cil/oc2r/common/vm/fs/LayeredFileSystem.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.fs; +package li.cil.oc2r.common.vm.fs; import li.cil.sedna.fs.*; diff --git a/src/main/java/li/cil/oc2r/common/vm/fs/package-info.java b/src/main/java/li/cil/oc2r/common/vm/fs/package-info.java new file mode 100644 index 00000000..3b2b9b87 --- /dev/null +++ b/src/main/java/li/cil/oc2r/common/vm/fs/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.common.vm.fs; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/package-info.java b/src/main/java/li/cil/oc2r/common/vm/package-info.java similarity index 86% rename from src/main/java/li/cil/oc2/client/gui/package-info.java rename to src/main/java/li/cil/oc2r/common/vm/package-info.java index ec9bf592..b53ef283 100644 --- a/src/main/java/li/cil/oc2/client/gui/package-info.java +++ b/src/main/java/li/cil/oc2r/common/vm/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.client.gui; +package li.cil.oc2r.common.vm; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/provider/DeviceTreeProviders.java b/src/main/java/li/cil/oc2r/common/vm/provider/DeviceTreeProviders.java similarity index 71% rename from src/main/java/li/cil/oc2/common/vm/provider/DeviceTreeProviders.java rename to src/main/java/li/cil/oc2r/common/vm/provider/DeviceTreeProviders.java index 912a47f6..2d3714f7 100644 --- a/src/main/java/li/cil/oc2/common/vm/provider/DeviceTreeProviders.java +++ b/src/main/java/li/cil/oc2r/common/vm/provider/DeviceTreeProviders.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.provider; +package li.cil.oc2r.common.vm.provider; -import li.cil.oc2.common.vm.device.PciRootPortDevice; -import li.cil.oc2.common.vm.device.SimpleFramebufferDevice; +import li.cil.oc2r.common.vm.device.PciRootPortDevice; +import li.cil.oc2r.common.vm.device.SimpleFramebufferDevice; import li.cil.sedna.devicetree.DeviceTreeRegistry; public final class DeviceTreeProviders { diff --git a/src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java b/src/main/java/li/cil/oc2r/common/vm/provider/PciRootPortDeviceProvider.java similarity index 95% rename from src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/vm/provider/PciRootPortDeviceProvider.java index 514af517..7e5c19c1 100644 --- a/src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/vm/provider/PciRootPortDeviceProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.provider; +package li.cil.oc2r.common.vm.provider; -import li.cil.oc2.common.vm.device.PciRootPortDevice; +import li.cil.oc2r.common.vm.device.PciRootPortDevice; import li.cil.sedna.api.device.Device; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.devicetree.DeviceNames; diff --git a/src/main/java/li/cil/oc2/common/vm/provider/SimpleFramebufferDeviceProvider.java b/src/main/java/li/cil/oc2r/common/vm/provider/SimpleFramebufferDeviceProvider.java similarity index 94% rename from src/main/java/li/cil/oc2/common/vm/provider/SimpleFramebufferDeviceProvider.java rename to src/main/java/li/cil/oc2r/common/vm/provider/SimpleFramebufferDeviceProvider.java index ac165c3c..a875de99 100644 --- a/src/main/java/li/cil/oc2/common/vm/provider/SimpleFramebufferDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/vm/provider/SimpleFramebufferDeviceProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.common.vm.provider; +package li.cil.oc2r.common.vm.provider; -import li.cil.oc2.common.vm.device.SimpleFramebufferDevice; +import li.cil.oc2r.common.vm.device.SimpleFramebufferDevice; import li.cil.sedna.api.device.Device; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.devicetree.DevicePropertyNames; diff --git a/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java b/src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java similarity index 97% rename from src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java rename to src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java index def122ef..f28fff00 100644 --- a/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java +++ b/src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java @@ -1,7 +1,7 @@ -package li.cil.oc2.common.vxlan; +package li.cil.oc2r.common.vxlan; -import li.cil.oc2.api.capabilities.NetworkInterface; -import li.cil.oc2.common.Config; +import li.cil.oc2r.api.capabilities.NetworkInterface; +import li.cil.oc2r.common.Config; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/li/cil/oc2/data/DataGenerators.java b/src/main/java/li/cil/oc2r/data/DataGenerators.java similarity index 97% rename from src/main/java/li/cil/oc2/data/DataGenerators.java rename to src/main/java/li/cil/oc2r/data/DataGenerators.java index eac532ac..1381ad8c 100644 --- a/src/main/java/li/cil/oc2/data/DataGenerators.java +++ b/src/main/java/li/cil/oc2r/data/DataGenerators.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; import net.minecraft.data.loot.LootTableProvider; diff --git a/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java b/src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java similarity index 98% rename from src/main/java/li/cil/oc2/data/ModBlockStateProvider.java rename to src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java index 5a6399c5..ccbf33fc 100644 --- a/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; -import li.cil.oc2.api.API; -import li.cil.oc2.common.block.Blocks; -import li.cil.oc2.common.block.BusCableBlock; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2r.common.block.BusCableBlock; +import li.cil.oc2r.common.item.Items; import net.minecraft.core.Direction; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java b/src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java similarity index 88% rename from src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java rename to src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java index 33082310..6ca99f14 100644 --- a/src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraftforge.common.data.BlockTagsProvider; @@ -12,8 +12,8 @@ import javax.annotation.Nullable; import java.util.concurrent.CompletableFuture; -import static li.cil.oc2.common.block.Blocks.*; -import static li.cil.oc2.common.tags.BlockTags.*; +import static li.cil.oc2r.common.block.Blocks.*; +import static li.cil.oc2r.common.tags.BlockTags.*; public final class ModBlockTagsProvider extends BlockTagsProvider { public ModBlockTagsProvider(final PackOutput packOutput, CompletableFuture lookupProvider, @Nullable final ExistingFileHelper existingFileHelper) { diff --git a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java similarity index 95% rename from src/main/java/li/cil/oc2/data/ModItemModelProvider.java rename to src/main/java/li/cil/oc2r/data/ModItemModelProvider.java index 904053b7..0663d9b0 100644 --- a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; -import li.cil.oc2.api.API; -import li.cil.oc2.common.entity.Entities; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.api.API; +import li.cil.oc2r.common.entity.Entities; +import li.cil.oc2r.common.item.Items; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; diff --git a/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java b/src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java similarity index 95% rename from src/main/java/li/cil/oc2/data/ModItemTagsProvider.java rename to src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java index 63ad5fdf..df9f8881 100644 --- a/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.tags.BlockTags; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.tags.BlockTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import java.util.concurrent.CompletableFuture; -import static li.cil.oc2.common.tags.ItemTags.*; +import static li.cil.oc2r.common.tags.ItemTags.*; public final class ModItemTagsProvider extends ItemTagsProvider { public ModItemTagsProvider( diff --git a/src/main/java/li/cil/oc2/data/ModLootTableProvider.java b/src/main/java/li/cil/oc2r/data/ModLootTableProvider.java similarity index 96% rename from src/main/java/li/cil/oc2/data/ModLootTableProvider.java rename to src/main/java/li/cil/oc2r/data/ModLootTableProvider.java index fae0c9e5..540fbc86 100644 --- a/src/main/java/li/cil/oc2/data/ModLootTableProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModLootTableProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; -import li.cil.oc2.common.block.Blocks; +import li.cil.oc2r.common.block.Blocks; import net.minecraft.data.PackOutput; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; @@ -24,7 +24,7 @@ import java.util.Set; import java.util.stream.Collectors; import static java.util.Collections.singletonList; -import static li.cil.oc2.common.Constants.*; +import static li.cil.oc2r.common.Constants.*; public final class ModLootTableProvider extends LootTableProvider { public ModLootTableProvider(final PackOutput output, final Set additionalTables, final List subProviders) { diff --git a/src/main/java/li/cil/oc2/data/ModRecipesProvider.java b/src/main/java/li/cil/oc2r/data/ModRecipesProvider.java similarity index 99% rename from src/main/java/li/cil/oc2/data/ModRecipesProvider.java rename to src/main/java/li/cil/oc2r/data/ModRecipesProvider.java index 52aa4cd5..9c950c66 100644 --- a/src/main/java/li/cil/oc2/data/ModRecipesProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModRecipesProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; -import li.cil.oc2.common.item.Items; +import li.cil.oc2r.common.item.Items; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; diff --git a/src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java b/src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java similarity index 98% rename from src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java rename to src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java index ae052221..e87b0b39 100644 --- a/src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java +++ b/src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.data; +package li.cil.oc2r.data; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import li.cil.oc2.common.item.Items; -import li.cil.oc2.common.item.crafting.RecipeSerializers; +import li.cil.oc2r.common.item.Items; +import li.cil.oc2r.common.item.crafting.RecipeSerializers; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementRewards; import net.minecraft.advancements.CriterionTriggerInstance; diff --git a/src/main/java/li/cil/oc2/data/package-info.java b/src/main/java/li/cil/oc2r/data/package-info.java similarity index 88% rename from src/main/java/li/cil/oc2/data/package-info.java rename to src/main/java/li/cil/oc2r/data/package-info.java index 0e56eff2..4a321d19 100644 --- a/src/main/java/li/cil/oc2/data/package-info.java +++ b/src/main/java/li/cil/oc2r/data/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.data; +package li.cil.oc2r.data; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MConst.java b/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MConst.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MConst.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MConst.java index 95761cf5..aacab085 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MConst.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MConst.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.common.biari; +package li.cil.oc2r.jcodec.codecs.common.biari; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MDecoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MDecoder.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MDecoder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MDecoder.java index 72001509..13b5a740 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MDecoder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MDecoder.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.common.biari; +package li.cil.oc2r.jcodec.codecs.common.biari; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Const.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Const.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Const.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Const.java index 7827ad95..d06b2e3f 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Const.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Const.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264; +package li.cil.oc2r.jcodec.codecs.h264; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.common.io.VLC; -import li.cil.oc2.jcodec.common.io.VLCBuilder; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.common.io.VLC; +import li.cil.oc2r.jcodec.common.io.VLCBuilder; +import li.cil.oc2r.jcodec.common.model.Picture; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Decoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Decoder.java similarity index 94% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Decoder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Decoder.java index 0c45c158..060093ad 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Decoder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Decoder.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264; +package li.cil.oc2r.jcodec.codecs.h264; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList2D; -import li.cil.oc2.jcodec.codecs.h264.decode.DeblockerInput; -import li.cil.oc2.jcodec.codecs.h264.decode.FrameReader; -import li.cil.oc2.jcodec.codecs.h264.decode.SliceDecoder; -import li.cil.oc2.jcodec.codecs.h264.decode.SliceReader; -import li.cil.oc2.jcodec.codecs.h264.decode.deblock.DeblockingFilter; -import li.cil.oc2.jcodec.codecs.h264.io.model.*; -import li.cil.oc2.jcodec.common.IntObjectMap; -import li.cil.oc2.jcodec.common.VideoDecoder; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList2D; +import li.cil.oc2r.jcodec.codecs.h264.decode.DeblockerInput; +import li.cil.oc2r.jcodec.codecs.h264.decode.FrameReader; +import li.cil.oc2r.jcodec.codecs.h264.decode.SliceDecoder; +import li.cil.oc2r.jcodec.codecs.h264.decode.SliceReader; +import li.cil.oc2r.jcodec.codecs.h264.decode.deblock.DeblockingFilter; +import li.cil.oc2r.jcodec.codecs.h264.io.model.*; +import li.cil.oc2r.jcodec.common.IntObjectMap; +import li.cil.oc2r.jcodec.common.VideoDecoder; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Encoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Encoder.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Encoder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Encoder.java index ed96d6b8..9d46efa2 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Encoder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Encoder.java @@ -1,24 +1,24 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264; +package li.cil.oc2r.jcodec.codecs.h264; -import li.cil.oc2.jcodec.codecs.h264.encode.*; -import li.cil.oc2.jcodec.codecs.h264.io.CAVLC; -import li.cil.oc2.jcodec.codecs.h264.io.model.*; -import li.cil.oc2.jcodec.codecs.h264.io.write.CAVLCWriter; -import li.cil.oc2.jcodec.codecs.h264.io.write.SliceHeaderWriter; -import li.cil.oc2.jcodec.common.VideoEncoder; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.model.Size; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.encode.*; +import li.cil.oc2r.jcodec.codecs.h264.io.CAVLC; +import li.cil.oc2r.jcodec.codecs.h264.io.model.*; +import li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter; +import li.cil.oc2r.jcodec.codecs.h264.io.write.SliceHeaderWriter; +import li.cil.oc2r.jcodec.common.VideoEncoder; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.model.Size; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import java.nio.ByteBuffer; import java.util.LinkedList; import java.util.List; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.escapeNAL; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.escapeNAL; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Utils.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Utils.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Utils.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Utils.java index 7adef5ad..e532467b 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Utils.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Utils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264; +package li.cil.oc2r.jcodec.codecs.h264; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/POCManager.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/POCManager.java similarity index 89% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/POCManager.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/POCManager.java index 7af4e12f..e55afe7c 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/POCManager.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/POCManager.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264; +package li.cil.oc2r.jcodec.codecs.h264; -import li.cil.oc2.jcodec.codecs.h264.io.model.NALUnit; -import li.cil.oc2.jcodec.codecs.h264.io.model.RefPicMarking.InstrType; -import li.cil.oc2.jcodec.codecs.h264.io.model.RefPicMarking.Instruction; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.codecs.h264.io.model.NALUnit; +import li.cil.oc2r.jcodec.codecs.h264.io.model.RefPicMarking.InstrType; +import li.cil.oc2r.jcodec.codecs.h264.io.model.RefPicMarking.Instruction; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; -import static li.cil.oc2.jcodec.codecs.h264.io.model.NALUnitType.IDR_SLICE; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.NALUnitType.IDR_SLICE; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/BlockInterpolator.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/BlockInterpolator.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/BlockInterpolator.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/BlockInterpolator.java index 2bc99059..2c8c8688 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/BlockInterpolator.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/BlockInterpolator.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import static java.lang.System.arraycopy; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CABACContst.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CABACContst.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CABACContst.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CABACContst.java index a1682e06..134f7eed 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CABACContst.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CABACContst.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CAVLCReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CAVLCReader.java similarity index 91% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CAVLCReader.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CAVLCReader.java index 63e389e7..e4f3597b 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CAVLCReader.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CAVLCReader.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Utils; -import li.cil.oc2.jcodec.common.io.BitReader; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils; +import li.cil.oc2r.jcodec.common.io.BitReader; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java index f0c572e3..3bc75bff 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.tools.MathUtil; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.CHROMA_BLOCK_LUT; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.CHROMA_POS_LUT; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.CHROMA_BLOCK_LUT; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.CHROMA_POS_LUT; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CoeffTransformer.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CoeffTransformer.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CoeffTransformer.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CoeffTransformer.java index 9e8cbeb7..c6bdce5d 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CoeffTransformer.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CoeffTransformer.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.common.ArrayUtil; +import li.cil.oc2r.jcodec.common.ArrayUtil; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DeblockerInput.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DeblockerInput.java similarity index 74% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DeblockerInput.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DeblockerInput.java index f8671b01..dac26caf 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DeblockerInput.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DeblockerInput.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Utils; -import li.cil.oc2.jcodec.codecs.h264.io.model.Frame; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils; +import li.cil.oc2r.jcodec.codecs.h264.io.model.Frame; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; -import static li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet.getPicHeightInMbs; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet.getPicHeightInMbs; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DecoderState.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DecoderState.java similarity index 86% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DecoderState.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DecoderState.java index eb349a1d..8c0b4675 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DecoderState.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DecoderState.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Utils; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.model.ColorSpace; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/FrameReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/FrameReader.java similarity index 77% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/FrameReader.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/FrameReader.java index 86a83906..13979d05 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/FrameReader.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/FrameReader.java @@ -1,25 +1,25 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.common.biari.MDecoder; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.MapManager; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.CABAC; -import li.cil.oc2.jcodec.codecs.h264.io.CAVLC; -import li.cil.oc2.jcodec.codecs.h264.io.model.NALUnit; -import li.cil.oc2.jcodec.codecs.h264.io.model.PictureParameterSet; -import li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.IntObjectMap; -import li.cil.oc2.jcodec.common.io.BitReader; +import li.cil.oc2r.jcodec.codecs.common.biari.MDecoder; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.MapManager; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.CABAC; +import li.cil.oc2r.jcodec.codecs.h264.io.CAVLC; +import li.cil.oc2r.jcodec.codecs.h264.io.model.NALUnit; +import li.cil.oc2r.jcodec.codecs.h264.io.model.PictureParameterSet; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.IntObjectMap; +import li.cil.oc2r.jcodec.common.io.BitReader; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.unescapeNAL; -import static li.cil.oc2.jcodec.codecs.h264.io.model.NALUnitType.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.unescapeNAL; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.NALUnitType.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java index 338b904b..cefe0e4e 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.common.ArrayUtil; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.ArrayUtil; +import li.cil.oc2r.jcodec.common.tools.MathUtil; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.LUMA_4x4_BLOCK_LUT; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.LUMA_4x4_POS_LUT; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.LUMA_4x4_BLOCK_LUT; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.LUMA_4x4_POS_LUT; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java index 17bfdb0f..c60e1119 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.tools.MathUtil; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java index dca8cfc2..f4a238dc 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import static com.google.common.base.Preconditions.checkState; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlock.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlock.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlock.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlock.java index fd18a290..ef9e76e3 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlock.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlock.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred; -import li.cil.oc2.jcodec.codecs.h264.H264Utils; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.common.model.ColorSpace; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java index fd5bf56d..ca0cae3a 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.model.Frame; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.model.Frame; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.*; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; /** * A decoder for B direct macroblocks diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBase.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBase.java similarity index 93% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBase.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBase.java index 21ce8261..fbcdea16 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBase.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBase.java @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList; -import li.cil.oc2.jcodec.codecs.h264.io.model.Frame; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList; +import li.cil.oc2r.jcodec.codecs.h264.io.model.Frame; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java similarity index 65% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java index 4754532b..0f69883a 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.common.model.Picture; -import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.collectPredictors; -import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.saveVectIntra; +import static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.collectPredictors; +import static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.saveVectIntra; /** * A decoder for Intra PCM macroblocks diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter.java index adcd4026..dfe5e119 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter.java @@ -1,19 +1,19 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.model.Frame; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.model.Frame; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.*; -import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; -import static li.cil.oc2.jcodec.codecs.h264.decode.PredictionMerger.mergePrediction; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; +import static li.cil.oc2r.jcodec.codecs.h264.decode.PredictionMerger.mergePrediction; /** * A decoder for Inter 16x16, 16x8 and 8x16 macroblocks diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java index 8d6e68e3..12035233 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.model.Frame; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceType; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.model.Frame; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType; +import li.cil.oc2r.jcodec.common.model.Picture; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.Direct; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.L0; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.Direct; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.L0; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; /** * A decoder for Inter 16x16, 16x8 and 8x16 macroblocks diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java similarity index 88% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java index 5640b858..dcfe4bc1 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.model.Picture; -import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; +import static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; /** * A decoder for I16x16 macroblocks diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java similarity index 92% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java index 7626bb76..4c580fbd 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.model.Picture; /** * A decoder for I16x16 macroblocks diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderUtils.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderUtils.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderUtils.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderUtils.java index c7c1ff90..417d598d 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderUtils.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderUtils.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import static java.lang.System.arraycopy; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; public final class MBlockDecoderUtils { public static final int NULL_VECTOR = packMv(0, 0, -1); diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockSkipDecoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockSkipDecoder.java similarity index 82% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockSkipDecoder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockSkipDecoder.java index 27e67331..e10b04ae 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockSkipDecoder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockSkipDecoder.java @@ -1,22 +1,22 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.model.Frame; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceType; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.model.Frame; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType; +import li.cil.oc2r.jcodec.common.model.Picture; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.L0; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.identityMapping4; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.packMv; -import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; -import static li.cil.oc2.jcodec.codecs.h264.io.model.SliceType.P; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.L0; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.identityMapping4; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.packMv; +import static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType.P; /** * A decoder for P skip macroblocks diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/PredictionMerger.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/PredictionMerger.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/PredictionMerger.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/PredictionMerger.java index eaf56c9c..2000825a 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/PredictionMerger.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/PredictionMerger.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred; -import li.cil.oc2.jcodec.codecs.h264.io.model.*; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred; +import li.cil.oc2r.jcodec.codecs.h264.io.model.*; +import li.cil.oc2r.jcodec.common.tools.MathUtil; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/RefListManager.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/RefListManager.java similarity index 92% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/RefListManager.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/RefListManager.java index 0eff1230..d153deb1 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/RefListManager.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/RefListManager.java @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.io.model.Frame; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceType; -import li.cil.oc2.jcodec.common.IntObjectMap; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.io.model.Frame; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType; +import li.cil.oc2r.jcodec.common.IntObjectMap; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import java.util.Arrays; import java.util.Comparator; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceDecoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceDecoder.java similarity index 93% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceDecoder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceDecoder.java index aa03b692..ff598054 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceDecoder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceDecoder.java @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.MapManager; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.model.*; -import li.cil.oc2.jcodec.common.IntObjectMap; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.MapManager; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.model.*; +import li.cil.oc2r.jcodec.common.IntObjectMap; +import li.cil.oc2r.jcodec.common.model.Picture; import static java.lang.System.arraycopy; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.L0; -import static li.cil.oc2.jcodec.codecs.h264.io.model.MBType.*; -import static li.cil.oc2.jcodec.codecs.h264.io.model.SliceType.P; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.L0; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.MBType.*; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType.P; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceHeaderReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceHeaderReader.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceHeaderReader.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceHeaderReader.java index dd389a89..e65d682f 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceHeaderReader.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceHeaderReader.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.h264.io.model.*; -import li.cil.oc2.jcodec.codecs.h264.io.model.RefPicMarking.InstrType; -import li.cil.oc2.jcodec.codecs.h264.io.model.RefPicMarking.Instruction; -import li.cil.oc2.jcodec.common.IntArrayList; -import li.cil.oc2.jcodec.common.io.BitReader; -import li.cil.oc2.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.codecs.h264.io.model.*; +import li.cil.oc2r.jcodec.codecs.h264.io.model.RefPicMarking.InstrType; +import li.cil.oc2r.jcodec.codecs.h264.io.model.RefPicMarking.Instruction; +import li.cil.oc2r.jcodec.common.IntArrayList; +import li.cil.oc2r.jcodec.common.io.BitReader; +import li.cil.oc2r.jcodec.common.model.ColorSpace; import java.util.ArrayList; -import static li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet.getPicHeightInMbs; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet.getPicHeightInMbs; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceReader.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceReader.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceReader.java index ab29cac3..c0977783 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceReader.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceReader.java @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode; +package li.cil.oc2r.jcodec.codecs.h264.decode; -import li.cil.oc2.jcodec.codecs.common.biari.MDecoder; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2.jcodec.codecs.h264.io.CABAC; -import li.cil.oc2.jcodec.codecs.h264.io.CABAC.BlockType; -import li.cil.oc2.jcodec.codecs.h264.io.CAVLC; -import li.cil.oc2.jcodec.codecs.h264.io.model.*; -import li.cil.oc2.jcodec.common.io.BitReader; -import li.cil.oc2.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.codecs.common.biari.MDecoder; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2r.jcodec.codecs.h264.io.CABAC; +import li.cil.oc2r.jcodec.codecs.h264.io.CABAC.BlockType; +import li.cil.oc2r.jcodec.codecs.h264.io.CAVLC; +import li.cil.oc2r.jcodec.codecs.h264.io.model.*; +import li.cil.oc2r.jcodec.common.io.BitReader; +import li.cil.oc2r.jcodec.common.model.ColorSpace; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.Direct; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.PartPred.L0; -import static li.cil.oc2.jcodec.codecs.h264.io.model.MBType.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.Direct; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.L0; +import static li.cil.oc2r.jcodec.codecs.h264.io.model.MBType.*; /** * Contains methods for reading high-level symbols out of H.264 bitstream diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java index 9a796423..0ebb0921 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode.aso; +package li.cil.oc2r.jcodec.codecs.h264.decode.aso; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java similarity index 89% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java index cdc5e395..ba2f55c7 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode.aso; +package li.cil.oc2r.jcodec.codecs.h264.decode.aso; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MapManager.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MapManager.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MapManager.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MapManager.java index f49738e2..6e0bb2e6 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MapManager.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MapManager.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode.aso; +package li.cil.oc2r.jcodec.codecs.h264.decode.aso; -import li.cil.oc2.jcodec.codecs.h264.io.model.PictureParameterSet; -import li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.codecs.h264.io.model.PictureParameterSet; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/Mapper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/Mapper.java similarity index 90% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/Mapper.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/Mapper.java index d32165dd..66c7f856 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/Mapper.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/Mapper.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode.aso; +package li.cil.oc2r.jcodec.codecs.h264.decode.aso; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java index 7dcac178..b849bd78 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode.aso; +package li.cil.oc2r.jcodec.codecs.h264.decode.aso; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java index 516c3049..ce01ac43 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode.aso; +package li.cil.oc2r.jcodec.codecs.h264.decode.aso; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java index ed5c66df..ed31d638 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.decode.deblock; +package li.cil.oc2r.jcodec.codecs.h264.decode.deblock; -import li.cil.oc2.jcodec.codecs.h264.decode.DeblockerInput; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceHeader; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.decode.DeblockerInput; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceHeader; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import static java.lang.Math.abs; -import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.*; -import static li.cil.oc2.jcodec.common.tools.MathUtil.clip; +import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2r.jcodec.common.tools.MathUtil.clip; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/CQPRateControl.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/CQPRateControl.java similarity index 90% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/CQPRateControl.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/CQPRateControl.java index 952aafac..1512ffec 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/CQPRateControl.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/CQPRateControl.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceType; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.model.Size; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.model.Size; +import li.cil.oc2r.jcodec.common.tools.MathUtil; /** * Constant QP with psyvisual adjustments diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodedMB.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodedMB.java similarity index 86% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodedMB.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodedMB.java index 73e31c1c..962f6991 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodedMB.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodedMB.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodingContext.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodingContext.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodingContext.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodingContext.java index 8aea05cf..95d2bc2d 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodingContext.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodingContext.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.io.CAVLC; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.CAVLC; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; import static java.lang.System.arraycopy; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/H264EncoderUtils.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/H264EncoderUtils.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/H264EncoderUtils.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/H264EncoderUtils.java index 4fea10ea..781130ce 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/H264EncoderUtils.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/H264EncoderUtils.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/IntraPredEstimator.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/IntraPredEstimator.java similarity index 91% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/IntraPredEstimator.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/IntraPredEstimator.java index 2ee1eb13..45075166 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/IntraPredEstimator.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/IntraPredEstimator.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.decode.ChromaPredictionBuilder; -import li.cil.oc2.jcodec.codecs.h264.decode.CoeffTransformer; -import li.cil.oc2.jcodec.codecs.h264.decode.Intra16x16PredictionBuilder; -import li.cil.oc2.jcodec.codecs.h264.decode.Intra4x4PredictionBuilder; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.decode.ChromaPredictionBuilder; +import li.cil.oc2r.jcodec.codecs.h264.decode.CoeffTransformer; +import li.cil.oc2r.jcodec.codecs.h264.decode.Intra16x16PredictionBuilder; +import li.cil.oc2r.jcodec.codecs.h264.decode.Intra4x4PredictionBuilder; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.BLK_DISP_MAP; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.BLK_DISP_MAP; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBDeblocker.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBDeblocker.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBDeblocker.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBDeblocker.java index e51c7bd3..1ac9cf82 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBDeblocker.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBDeblocker.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.decode.deblock.DeblockingFilter; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.decode.deblock.DeblockingFilter; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import static java.lang.Math.abs; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.QP_SCALE_CR; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.QP_SCALE_CR; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBEncoderHelper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBEncoderHelper.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBEncoderHelper.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBEncoderHelper.java index 0736d9bd..7c89af38 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBEncoderHelper.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBEncoderHelper.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterI16x16.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterI16x16.java similarity index 93% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterI16x16.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterI16x16.java index 510a25f3..a87caa5b 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterI16x16.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterI16x16.java @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Encoder.NonRdVector; -import li.cil.oc2.jcodec.codecs.h264.decode.ChromaPredictionBuilder; -import li.cil.oc2.jcodec.codecs.h264.decode.CoeffTransformer; -import li.cil.oc2.jcodec.codecs.h264.decode.Intra16x16PredictionBuilder; -import li.cil.oc2.jcodec.codecs.h264.io.CAVLC; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.codecs.h264.io.write.CAVLCWriter; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Encoder.NonRdVector; +import li.cil.oc2r.jcodec.codecs.h264.decode.ChromaPredictionBuilder; +import li.cil.oc2r.jcodec.codecs.h264.decode.CoeffTransformer; +import li.cil.oc2r.jcodec.codecs.h264.decode.Intra16x16PredictionBuilder; +import li.cil.oc2r.jcodec.codecs.h264.io.CAVLC; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterINxN.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterINxN.java similarity index 91% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterINxN.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterINxN.java index edc20896..87166146 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterINxN.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterINxN.java @@ -1,19 +1,19 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Encoder.NonRdVector; -import li.cil.oc2.jcodec.codecs.h264.decode.CoeffTransformer; -import li.cil.oc2.jcodec.codecs.h264.decode.Intra4x4PredictionBuilder; -import li.cil.oc2.jcodec.codecs.h264.io.CAVLC; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.codecs.h264.io.write.CAVLCWriter; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Encoder.NonRdVector; +import li.cil.oc2r.jcodec.codecs.h264.decode.CoeffTransformer; +import li.cil.oc2r.jcodec.codecs.h264.decode.Intra4x4PredictionBuilder; +import li.cil.oc2r.jcodec.codecs.h264.io.CAVLC; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.BLK_DISP_MAP; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.BLK_DISP_MAP; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterP16x16.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterP16x16.java similarity index 91% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterP16x16.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterP16x16.java index 53da9b89..2ac8b24f 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterP16x16.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterP16x16.java @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Encoder.NonRdVector; -import li.cil.oc2.jcodec.codecs.h264.decode.BlockInterpolator; -import li.cil.oc2.jcodec.codecs.h264.decode.CoeffTransformer; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet; -import li.cil.oc2.jcodec.codecs.h264.io.write.CAVLCWriter; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Encoder.NonRdVector; +import li.cil.oc2r.jcodec.codecs.h264.decode.BlockInterpolator; +import li.cil.oc2r.jcodec.codecs.h264.decode.CoeffTransformer; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet; +import li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.model.Picture; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.MB_DISP_OFF_LEFT; -import static li.cil.oc2.jcodec.codecs.h264.H264Const.MB_DISP_OFF_TOP; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.MB_DISP_OFF_LEFT; +import static li.cil.oc2r.jcodec.codecs.h264.H264Const.MB_DISP_OFF_TOP; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MotionEstimator.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MotionEstimator.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MotionEstimator.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MotionEstimator.java index 02b6fef6..b9d84dd9 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MotionEstimator.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MotionEstimator.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; import static java.lang.Math.min; -import static li.cil.oc2.jcodec.codecs.h264.encode.H264EncoderUtils.median; +import static li.cil.oc2r.jcodec.codecs.h264.encode.H264EncoderUtils.median; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/RateControl.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/RateControl.java similarity index 70% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/RateControl.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/RateControl.java index 0fffd182..591d9935 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/RateControl.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/RateControl.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.encode; +package li.cil.oc2r.jcodec.codecs.h264.encode; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceType; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.model.Size; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.model.Size; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CABAC.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CABAC.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CABAC.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CABAC.java index 66c2ffb2..a03254f8 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CABAC.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CABAC.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io; +package li.cil.oc2r.jcodec.codecs.h264.io; -import li.cil.oc2.jcodec.codecs.common.biari.MDecoder; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.H264Utils; -import li.cil.oc2.jcodec.codecs.h264.decode.CABACContst; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.codecs.h264.io.model.SliceType; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.common.biari.MDecoder; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils; +import li.cil.oc2r.jcodec.codecs.h264.decode.CABACContst; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SliceType; +import li.cil.oc2r.jcodec.common.tools.MathUtil; -import static li.cil.oc2.jcodec.codecs.h264.io.CABAC.BlockType.*; +import static li.cil.oc2r.jcodec.codecs.h264.io.CABAC.BlockType.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CAVLC.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CAVLC.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CAVLC.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CAVLC.java index 62381f03..02084536 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CAVLC.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CAVLC.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io; +package li.cil.oc2r.jcodec.codecs.h264.io; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.decode.CAVLCReader; -import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; -import li.cil.oc2.jcodec.codecs.h264.io.model.SeqParameterSet; -import li.cil.oc2.jcodec.common.io.BitReader; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.io.VLC; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.decode.CAVLCReader; +import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet; +import li.cil.oc2r.jcodec.common.io.BitReader; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.io.VLC; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.tools.MathUtil; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/AspectRatio.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/AspectRatio.java similarity index 92% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/AspectRatio.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/AspectRatio.java index f3ec6080..e76f5ad7 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/AspectRatio.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/AspectRatio.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/Frame.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/Frame.java similarity index 92% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/Frame.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/Frame.java index 590aa2d8..7d2ad0be 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/Frame.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/Frame.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; -import li.cil.oc2.jcodec.codecs.h264.H264Utils.MvList2D; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.codecs.h264.H264Utils.MvList2D; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; import java.util.Comparator; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/HRDParameters.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/HRDParameters.java similarity index 94% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/HRDParameters.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/HRDParameters.java index 33ef6145..1f1d3408 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/HRDParameters.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/HRDParameters.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/MBType.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/MBType.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/MBType.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/MBType.java index ff741aae..a76ed76a 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/MBType.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/MBType.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnit.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnit.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnit.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnit.java index 0c169c4a..257936cb 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnit.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnit.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnitType.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnitType.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnitType.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnitType.java index 4a32a143..d7a99f3d 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnitType.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnitType.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PictureParameterSet.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PictureParameterSet.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PictureParameterSet.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PictureParameterSet.java index 2d0e026d..202fa381 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PictureParameterSet.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PictureParameterSet.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; -import li.cil.oc2.jcodec.codecs.h264.decode.CAVLCReader; -import li.cil.oc2.jcodec.common.io.BitReader; -import li.cil.oc2.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.codecs.h264.decode.CAVLCReader; +import li.cil.oc2r.jcodec.common.io.BitReader; +import li.cil.oc2r.jcodec.common.io.BitWriter; import java.nio.ByteBuffer; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.io.write.CAVLCWriter.*; +import static li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PredictionWeightTable.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PredictionWeightTable.java similarity index 93% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PredictionWeightTable.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PredictionWeightTable.java index 9bda9784..bae5b4e0 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PredictionWeightTable.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PredictionWeightTable.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarking.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarking.java similarity index 91% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarking.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarking.java index b4e65aef..8582d850 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarking.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarking.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java similarity index 87% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java index 8bfc8d18..86abe051 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SeqParameterSet.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SeqParameterSet.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SeqParameterSet.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SeqParameterSet.java index 25f1cda3..69b255ab 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SeqParameterSet.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SeqParameterSet.java @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; -import li.cil.oc2.jcodec.codecs.h264.H264Const; -import li.cil.oc2.jcodec.codecs.h264.decode.CAVLCReader; -import li.cil.oc2.jcodec.common.io.BitReader; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.codecs.h264.H264Const; +import li.cil.oc2r.jcodec.codecs.h264.decode.CAVLCReader; +import li.cil.oc2r.jcodec.common.io.BitReader; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.model.ColorSpace; import java.nio.ByteBuffer; import java.util.Arrays; -import static li.cil.oc2.jcodec.codecs.h264.io.write.CAVLCWriter.*; +import static li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter.*; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceHeader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceHeader.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceHeader.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceHeader.java index 79600dd1..15a67702 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceHeader.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceHeader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceType.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceType.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceType.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceType.java index 9aa610d7..d98793dc 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceType.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceType.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/VUIParameters.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/VUIParameters.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/VUIParameters.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/VUIParameters.java index 48ff42c0..8297ae6a 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/VUIParameters.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/VUIParameters.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.model; +package li.cil.oc2r.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/CAVLCWriter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/CAVLCWriter.java similarity index 92% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/CAVLCWriter.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/CAVLCWriter.java index a070988b..8f0d2e90 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/CAVLCWriter.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/CAVLCWriter.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.write; +package li.cil.oc2r.jcodec.codecs.h264.io.write; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.tools.MathUtil; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/SliceHeaderWriter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/SliceHeaderWriter.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/SliceHeaderWriter.java rename to src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/SliceHeaderWriter.java index 60b71fee..e04bb3d4 100644 --- a/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/SliceHeaderWriter.java +++ b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/SliceHeaderWriter.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.codecs.h264.io.write; +package li.cil.oc2r.jcodec.codecs.h264.io.write; -import li.cil.oc2.jcodec.codecs.h264.io.model.*; -import li.cil.oc2.jcodec.common.io.BitWriter; -import li.cil.oc2.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.codecs.h264.io.model.*; +import li.cil.oc2r.jcodec.common.io.BitWriter; +import li.cil.oc2r.jcodec.common.model.ColorSpace; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/common/ArrayUtil.java b/src/main/java/li/cil/oc2r/jcodec/common/ArrayUtil.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/common/ArrayUtil.java rename to src/main/java/li/cil/oc2r/jcodec/common/ArrayUtil.java index 799135dc..3d98f57b 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/ArrayUtil.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/ArrayUtil.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common; +package li.cil.oc2r.jcodec.common; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/common/IntArrayList.java b/src/main/java/li/cil/oc2r/jcodec/common/IntArrayList.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/common/IntArrayList.java rename to src/main/java/li/cil/oc2r/jcodec/common/IntArrayList.java index 9e9aeb4e..ff91c9d2 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/IntArrayList.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/IntArrayList.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common; +package li.cil.oc2r.jcodec.common; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2/jcodec/common/IntObjectMap.java b/src/main/java/li/cil/oc2r/jcodec/common/IntObjectMap.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/common/IntObjectMap.java rename to src/main/java/li/cil/oc2r/jcodec/common/IntObjectMap.java index 574e1962..437c0ef6 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/IntObjectMap.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/IntObjectMap.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common; +package li.cil.oc2r.jcodec.common; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2/jcodec/common/VideoDecoder.java b/src/main/java/li/cil/oc2r/jcodec/common/VideoDecoder.java similarity index 86% rename from src/main/java/li/cil/oc2/jcodec/common/VideoDecoder.java rename to src/main/java/li/cil/oc2r/jcodec/common/VideoDecoder.java index d7c1870c..f48b9a8d 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/VideoDecoder.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/VideoDecoder.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common; +package li.cil.oc2r.jcodec.common; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.model.Picture; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/jcodec/common/VideoEncoder.java b/src/main/java/li/cil/oc2r/jcodec/common/VideoEncoder.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/common/VideoEncoder.java rename to src/main/java/li/cil/oc2r/jcodec/common/VideoEncoder.java index 40476b2e..30184b18 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/VideoEncoder.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/VideoEncoder.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common; +package li.cil.oc2r.jcodec.common; -import li.cil.oc2.jcodec.common.model.ColorSpace; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.model.ColorSpace; +import li.cil.oc2r.jcodec.common.model.Picture; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/jcodec/common/io/BitReader.java b/src/main/java/li/cil/oc2r/jcodec/common/io/BitReader.java similarity index 99% rename from src/main/java/li/cil/oc2/jcodec/common/io/BitReader.java rename to src/main/java/li/cil/oc2r/jcodec/common/io/BitReader.java index bf579b1c..94c4b4b0 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/io/BitReader.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/io/BitReader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.io; +package li.cil.oc2r.jcodec.common.io; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/jcodec/common/io/BitWriter.java b/src/main/java/li/cil/oc2r/jcodec/common/io/BitWriter.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/common/io/BitWriter.java rename to src/main/java/li/cil/oc2r/jcodec/common/io/BitWriter.java index 3da21507..6046ef33 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/io/BitWriter.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/io/BitWriter.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.io; +package li.cil.oc2r.jcodec.common.io; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2/jcodec/common/io/VLC.java b/src/main/java/li/cil/oc2r/jcodec/common/io/VLC.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/common/io/VLC.java rename to src/main/java/li/cil/oc2r/jcodec/common/io/VLC.java index e2f0ba49..066ef348 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/io/VLC.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/io/VLC.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.io; +package li.cil.oc2r.jcodec.common.io; -import li.cil.oc2.jcodec.common.IntArrayList; +import li.cil.oc2r.jcodec.common.IntArrayList; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/common/io/VLCBuilder.java b/src/main/java/li/cil/oc2r/jcodec/common/io/VLCBuilder.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/common/io/VLCBuilder.java rename to src/main/java/li/cil/oc2r/jcodec/common/io/VLCBuilder.java index d98a684f..3fffd07b 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/io/VLCBuilder.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/io/VLCBuilder.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.io; +package li.cil.oc2r.jcodec.common.io; import it.unimi.dsi.fastutil.ints.Int2IntArrayMap; -import li.cil.oc2.jcodec.common.IntArrayList; +import li.cil.oc2r.jcodec.common.IntArrayList; /** diff --git a/src/main/java/li/cil/oc2/jcodec/common/model/ColorSpace.java b/src/main/java/li/cil/oc2r/jcodec/common/model/ColorSpace.java similarity index 97% rename from src/main/java/li/cil/oc2/jcodec/common/model/ColorSpace.java rename to src/main/java/li/cil/oc2r/jcodec/common/model/ColorSpace.java index 24b5e382..a2973cb1 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/model/ColorSpace.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/model/ColorSpace.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.model; +package li.cil.oc2r.jcodec.common.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/common/model/Picture.java b/src/main/java/li/cil/oc2r/jcodec/common/model/Picture.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/common/model/Picture.java rename to src/main/java/li/cil/oc2r/jcodec/common/model/Picture.java index ecf7278a..556a5968 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/model/Picture.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/model/Picture.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.model; +package li.cil.oc2r.jcodec.common.model; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2/jcodec/common/model/Size.java b/src/main/java/li/cil/oc2r/jcodec/common/model/Size.java similarity index 86% rename from src/main/java/li/cil/oc2/jcodec/common/model/Size.java rename to src/main/java/li/cil/oc2r/jcodec/common/model/Size.java index 54047e46..3d8319ed 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/model/Size.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/model/Size.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.model; +package li.cil.oc2r.jcodec.common.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/common/tools/MathUtil.java b/src/main/java/li/cil/oc2r/jcodec/common/tools/MathUtil.java similarity index 98% rename from src/main/java/li/cil/oc2/jcodec/common/tools/MathUtil.java rename to src/main/java/li/cil/oc2r/jcodec/common/tools/MathUtil.java index a3f274a7..a99d296d 100644 --- a/src/main/java/li/cil/oc2/jcodec/common/tools/MathUtil.java +++ b/src/main/java/li/cil/oc2r/jcodec/common/tools/MathUtil.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.common.tools; +package li.cil.oc2r.jcodec.common.tools; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/scale/RgbToYuv420j.java b/src/main/java/li/cil/oc2r/jcodec/scale/RgbToYuv420j.java similarity index 95% rename from src/main/java/li/cil/oc2/jcodec/scale/RgbToYuv420j.java rename to src/main/java/li/cil/oc2r/jcodec/scale/RgbToYuv420j.java index 921445e9..00512822 100644 --- a/src/main/java/li/cil/oc2/jcodec/scale/RgbToYuv420j.java +++ b/src/main/java/li/cil/oc2r/jcodec/scale/RgbToYuv420j.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.scale; +package li.cil.oc2r.jcodec.scale; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2/jcodec/scale/Transform.java b/src/main/java/li/cil/oc2r/jcodec/scale/Transform.java similarity index 78% rename from src/main/java/li/cil/oc2/jcodec/scale/Transform.java rename to src/main/java/li/cil/oc2r/jcodec/scale/Transform.java index 836a2bc0..4a0d7a2d 100644 --- a/src/main/java/li/cil/oc2/jcodec/scale/Transform.java +++ b/src/main/java/li/cil/oc2r/jcodec/scale/Transform.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.scale; +package li.cil.oc2r.jcodec.scale; -import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.model.Picture; /** * This class is part of JCodec ( www.jcodec.org ) diff --git a/src/main/java/li/cil/oc2/jcodec/scale/Yuv420jToRgb.java b/src/main/java/li/cil/oc2r/jcodec/scale/Yuv420jToRgb.java similarity index 96% rename from src/main/java/li/cil/oc2/jcodec/scale/Yuv420jToRgb.java rename to src/main/java/li/cil/oc2r/jcodec/scale/Yuv420jToRgb.java index a1ca7951..852199f5 100644 --- a/src/main/java/li/cil/oc2/jcodec/scale/Yuv420jToRgb.java +++ b/src/main/java/li/cil/oc2r/jcodec/scale/Yuv420jToRgb.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: BSD 2-Clause "Simplified" License */ -package li.cil.oc2.jcodec.scale; +package li.cil.oc2r.jcodec.scale; -import li.cil.oc2.jcodec.common.model.Picture; -import li.cil.oc2.jcodec.common.tools.MathUtil; +import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2r.jcodec.common.tools.MathUtil; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 9c313062..f7fa70e8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,38 +1,38 @@ modLoader = "javafml" -loaderVersion = "[40,)" -issueTrackerURL = "https://github.com/fnuecke/oc2/issues" +loaderVersion = "[47,)" +issueTrackerURL = "https://github.com/fnuecke/oc2r/issues" license = "MIT" [[mods]] -modId = "oc2" +modId = "oc2r" version = "${file.jarVersion}" -displayName = "OpenComputers II" -authors = "Sangar" +displayName = "OpenComputers II: Reimagined" +authors = "North Western Development (Originally by Sangar)" description = ''' Modern computers for the modern player. This mod uses the Terminus Font under the Open Font License. The full license can be found in the JAR of this mod. ''' -[[dependencies.oc2]] +[[dependencies.oc2r]] modId = "forge" mandatory = true versionRange = "[40.1.68,)" ordering = "NONE" side = "BOTH" -[[dependencies.oc2]] +[[dependencies.oc2r]] modId = "minecraft" mandatory = true -versionRange = "1.19.2" +versionRange = "1.20.1" ordering = "NONE" side = "BOTH" -[[dependencies.oc2]] +[[dependencies.oc2r]] modId = "sedna" mandatory = true versionRange = "[1.0.14,)" ordering = "NONE" side = "BOTH" -[[dependencies.oc2]] +[[dependencies.oc2r]] modId = "markdown_manual" mandatory = true versionRange = "[1.2.1,)" diff --git a/src/main/resources/assets/oc2/blockstates/computer.json b/src/main/resources/assets/oc2/blockstates/computer.json deleted file mode 100644 index fd7fe371..00000000 --- a/src/main/resources/assets/oc2/blockstates/computer.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=north": { - "model": "oc2:block/computer" - }, - "facing=south": { - "model": "oc2:block/computer", - "y": 180 - }, - "facing=west": { - "model": "oc2:block/computer", - "y": 270 - }, - "facing=east": { - "model": "oc2:block/computer", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/blockstates/creative_energy.json b/src/main/resources/assets/oc2/blockstates/creative_energy.json deleted file mode 100644 index da5d1f97..00000000 --- a/src/main/resources/assets/oc2/blockstates/creative_energy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "oc2:block/creative_energy" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/blockstates/flash_memory_flasher.json b/src/main/resources/assets/oc2/blockstates/flash_memory_flasher.json deleted file mode 100644 index be0a273c..00000000 --- a/src/main/resources/assets/oc2/blockstates/flash_memory_flasher.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=north": { - "model": "oc2:block/flash_memory_flasher" - }, - "facing=south": { - "model": "oc2:block/flash_memory_flasher", - "y": 180 - }, - "facing=west": { - "model": "oc2:block/flash_memory_flasher", - "y": 270 - }, - "facing=east": { - "model": "oc2:block/flash_memory_flasher", - "y": 90 - } - } -} diff --git a/src/main/resources/assets/oc2/blockstates/redstone_interface.json b/src/main/resources/assets/oc2/blockstates/redstone_interface.json deleted file mode 100644 index 021f72da..00000000 --- a/src/main/resources/assets/oc2/blockstates/redstone_interface.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=north": { - "model": "oc2:block/redstone_interface" - }, - "facing=south": { - "model": "oc2:block/redstone_interface", - "y": 180 - }, - "facing=west": { - "model": "oc2:block/redstone_interface", - "y": 270 - }, - "facing=east": { - "model": "oc2:block/redstone_interface", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/lang/en_us.json b/src/main/resources/assets/oc2/lang/en_us.json deleted file mode 100644 index 152acaad..00000000 --- a/src/main/resources/assets/oc2/lang/en_us.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "item_group.oc2.common": "OpenComputers II", - - "block.oc2.computer": "Computer", - "block.oc2.computer.desc": "Runs software from Flash Memory and Hard Disks.", - "block.oc2.computer.preconfigured": "Preconfigured Computer", - "block.oc2.monitor": "Monitor", - "block.oc2.monitor.desc": "A special framebuffer based monitor for your computer.", - "block.oc2.bus_cable": "Bus Cable", - "block.oc2.bus_cable.desc": "Connects Bus Interfaces.", - "block.oc2.network_connector": "Network Connector", - "block.oc2.network_connector.desc": "Transmits network packets via Network Cables.", - "block.oc2.network_hub": "Network Hub", - "block.oc2.network_hub.desc": "Distributes network packets among all attached Network Connectors.", - "block.oc2.redstone_interface": "Redstone Interface", - "block.oc2.redstone_interface.desc": "Emits and reads redstone signals.", - "block.oc2.disk_drive": "Disk Drive", - "block.oc2.disk_drive.desc": "Used to access Floppy Disks.", - "block.oc2.flash_memory_flasher": "Flash Memory Flasher", - "block.oc2.flash_memory_flasher.desc": "Used to flash a new firmware onto a flash memory chip.", - "block.oc2.charger": "Charger", - "block.oc2.charger.desc": "Charges entities and items in containers on top of it.", - "block.oc2.creative_energy": "Infinite Energy Cube", - "block.oc2.creative_energy.desc": "Provides unlimited energy to adjacent blocks. Intended for testing.", - "block.oc2.projector": "Projector", - "block.oc2.projector.desc": "Projects images onto surfaces in front of it.", - "block.oc2.keyboard": "Keyboard", - "block.oc2.keyboard.desc": "Allows keyboard input when using a projector.", - - "item.oc2.wrench": "Scrench", - "item.oc2.wrench.desc": "Configures devices and dismantles them (while sneaking).", - "item.oc2.manual": "The Computerist's Handbook", - "item.oc2.manual.desc": "Holds information on all things needed when working with Computers.", - "item.oc2.bus_interface": "Bus Interface", - "item.oc2.bus_interface.desc": "Connects external devices to Computers.", - "item.oc2.cpu_tier_1": "CPU Tier 1", - "item.oc2.cpu_tier_1.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_2": "CPU Tier 2", - "item.oc2.cpu_tier_2.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_3": "CPU Tier 3", - "item.oc2.cpu_tier_3.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_4": "CPU Tier 4", - "item.oc2.cpu_tier_4.desc": "Processes computer instructions.", - "item.oc2.network_cable": "Network Cable", - "item.oc2.network_cable.desc": "Connects Network Connectors.", - "item.oc2.memory": "Memory", - "item.oc2.memory.desc": "Random Access Memory (RAM) used in Computers and Robots.", - "item.oc2.hard_drive": "Hard Drive", - "item.oc2.hard_drive.desc": "Mass storage for operating systems and data.", - "item.oc2.floppy": "Floppy Disk", - "item.oc2.floppy.desc": "Portable storage used to transfer data between Computers.", - "item.oc2.floppy_modern": "Modern Floppy Disk", - "item.oc2.floppy_modern.desc": "Newer version of portable storage used to transfer data between Computers.", - "item.oc2.flash_memory": "Flash Memory", - "item.oc2.flash_memory.desc": "Readonly storage for firmware.", - "item.oc2.redstone_interface_card": "Redstone Interface Card", - "item.oc2.redstone_interface_card.desc": "Emits and reads redstone signals through the Computer.", - "item.oc2.network_interface_card": "Network Interface Card", - "item.oc2.network_interface_card.desc": "Sends and receives network packets via attached Network Connectors.", - "item.oc2.network_interface_card.is_configured": "Has connectivity configuration.", - "item.oc2.network_tunnel_card": "Network Tunnel Card", - "item.oc2.network_tunnel_card.desc": "Sends and receives network packets to a linked device.", - "item.oc2.file_import_export_card": "File Import/Export Card", - "item.oc2.file_import_export_card.desc": "Imports and exports files from and into your real file system.", - "item.oc2.robot": "Robot", - "item.oc2.robot.desc": "A mobile Computer. Use a Scrench to pick it back up.", - "item.oc2.inventory_operations_module": "Inventory Operations Module", - "item.oc2.inventory_operations_module.desc": "Moves items in, into and out of the Robot's inventory.", - "item.oc2.block_operations_module": "Block Operations Module", - "item.oc2.block_operations_module.desc": "Breaks and places blocks.", - "item.oc2.sound_card": "Sound Card", - "item.oc2.sound_card.desc": "Plays various sounds from its highly realistic sound bank.", - "item.oc2.network_tunnel_module": "Network Tunnel Module", - "item.oc2.network_tunnel_module.desc": "Sends and receives network packets to a linked device.", - - "item.oc2.transistor": "Transistor", - "item.oc2.transistor.desc": "Crafting material.", - "item.oc2.circuit_board": "Circuit Board", - "item.oc2.circuit_board.desc": "Crafting material.", - - "entity.oc2.robot": "Robot", - - "gui.oc2.computer.error.unknown": "Unknown Error", - "gui.oc2.computer.error.missing_firmware": "Missing Firmware", - "gui.oc2.computer.error.insufficient_memory": "Insufficient Memory", - "gui.oc2.computer.bus_state.incomplete": "Bus Incomplete", - "gui.oc2.computer.bus_state.too_complex": "Bus Too Complex", - "gui.oc2.computer.bus_state.multiple_controllers": "Multiple Bus Controllers", - "gui.oc2.computer.error.not_enough_energy": "Not Enough Energy", - "gui.oc2.computer.error.missing_cpu": "Missing CPU", - - "gui.oc2.computer.capture_input.capt": "Capture Input", - "gui.oc2.computer.capture_input.desc": "When enabled, as long as the mouse cursor is hovering the terminal contents, all input will be captured, including the escape key.", - "gui.oc2.computer.power.capt": "Toggle Power", - "gui.oc2.computer.power.desc": "Toggles the power state of the computer.", - - "gui.oc2.machine.open_inventory.capt": "Open Inventory", - "gui.oc2.machine.open_terminal.capt": "Open Terminal", - - "gui.oc2.device_type.memory": "Memory", - "gui.oc2.device_type.hard_drive": "Hard Drive", - "gui.oc2.device_type.flash_memory": "Flash Memory", - "gui.oc2.device_type.card": "Card", - - "gui.oc2.file_chooser.title.load": "Open file", - "gui.oc2.file_chooser.title.save": "Save file", - "gui.oc2.file_chooser.text_field.filename": "File name", - "gui.oc2.file_chooser.confirm_button.load": "Open", - "gui.oc2.file_chooser.confirm_button.save": "Save", - "gui.oc2.file_chooser.confirm_button.overwrite": "Overwrite", - "gui.oc2.file_chooser.cancel_button": "Cancel", - - "gui.oc2.network_interface_card.side_state": "Connectivity: %s", - "gui.oc2.network_interface_card.connectivity.enabled": "Enabled", - "gui.oc2.network_interface_card.connectivity.disabled": "Disabled", - "gui.oc2.network_interface_card.info": "Drag to rotate. Click faces to toggle connectivity.", - - "gui.oc2.keyboard.close_info": "Right click to close.", - - "gui.oc2.network_tunnel.link": "Link", - - "manual.oc2.home": "Home", - "manual.oc2.blocks": "Blocks", - "manual.oc2.items": "Items", - - "message.oc2.connector.error.full": "Cannot attach more cables.", - "message.oc2.connector.error.too_far": "Distance between connectors is too large.", - "message.oc2.connector.error.obstructed": "No clear line of sight between connectors.", - "message.oc2.import_file.file_too_large": "File is too large.", - "message.oc2.invalid_facade_block": "This block cannot be used as a facade.", - - "tooltip.oc2.device_needs_reboot": "Requires reboot", - "tooltip.oc2.flash_memory_missing": "A flash memory containing a firmware is required to boot.", - "tooltip.oc2.memory_missing": "Some memory is required to load the flash memory for execution to boot.", - "tooltip.oc2.hard_drive_missing": "Most systems will require a root file system to boot.", - "tooltip.oc2.cpu_missing": "A cpu is required to boot", - "tooltip.oc2.energy": "Energy: %s", - "tooltip.oc2.energyConsumption": "Energy Consumption: %s/t", - "tooltip.oc2.confirm": "Confirm", - "tooltip.oc2.cancel": "Cancel", - "tooltip.oc2.network_tunnel_id": "Tunnel: %s", - - "subtitles.oc2.computer": "Computer fans running", - "subtitles.oc2.floppy": "Floppy access", - "subtitles.oc2.floppy_eject": "Floppy ejected", - "subtitles.oc2.floppy_insert": "Floppy inserted", - "subtitles.oc2.hdd": "Hard drive access" -} diff --git a/src/main/resources/assets/oc2/lang/ru_ru.json b/src/main/resources/assets/oc2/lang/ru_ru.json deleted file mode 100644 index 1d548f07..00000000 --- a/src/main/resources/assets/oc2/lang/ru_ru.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "block.oc2.bus_cable": "Интерфейсный кабель", - "block.oc2.bus_cable.desc": "Соединяет интерфейсные шины.", - "block.oc2.charger": "Зарядное устройство", - "block.oc2.charger.desc": "Заряжает сущности и предметы в контейнерах над ним.", - "block.oc2.computer": "Компьютер", - "block.oc2.computer.desc": "Выполняет программы из карт памяти и жестких дисков.", - "block.oc2.computer.preconfigured": "Собранный компьютер", - "block.oc2.creative_energy": "Энергокуб бесконечности", - "block.oc2.creative_energy.desc": "Подает бесконечную энергию на соседние блоки. Применять только в тестовых целях.", - "block.oc2.disk_drive": "Дисковод", - "block.oc2.disk_drive.desc": "Нужен для работы с дискетами.", - "block.oc2.flash_memory_flasher": "Флэш-память", - "block.oc2.flash_memory_flasher.desc": "Используется для прошивки новой прошивки на чип флэш-памяти.", - "block.oc2.keyboard": "Клавиатура", - "block.oc2.keyboard.desc": "Позволяет вводить текст при использовании проектора.", - "block.oc2.monitor": "Monitor", - "block.oc2.monitor.desc": "A special framebuffer based monitor for your computer.", - "block.oc2.network_connector": "Сетевой разъем", - "block.oc2.network_connector.desc": "Передает пакеты через сетевые кабели.", - "block.oc2.network_hub": "Сетевой концентратор", - "block.oc2.network_hub.desc": "Передает пакеты на все подключенные к нему сетевые разъемы.", - "block.oc2.projector": "Проектор", - "block.oc2.projector.desc": "Проецирует изображения на поверхности перед ним.", - "block.oc2.redstone_interface": "Красный интерфейс", - "block.oc2.redstone_interface.desc": "Подает и считывает редстоун сигналы.", - "entity.oc2.robot": "Робот", - "gui.oc2.computer.bus_state.incomplete": "Шина не заполнена", - "gui.oc2.computer.bus_state.multiple_controllers": "Много контроллеров шины", - "gui.oc2.computer.bus_state.too_complex": "Слишком много устройств", - "gui.oc2.computer.capture_input.capt": "Захват ввода", - "gui.oc2.computer.capture_input.desc": "Пока курсор находится в пределах окна терминала, ввод (включая нажатие на ESC) будет захватываться.", - "gui.oc2.computer.error.insufficient_memory": "Недостаточно памяти", - "gui.oc2.computer.error.missing_cpu": "Отсутствует процессор", - "gui.oc2.computer.error.missing_firmware": "Отсутствует прошивка", - "gui.oc2.computer.error.not_enough_energy": "Недостаточно энергии", - "gui.oc2.computer.error.unknown": "Неизвестная ошибка", - "gui.oc2.computer.power.capt": "Кнопка питания", - "gui.oc2.computer.power.desc": "Включает или выключает компьютер.", - "gui.oc2.device_type.card": "Карта", - "gui.oc2.device_type.flash_memory": "Карта памяти", - "gui.oc2.device_type.hard_drive": "Жесткий диск", - "gui.oc2.device_type.memory": "Память", - "gui.oc2.file_chooser.cancel_button": "Отмена", - "gui.oc2.file_chooser.confirm_button.load": "Открыть", - "gui.oc2.file_chooser.confirm_button.overwrite": "Перезаписать", - "gui.oc2.file_chooser.confirm_button.save": "Сохранить", - "gui.oc2.file_chooser.text_field.filename": "Имя файла", - "gui.oc2.file_chooser.title.load": "Открыть файл", - "gui.oc2.file_chooser.title.save": "Сохранить файл", - "gui.oc2.keyboard.close_info": "Для закрытия нажмите ПКМ.", - "gui.oc2.machine.open_inventory.capt": "Открыть инвентарь", - "gui.oc2.machine.open_terminal.capt": "Открыть терминал", - "gui.oc2.network_interface_card.connectivity.disabled": "Выключено", - "gui.oc2.network_interface_card.connectivity.enabled": "Включено", - "gui.oc2.network_interface_card.info": "Потяните для поворота. Клик на сторону переключит соединение.", - "gui.oc2.network_interface_card.side_state": "Соединение: %s", - "gui.oc2.network_tunnel.link": "Привязать", - "item.oc2.block_operations_module": "Модуль управления блоками", - "item.oc2.block_operations_module.desc": "Ломает и ставит блоки.", - "item.oc2.bus_interface": "Интерфейсная шина", - "item.oc2.bus_interface.desc": "Соединяет внешние устройства с компьютерами.", - "item.oc2.circuit_board": "Печатная плата", - "item.oc2.circuit_board.desc": "Материал для крафта.", - "item.oc2.cpu_tier_1": "CPU Tier 1", - "item.oc2.cpu_tier_1.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_2": "CPU Tier 2", - "item.oc2.cpu_tier_2.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_3": "CPU Tier 3", - "item.oc2.cpu_tier_3.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_4": "CPU Tier 4", - "item.oc2.cpu_tier_4.desc": "Processes computer instructions.", - "item.oc2.file_import_export_card": "Карта импорта/экспорта файлов", - "item.oc2.file_import_export_card.desc": "Импортирует и экспортирует файлы между вашим реальным компьютером.", - "item.oc2.flash_memory": "Карта памяти", - "item.oc2.flash_memory.desc": "Накопитель для прошивки.", - "item.oc2.floppy": "Дискета", - "item.oc2.floppy.desc": "Съемный накопитель для переноса данных между компьютерами.", - "item.oc2.floppy_modern": "Современная дискета", - "item.oc2.floppy_modern.desc": "Новая версия портативного хранилища, используемого для передачи данных между компьютерами.", - "item.oc2.hard_drive": "Жесткий диск", - "item.oc2.hard_drive.desc": "Накопитель для операционных систем и данных.", - "item.oc2.inventory_operations_module": "Модуль управления инвентарем", - "item.oc2.inventory_operations_module.desc": "Позволяет роботу управлять своим инвентарем.", - "item.oc2.manual": "Справочник компьютерщика", - "item.oc2.manual.desc": "Содержит информацию о всем, что нужно для работы с компьютерами.", - "item.oc2.memory": "Память", - "item.oc2.memory.desc": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах.", - "item.oc2.network_cable": "Сетевой кабель", - "item.oc2.network_cable.desc": "Соединяет сетевые разъемы.", - "item.oc2.network_interface_card": "Сетевая интерфейсная карта", - "item.oc2.network_interface_card.desc": "Отсылает и принимает пакеты через сетевой разъем.", - "item.oc2.network_interface_card.is_configured": "Установлены настройки соединения.", - "item.oc2.network_tunnel_card": "Сетевая туннельная карта", - "item.oc2.network_tunnel_card.desc": "Отсылает и принимает пакеты с привязанного устройства.", - "item.oc2.network_tunnel_module": "Сетевой туннельный модуль", - "item.oc2.network_tunnel_module.desc": "Отсылает и принимает пакеты с привязанного устройства.", - "item.oc2.redstone_interface_card": "Красная интерфейсная карта", - "item.oc2.redstone_interface_card.desc": "Подает и считывает редстоун сигналы от блока компьютера.", - "item.oc2.robot": "Робот", - "item.oc2.robot.desc": "Портативный компьютер. Используйте ключ, чтобы убрать его", - "item.oc2.sound_card": "Звуковая карта", - "item.oc2.sound_card.desc": "Проигрывает разные звуки из своих высококачественных звуковых банков.", - "item.oc2.transistor": "Транзистор", - "item.oc2.transistor.desc": "Материал для крафта.", - "item.oc2.wrench": "Ключ", - "item.oc2.wrench.desc": "Конфигурирует и демонтирует (если присесть) устройства.", - "item_group.oc2.common": "OpenComputers II", - "manual.oc2.blocks": "Блоки", - "manual.oc2.home": "Главная страница", - "manual.oc2.items": "Предметы", - "message.oc2.connector.error.full": "Подключено слишком много кабелей.", - "message.oc2.connector.error.obstructed": "Между разъемами присутствует преграда.", - "message.oc2.connector.error.too_far": "Дистанция между разъемами слишком велика.", - "message.oc2.import_file.file_too_large": "Файл слишком большой.", - "message.oc2.invalid_facade_block": "Этот блок нельзя использовать как фасад.", - "subtitles.oc2.computer": "Запуск вентиляторов", - "subtitles.oc2.floppy": "Жужжание дисковода", - "subtitles.oc2.floppy_eject": "Дискета извлечена", - "subtitles.oc2.floppy_insert": "Дискета вставлена", - "subtitles.oc2.hdd": "Шум жесткого диска", - "tooltip.oc2.cancel": "Отмена", - "tooltip.oc2.confirm": "Подтвердить", - "tooltip.oc2.cpu_missing": "Для загрузки требуется процессор", - "tooltip.oc2.device_needs_reboot": "Требуется перезагрузка", - "tooltip.oc2.energy": "Энергия: %s", - "tooltip.oc2.energyConsumption": "Потребление энергии: %s/t", - "tooltip.oc2.flash_memory_missing": "Карта памяти содержит прошивку, необходимую для загрузки.", - "tooltip.oc2.hard_drive_missing": "Большинству ОС для загрузки необходима файловая система.", - "tooltip.oc2.memory_missing": "Оперативная память требуется для загрузки прошивки из карты памяти и последующей работы.", - "tooltip.oc2.network_tunnel_id": "Туннель: %s" -} diff --git a/src/main/resources/assets/oc2/lang/zh_cn.json b/src/main/resources/assets/oc2/lang/zh_cn.json deleted file mode 100644 index e7151a50..00000000 --- a/src/main/resources/assets/oc2/lang/zh_cn.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "block.oc2.bus_cable": "总线线缆", - "block.oc2.bus_cable.desc": "与总线接口结合使用，以将外部设备连接到电脑。", - "block.oc2.charger": "充电器", - "block.oc2.charger.desc": "通过站在上面给实体和物品充电。", - "block.oc2.computer": "电脑", - "block.oc2.computer.desc": "使用螺丝刀扳手或者兼容的扳手来添加或移除组件。", - "block.oc2.computer.preconfigured": "电脑（已经配置好的）", - "block.oc2.creative_energy": "无限能量方块", - "block.oc2.creative_energy.desc": "提供无限的能量给连接的方块。", - "block.oc2.disk_drive": "磁盘驱动器", - "block.oc2.disk_drive.desc": "使用这个来访问软盘。", - "block.oc2.flash_memory_flasher": "闪存闪存器", - "block.oc2.flash_memory_flasher.desc": "用于将新固件刷新到闪存芯片上。", - "block.oc2.keyboard": "Keyboard", - "block.oc2.keyboard.desc": "Allows keyboard input when using a projector.", - "block.oc2.monitor": "Monitor", - "block.oc2.monitor.desc": "A special framebuffer based monitor for your computer.", - "block.oc2.network_connector": "网络连接口", - "block.oc2.network_connector.desc": "Transmits network packets via Network Cables.", - "block.oc2.network_hub": "网线集线器", - "block.oc2.network_hub.desc": "Distributes network packets among all attached Network Connectors.", - "block.oc2.projector": "Projector", - "block.oc2.projector.desc": "Projects images onto surfaces in front of it.", - "block.oc2.redstone_interface": "红石接口", - "block.oc2.redstone_interface.desc": "Emits and reads redstone signals.", - "entity.oc2.robot": "机器人", - "gui.oc2.computer.bus_state.incomplete": "总线不完整", - "gui.oc2.computer.bus_state.multiple_controllers": "检测到多个总线控制器", - "gui.oc2.computer.bus_state.too_complex": "总线太复杂", - "gui.oc2.computer.capture_input.capt": "捕获输入", - "gui.oc2.computer.capture_input.desc": "当开启并且鼠标移动到终端内时，将捕获所有的输入，包括ESC键", - "gui.oc2.computer.error.insufficient_memory": "内存不足", - "gui.oc2.computer.error.missing_cpu": "缺少CPU", - "gui.oc2.computer.error.missing_firmware": "丢失固件", - "gui.oc2.computer.error.not_enough_energy": "能量不足", - "gui.oc2.computer.error.unknown": "未知错误", - "gui.oc2.computer.power.capt": "电源", - "gui.oc2.computer.power.desc": "开启或关闭这台电脑。", - "gui.oc2.device_type.card": "卡", - "gui.oc2.device_type.flash_memory": "固件", - "gui.oc2.device_type.hard_drive": "硬盘", - "gui.oc2.device_type.memory": "内存条", - "gui.oc2.file_chooser.cancel_button": "取消", - "gui.oc2.file_chooser.confirm_button.load": "打开", - "gui.oc2.file_chooser.confirm_button.overwrite": "覆盖", - "gui.oc2.file_chooser.confirm_button.save": "保存", - "gui.oc2.file_chooser.text_field.filename": "文件名称", - "gui.oc2.file_chooser.title.load": "打开文件", - "gui.oc2.file_chooser.title.save": "保存文件", - "gui.oc2.keyboard.close_info": "Right click to close.", - "gui.oc2.machine.open_inventory.capt": "打开物品栏", - "gui.oc2.machine.open_terminal.capt": "打开终端", - "gui.oc2.network_interface_card.connectivity.disabled": "Disabled", - "gui.oc2.network_interface_card.connectivity.enabled": "Enabled", - "gui.oc2.network_interface_card.info": "Drag to rotate. Click faces to toggle connectivity.", - "gui.oc2.network_interface_card.side_state": "Connectivity: %s", - "gui.oc2.network_tunnel.link": "Link", - "item.oc2.block_operations_module": "方块操作模块", - "item.oc2.block_operations_module.desc": "允许机器人放置/破坏方块。", - "item.oc2.bus_interface": "总线接口", - "item.oc2.bus_interface.desc": "通过总线线缆来和外部设备通讯。", - "item.oc2.circuit_board": "电路板", - "item.oc2.circuit_board.desc": "Crafting material.", - "item.oc2.cpu_tier_1": "CPU Tier 1", - "item.oc2.cpu_tier_1.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_2": "CPU Tier 2", - "item.oc2.cpu_tier_2.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_3": "CPU Tier 3", - "item.oc2.cpu_tier_3.desc": "Processes computer instructions.", - "item.oc2.cpu_tier_4": "CPU Tier 4", - "item.oc2.cpu_tier_4.desc": "Processes computer instructions.", - "item.oc2.file_import_export_card": "文件导入/导出卡", - "item.oc2.file_import_export_card.desc": "提供一个API来导入/导出文件。", - "item.oc2.flash_memory": "固件", - "item.oc2.flash_memory.desc": "Readonly storage for firmware.", - "item.oc2.floppy": "软盘", - "item.oc2.floppy.desc": "Portable storage used to transfer data between Computers.", - "item.oc2.floppy_modern": "现代软盘", - "item.oc2.floppy_modern.desc": "用于在计算机之间传输数据的较新版本的便携式存储。", - "item.oc2.hard_drive": "硬盘", - "item.oc2.hard_drive.desc": "Mass storage for operating systems and data.", - "item.oc2.inventory_operations_module": "物品栏操作模块", - "item.oc2.inventory_operations_module.desc": "允许机器人存取物品。", - "item.oc2.manual": "The Computerist's Handbook", - "item.oc2.manual.desc": "Holds information on all things needed when working with Computers.", - "item.oc2.memory": "内存条", - "item.oc2.memory.desc": "Random Access Memory (RAM) used in Computers and Robots.", - "item.oc2.network_cable": "网线", - "item.oc2.network_cable.desc": "Connects Network Connectors.", - "item.oc2.network_interface_card": "网卡", - "item.oc2.network_interface_card.desc": "Sends and receives network packets via attached Network Connectors.", - "item.oc2.network_interface_card.is_configured": "Has connectivity configuration.", - "item.oc2.network_tunnel_card": "Network Tunnel Card", - "item.oc2.network_tunnel_card.desc": "Sends and receives network packets to a linked device.", - "item.oc2.network_tunnel_module": "Network Tunnel Module", - "item.oc2.network_tunnel_module.desc": "Sends and receives network packets to a linked device.", - "item.oc2.redstone_interface_card": "红石卡", - "item.oc2.redstone_interface_card.desc": "Emits and reads redstone signals through the Computer.", - "item.oc2.robot": "机器人", - "item.oc2.robot.desc": "使用螺丝刀扳手或者兼容的扳手来添加或移除组件。", - "item.oc2.sound_card": "声卡", - "item.oc2.sound_card.desc": "可以从其高度逼真的音库播放各种声音。", - "item.oc2.transistor": "晶体管", - "item.oc2.transistor.desc": "Crafting material.", - "item.oc2.wrench": "螺丝刀扳手", - "item.oc2.wrench.desc": "当潜行时用于配置设备和拆卸设备。", - "item_group.oc2.common": "开放式电脑 II", - "manual.oc2.blocks": "方块", - "manual.oc2.home": "主页", - "manual.oc2.items": "物品", - "message.oc2.connector.error.full": "不能放置更多线缆。", - "message.oc2.connector.error.obstructed": "直线内有方块", - "message.oc2.connector.error.too_far": "距离太远了。", - "message.oc2.import_file.file_too_large": "文件过大", - "message.oc2.invalid_facade_block": "该方块不能被用作一个面。", - "subtitles.oc2.computer": "电脑:运行", - "subtitles.oc2.floppy": "软盘:访问", - "subtitles.oc2.floppy_eject": "软盘:弹出", - "subtitles.oc2.floppy_insert": "软盘:插入", - "subtitles.oc2.hdd": "硬盘:访问", - "tooltip.oc2.cancel": "取消", - "tooltip.oc2.confirm": "确认", - "tooltip.oc2.cpu_missing": "启动时需要CPU", - "tooltip.oc2.device_needs_reboot": "需要重启", - "tooltip.oc2.energy": "能量：%s", - "tooltip.oc2.energyConsumption": "能量使用：%s/t", - "tooltip.oc2.flash_memory_missing": "启动时需要包含固件的闪存。", - "tooltip.oc2.hard_drive_missing": "找不到硬盘。", - "tooltip.oc2.memory_missing": "需要一些内存来加载闪存以执行引导.", - "tooltip.oc2.network_tunnel_id": "Tunnel: %s" -} diff --git a/src/main/resources/assets/oc2/models/block/cable_base.json b/src/main/resources/assets/oc2/models/block/cable_base.json deleted file mode 100644 index 8f134ad0..00000000 --- a/src/main/resources/assets/oc2/models/block/cable_base.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","loader": "oc2:bus_cable","textures":{"atlas0":"oc2:block/cable_base/cable_base_atlas0","particle":"#atlas0"},"elements":[{"from":[6,5,6],"to":[10,6,10],"faces":{"east":{"texture":"atlas0","uv":[0.0,8.0,2.0,8.5]},"west":{"texture":"atlas0","uv":[0.0,8.5,2.0,9.0]},"down":{"texture":"atlas0","uv":[0.0,9.0,2.0,11.0]},"north":{"texture":"atlas0","uv":[0.0,11.0,2.0,11.5]},"south":{"texture":"atlas0","uv":[0.0,11.5,2.0,12.0]}}},{"from":[6,6,10],"to":[10,10,11],"faces":{"east":{"texture":"atlas0","uv":[3.0,0.0,3.5,2.0]},"west":{"texture":"atlas0","uv":[3.5,0.0,4.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,2.0,12.5]},"down":{"texture":"atlas0","uv":[0.0,12.5,2.0,13.0]},"south":{"texture":"atlas0","uv":[0.0,13.0,2.0,15.0]}}},{"from":[5,6,6],"to":[11,10,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,13.0,4.0,15.0]},"west":{"texture":"atlas0","uv":[4.0,13.0,6.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,3.0,2.0]},"down":{"texture":"atlas0","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas0","uv":[0.0,4.0,3.0,6.0]},"south":{"texture":"atlas0","uv":[0.0,6.0,3.0,8.0]}}},{"from":[6,6,5],"to":[10,10,6],"faces":{"east":{"texture":"atlas0","uv":[4.0,0.0,4.5,2.0]},"west":{"texture":"atlas0","uv":[4.5,0.0,5.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,15.0,2.0,15.5]},"down":{"texture":"atlas0","uv":[0.0,15.5,2.0,16.0]},"north":{"texture":"atlas0","uv":[6.0,13.0,8.0,15.0]}}},{"from":[6,10,6],"to":[10,11,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,15.5,4.0,16.0]},"west":{"texture":"atlas0","uv":[4.0,15.5,6.0,16.0]},"up":{"texture":"atlas0","uv":[8.0,13.0,10.0,15.0]},"north":{"texture":"atlas0","uv":[6.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,10.0,16.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/cable_link.json b/src/main/resources/assets/oc2/models/block/cable_link.json deleted file mode 100644 index 0deeaa70..00000000 --- a/src/main/resources/assets/oc2/models/block/cable_link.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/cable_link/cable_link_atlas0","particle":"#atlas0"},"elements":[{"from":[6,5,11],"to":[10,6,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,9.0,2.5,9.5]},"west":{"texture":"atlas0","uv":[0.0,9.5,2.5,10.0]},"down":{"texture":"atlas0","uv":[3.0,0.0,5.0,2.5]},"north":{"texture":"atlas0","uv":[0.0,15.0,2.0,15.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,15.5,2.0,16.0]}}},{"from":[5,6,11],"to":[11,10,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,10.0,2.5,12.0]},"west":{"texture":"atlas0","uv":[0.0,12.0,2.5,14.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,3.0,2.5]},"down":{"texture":"atlas0","uv":[0.0,2.5,3.0,5.0]},"north":{"texture":"atlas0","uv":[0.0,5.0,3.0,7.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,7.0,3.0,9.0]}}},{"from":[6,10,11],"to":[10,11,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,14.0,2.5,14.5]},"west":{"texture":"atlas0","uv":[0.0,14.5,2.5,15.0]},"up":{"texture":"atlas0","uv":[5.0,0.0,7.0,2.5]},"north":{"texture":"atlas0","uv":[2.0,15.5,4.0,16.0]},"south":{"texture":"atlas0","cullface":"south","uv":[4.0,15.5,6.0,16.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/cable_plug.json b/src/main/resources/assets/oc2/models/block/cable_plug.json deleted file mode 100644 index cb20075a..00000000 --- a/src/main/resources/assets/oc2/models/block/cable_plug.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/cable_plug/cable_plug_atlas0","particle":"#atlas0"},"elements":[{"from":[4,4,15],"to":[12,6,16],"faces":{"east":{"texture":"atlas0","uv":[4.0,1.0,4.5,2.0]},"west":{"texture":"atlas0","uv":[4.5,1.0,5.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,4.0,0.5]},"down":{"texture":"atlas0","uv":[0.0,0.5,4.0,1.0]},"north":{"texture":"atlas0","uv":[0.0,1.0,4.0,2.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,2.0,4.0,3.0]}}},{"from":[7,4,14],"to":[9,5,15],"faces":{"east":{"texture":"atlas0","uv":[14.0,14.0,14.5,14.5]},"west":{"texture":"atlas0","uv":[14.5,14.0,15.0,14.5]},"down":{"texture":"atlas0","uv":[15.0,15.5,16.0,16.0]},"north":{"texture":"atlas0","uv":[14.0,14.5,15.0,15.0]}}},{"from":[5,5,14],"to":[11,6,15],"faces":{"east":{"texture":"atlas0","uv":[15.0,14.0,15.5,14.5]},"west":{"texture":"atlas0","uv":[15.5,14.0,16.0,14.5]},"down":{"texture":"atlas0","uv":[0.0,9.0,3.0,9.5]},"north":{"texture":"atlas0","uv":[0.0,9.5,3.0,10.0]}}},{"from":[6,5,11],"to":[10,6,14],"faces":{"east":{"texture":"atlas0","uv":[8.0,14.5,9.5,15.0]},"west":{"texture":"atlas0","uv":[9.5,14.5,11.0,15.0]},"down":{"texture":"atlas0","uv":[3.0,13.0,5.0,14.5]},"north":{"texture":"atlas0","uv":[6.0,14.5,8.0,15.0]}}},{"from":[4,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas0","uv":[6.0,10.0,6.5,12.0]},"west":{"texture":"atlas0","uv":[6.5,10.0,7.0,12.0]},"up":{"texture":"atlas0","uv":[15.0,14.5,16.0,15.0]},"down":{"texture":"atlas0","uv":[7.0,14.0,8.0,14.5]},"north":{"texture":"atlas0","uv":[7.0,10.0,8.0,12.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,10.0,9.0,12.0]}}},{"from":[10,6,15],"to":[12,10,16],"faces":{"east":{"texture":"atlas0","uv":[9.0,10.0,9.5,12.0]},"west":{"texture":"atlas0","uv":[9.5,10.0,10.0,12.0]},"up":{"texture":"atlas0","uv":[8.0,14.0,9.0,14.5]},"down":{"texture":"atlas0","uv":[9.0,14.0,10.0,14.5]},"north":{"texture":"atlas0","uv":[10.0,10.0,11.0,12.0]},"south":{"texture":"atlas0","cullface":"south","uv":[11.0,10.0,12.0,12.0]}}},{"from":[5,6,11],"to":[11,7,15],"faces":{"east":{"texture":"atlas0","uv":[6.0,15.0,8.0,15.5]},"west":{"texture":"atlas0","uv":[8.0,15.0,10.0,15.5]},"down":{"texture":"atlas0","uv":[0.0,10.0,3.0,12.0]},"north":{"texture":"atlas0","uv":[0.0,12.0,3.0,12.5]},"south":{"texture":"atlas0","uv":[0.0,12.5,3.0,13.0]}}},{"from":[7,7,15],"to":[9,9,16],"faces":{"east":{"texture":"atlas0","uv":[5.0,1.0,5.5,2.0]},"west":{"texture":"atlas0","uv":[5.5,1.0,6.0,2.0]},"up":{"texture":"atlas0","uv":[10.0,14.0,11.0,14.5]},"down":{"texture":"atlas0","uv":[11.0,14.0,12.0,14.5]},"south":{"texture":"atlas0","cullface":"south","uv":[10.0,13.0,11.0,14.0]}}},{"from":[4,7,14],"to":[12,9,15],"faces":{"east":{"texture":"atlas0","uv":[6.0,1.0,6.5,2.0]},"west":{"texture":"atlas0","uv":[6.5,1.0,7.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,3.0,4.0,3.5]},"down":{"texture":"atlas0","uv":[0.0,3.5,4.0,4.0]},"north":{"texture":"atlas0","uv":[0.0,4.0,4.0,5.0]},"south":{"texture":"atlas0","uv":[0.0,5.0,4.0,6.0]}}},{"from":[5,7,11],"to":[11,9,14],"faces":{"east":{"texture":"atlas0","uv":[7.0,13.0,8.5,14.0]},"west":{"texture":"atlas0","uv":[8.5,13.0,10.0,14.0]},"up":{"texture":"atlas0","uv":[0.0,13.0,3.0,14.5]},"down":{"texture":"atlas0","uv":[0.0,14.5,3.0,16.0]},"north":{"texture":"atlas0","uv":[3.0,14.5,6.0,15.5]}}},{"from":[5,9,11],"to":[11,10,15],"faces":{"east":{"texture":"atlas0","uv":[10.0,15.0,12.0,15.5]},"west":{"texture":"atlas0","uv":[12.0,15.0,14.0,15.5]},"up":{"texture":"atlas0","uv":[3.0,10.0,6.0,12.0]},"north":{"texture":"atlas0","uv":[3.0,15.5,6.0,16.0]},"south":{"texture":"atlas0","uv":[6.0,15.5,9.0,16.0]}}},{"from":[4,10,15],"to":[12,12,16],"faces":{"east":{"texture":"atlas0","uv":[7.0,1.0,7.5,2.0]},"west":{"texture":"atlas0","uv":[7.5,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,6.0,4.0,6.5]},"down":{"texture":"atlas0","uv":[0.0,6.5,4.0,7.0]},"north":{"texture":"atlas0","uv":[0.0,7.0,4.0,8.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,8.0,4.0,9.0]}}},{"from":[5,10,14],"to":[11,11,15],"faces":{"east":{"texture":"atlas0","uv":[11.0,13.0,11.5,13.5]},"west":{"texture":"atlas0","uv":[11.0,13.5,11.5,14.0]},"up":{"texture":"atlas0","uv":[9.0,15.5,12.0,16.0]},"north":{"texture":"atlas0","uv":[12.0,15.5,15.0,16.0]}}},{"from":[6,10,11],"to":[10,11,14],"faces":{"east":{"texture":"atlas0","uv":[11.0,14.5,12.5,15.0]},"west":{"texture":"atlas0","uv":[12.5,14.5,14.0,15.0]},"up":{"texture":"atlas0","uv":[5.0,13.0,7.0,14.5]},"north":{"texture":"atlas0","uv":[14.0,15.0,16.0,15.5]}}},{"from":[7,11,14],"to":[9,12,15],"faces":{"east":{"texture":"atlas0","uv":[11.5,13.5,12.0,14.0]},"west":{"texture":"atlas0","uv":[12.0,13.5,12.5,14.0]},"up":{"texture":"atlas0","uv":[12.0,14.0,13.0,14.5]},"north":{"texture":"atlas0","uv":[13.0,14.0,14.0,14.5]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/cable_straight.json b/src/main/resources/assets/oc2/models/block/cable_straight.json deleted file mode 100644 index 060e8fe7..00000000 --- a/src/main/resources/assets/oc2/models/block/cable_straight.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/cable_straight/cable_straight_atlas0","particle":"#atlas0"},"elements":[{"from":[6,5,5],"to":[10,6,11],"faces":{"east":{"texture":"atlas0","uv":[0.0,0.0,3.0,0.5]},"west":{"texture":"atlas0","uv":[0.0,0.5,3.0,1.0]},"down":{"texture":"atlas0","uv":[0.0,1.0,2.0,4.0]},"north":{"texture":"atlas0","uv":[6.0,15.0,8.0,15.5]},"south":{"texture":"atlas0","uv":[6.0,15.5,8.0,16.0]}}},{"from":[5,6,5],"to":[11,10,11],"faces":{"east":{"texture":"atlas0","uv":[0.0,4.0,3.0,6.0]},"west":{"texture":"atlas0","uv":[0.0,6.0,3.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,8.0,3.0,11.0]},"down":{"texture":"atlas0","uv":[0.0,11.0,3.0,14.0]},"north":{"texture":"atlas0","uv":[0.0,14.0,3.0,16.0]},"south":{"texture":"atlas0","uv":[3.0,14.0,6.0,16.0]}}},{"from":[6,10,5],"to":[10,11,11],"faces":{"east":{"texture":"atlas0","uv":[6.0,14.0,9.0,14.5]},"west":{"texture":"atlas0","uv":[6.0,14.5,9.0,15.0]},"up":{"texture":"atlas0","uv":[2.0,1.0,4.0,4.0]},"north":{"texture":"atlas0","uv":[8.0,15.5,10.0,16.0]},"south":{"texture":"atlas0","uv":[10.0,15.5,12.0,16.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/cable_support.json b/src/main/resources/assets/oc2/models/block/cable_support.json deleted file mode 100644 index ae67378c..00000000 --- a/src/main/resources/assets/oc2/models/block/cable_support.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/cable_support/cable_support_atlas0","particle":"#atlas0"},"elements":[{"from":[7,7,11],"to":[9,9,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,0.0,2.5,1.0]},"west":{"texture":"atlas0","uv":[0.0,1.0,2.5,2.0]},"up":{"texture":"atlas0","uv":[0.0,2.0,1.0,4.5]},"down":{"texture":"atlas0","uv":[1.0,2.0,2.0,4.5]},"north":{"texture":"atlas0","uv":[0.0,4.5,1.0,5.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,5.5,1.0,6.5]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/charger.json b/src/main/resources/assets/oc2/models/block/charger.json deleted file mode 100644 index 84664a15..00000000 --- a/src/main/resources/assets/oc2/models/block/charger.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/charger/charger_atlas0","atlas1":"oc2:block/charger/charger_atlas1","atlas2":"oc2:block/charger/charger_atlas2","atlas3":"oc2:block/charger/charger_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,12,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,6.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,6.0,8.0,12.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","cullface":"down","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,6.0,16.0,12.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,6.0]}}},{"from":[0,12,15],"to":[3,13,16],"faces":{"east":{"texture":"atlas2","uv":[15.5,12.0,16.0,12.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,12.5,16.0,13.0]},"up":{"texture":"atlas2","uv":[14.0,7.5,15.5,8.0]},"down":{"texture":"atlas2","uv":[14.0,7.0,15.5,7.5]},"south":{"texture":"atlas2","cullface":"south","uv":[14.0,6.5,15.5,7.0]}}},{"from":[13,12,15],"to":[16,13,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.5,13.0,16.0,13.5]},"west":{"texture":"atlas2","uv":[15.5,13.5,16.0,14.0]},"up":{"texture":"atlas2","uv":[8.0,6.0,9.5,6.5]},"down":{"texture":"atlas2","uv":[9.5,6.0,11.0,6.5]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,6.0,12.5,6.5]}}},{"from":[0,12,13],"to":[16,13,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,10.5,16.0,11.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.0,10.0,16.0,10.5]},"up":{"texture":"atlas0","uv":[0.0,12.0,8.0,13.0]},"down":{"texture":"atlas0","uv":[0.0,13.0,8.0,14.0]},"north":{"texture":"atlas0","uv":[0.0,14.0,8.0,14.5]},"south":{"texture":"atlas0","uv":[0.0,14.5,8.0,15.0]}}},{"from":[1,12,3],"to":[15,13,13],"faces":{"east":{"texture":"atlas2","uv":[8.0,8.5,13.0,9.0]},"west":{"texture":"atlas2","uv":[8.0,9.0,13.0,9.5]},"up":{"texture":"atlas2","uv":[0.0,11.0,7.0,16.0]},"down":{"texture":"atlas2","uv":[7.0,11.0,14.0,16.0]},"north":{"texture":"atlas2","uv":[8.0,10.5,15.0,11.0]},"south":{"texture":"atlas2","uv":[8.0,10.0,15.0,10.5]}}},{"from":[0,12,1],"to":[16,13,3],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[11.0,4.5,12.0,5.0]},"west":{"texture":"atlas2","cullface":"west","uv":[12.0,4.5,13.0,5.0]},"up":{"texture":"atlas0","uv":[0.0,15.0,8.0,16.0]},"down":{"texture":"atlas0","uv":[8.0,15.0,16.0,16.0]},"north":{"texture":"atlas0","uv":[8.0,14.5,16.0,15.0]},"south":{"texture":"atlas0","uv":[8.0,14.0,16.0,14.5]}}},{"from":[0,12,0],"to":[3,13,1],"faces":{"east":{"texture":"atlas2","uv":[15.5,7.5,16.0,8.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,7.0,16.0,7.5]},"up":{"texture":"atlas2","uv":[12.5,6.0,14.0,6.5]},"down":{"texture":"atlas2","uv":[14.0,6.0,15.5,6.5]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,5.5,9.5,6.0]}}},{"from":[13,12,0],"to":[16,13,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.5,6.5,16.0,7.0]},"west":{"texture":"atlas2","uv":[15.5,6.0,16.0,6.5]},"up":{"texture":"atlas2","uv":[9.5,5.5,11.0,6.0]},"down":{"texture":"atlas2","uv":[11.0,5.5,12.5,6.0]},"north":{"texture":"atlas2","cullface":"north","uv":[12.5,5.5,14.0,6.0]}}},{"from":[0,13,0],"to":[16,15,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,13.0,16.0,14.0]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,12.0,16.0,13.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,16.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,8.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,0.0,8.0,1.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,1.0,8.0,2.0]}}},{"from":[0,15,13],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,5.5,15.5,6.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,4.5,9.5,5.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,2.0,8.0,3.5]},"north":{"texture":"atlas2","uv":[0.0,3.5,8.0,4.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,4.0,8.0,4.5]}}},{"from":[0,15,12],"to":[6,16,13],"faces":{"east":{"texture":"atlas2","uv":[15.5,5.5,16.0,6.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,5.0,16.0,5.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,9.5,11.0,10.0]},"north":{"texture":"atlas2","uv":[11.0,9.5,14.0,10.0]},"south":{"texture":"atlas2","uv":[13.0,9.0,16.0,9.5]}}},{"from":[10,15,12],"to":[16,16,13],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[13.0,4.0,13.5,4.5]},"west":{"texture":"atlas2","uv":[13.5,4.0,14.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[13.0,8.5,16.0,9.0]},"north":{"texture":"atlas2","uv":[8.0,8.0,11.0,8.5]},"south":{"texture":"atlas2","uv":[11.0,8.0,14.0,8.5]}}},{"from":[0,15,10],"to":[16,16,12],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[13.0,4.5,14.0,5.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,4.5,15.0,5.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,4.5,8.0,5.5]},"north":{"texture":"atlas2","uv":[0.0,5.5,8.0,6.0]},"south":{"texture":"atlas2","uv":[0.0,6.0,8.0,6.5]}}},{"from":[0,15,6],"to":[3,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,11.0,16.0,11.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,11.5,16.0,12.0]},"up":{"texture":"atlas2","cullface":"up","uv":[14.0,12.0,15.5,14.0]},"north":{"texture":"atlas2","uv":[8.0,5.0,9.5,5.5]},"south":{"texture":"atlas2","uv":[9.5,5.0,11.0,5.5]}}},{"from":[4,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,14.0,16.0,14.5]},"west":{"texture":"atlas2","uv":[14.0,14.5,16.0,15.0]},"up":{"texture":"atlas3","cullface":"up","uv":[0.0,0.0,1.0,2.0]},"north":{"texture":"atlas2","uv":[15.0,4.5,16.0,5.0]},"south":{"texture":"atlas2","uv":[8.0,4.0,9.0,4.5]}}},{"from":[10,15,6],"to":[12,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,15.0,16.0,15.5]},"west":{"texture":"atlas2","uv":[14.0,15.5,16.0,16.0]},"up":{"texture":"atlas3","cullface":"up","uv":[1.0,0.0,2.0,2.0]},"north":{"texture":"atlas2","uv":[9.0,4.0,10.0,4.5]},"south":{"texture":"atlas2","uv":[10.0,4.0,11.0,4.5]}}},{"from":[13,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,9.5,16.0,10.0]},"west":{"texture":"atlas2","uv":[14.0,8.0,16.0,8.5]},"up":{"texture":"atlas3","cullface":"up","uv":[2.0,0.0,3.5,2.0]},"north":{"texture":"atlas2","uv":[11.0,5.0,12.5,5.5]},"south":{"texture":"atlas2","uv":[12.5,5.0,14.0,5.5]}}},{"from":[0,15,4],"to":[16,16,6],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[11.0,4.0,12.0,4.5]},"west":{"texture":"atlas2","cullface":"west","uv":[12.0,4.0,13.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,6.5,8.0,7.5]},"north":{"texture":"atlas2","uv":[0.0,7.5,8.0,8.0]},"south":{"texture":"atlas2","uv":[0.0,8.0,8.0,8.5]}}},{"from":[0,15,3],"to":[6,16,4],"faces":{"east":{"texture":"atlas2","uv":[14.0,4.0,14.5,4.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,4.0,15.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,7.5,11.0,8.0]},"north":{"texture":"atlas2","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas2","uv":[8.0,6.5,11.0,7.0]}}},{"from":[10,15,3],"to":[16,16,4],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,4.0,15.5,4.5]},"west":{"texture":"atlas2","uv":[15.5,4.0,16.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,7.0,11.0,7.5]},"north":{"texture":"atlas2","uv":[11.0,7.0,14.0,7.5]},"south":{"texture":"atlas2","uv":[11.0,6.5,14.0,7.0]}}},{"from":[0,15,0],"to":[16,16,3],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,5.0,15.5,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[9.5,4.5,11.0,5.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,8.5,8.0,10.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,10.0,8.0,10.5]},"south":{"texture":"atlas2","uv":[0.0,10.5,8.0,11.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/computer.json b/src/main/resources/assets/oc2/models/block/computer.json deleted file mode 100644 index 73137ac0..00000000 --- a/src/main/resources/assets/oc2/models/block/computer.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/computer/computer_atlas0","atlas1":"oc2:block/computer/computer_atlas1","atlas2":"oc2:block/computer/computer_atlas2","atlas3":"oc2:block/computer/computer_atlas3","atlas4":"oc2:block/computer/computer_atlas4","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[12.0,9.0,15.0,9.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,8.0,11.0,8.5]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,0.0,8.0,3.0]},"north":{"texture":"atlas0","uv":[0.0,3.0,8.0,3.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,3.5,8.0,4.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas0","uv":[14.0,8.5,16.0,9.0]},"west":{"texture":"atlas0","cullface":"west","uv":[14.0,8.0,16.0,8.5]},"down":{"texture":"atlas4","cullface":"down","uv":[8.0,7.5,11.0,9.5]},"north":{"texture":"atlas0","uv":[8.0,8.5,11.0,9.0]},"south":{"texture":"atlas0","uv":[11.0,8.5,14.0,9.0]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas0","uv":[14.0,7.0,16.0,7.5]},"down":{"texture":"atlas4","cullface":"down","uv":[8.0,9.5,11.0,11.5]},"north":{"texture":"atlas0","uv":[11.0,8.0,14.0,8.5]},"south":{"texture":"atlas0","uv":[8.0,7.5,11.0,8.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[11.0,7.5,14.0,8.0]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,7.0,11.0,7.5]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,8.0,7.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,7.0,8.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,8.0,8.0]}}},{"from":[0,1,0],"to":[16,3,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,8.0,8.0,9.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,9.0,8.0,10.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,10.0,8.0,11.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,11.0,8.0,12.0]}}},{"from":[0,3,1],"to":[16,4,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,11.0,15.5,11.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,11.5,15.5,12.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,15.5]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,7.5]},"north":{"texture":"atlas0","uv":[0.0,12.0,8.0,12.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,12.5,8.0,13.0]}}},{"from":[0,3,0],"to":[4,4,1],"faces":{"east":{"texture":"atlas0","uv":[15.5,11.5,16.0,12.0]},"west":{"texture":"atlas0","cullface":"west","uv":[15.5,11.0,16.0,11.5]},"up":{"texture":"atlas0","uv":[14.0,6.5,16.0,7.0]},"down":{"texture":"atlas0","uv":[14.0,3.5,16.0,4.0]},"north":{"texture":"atlas0","cullface":"north","uv":[14.0,3.0,16.0,3.5]}}},{"from":[6,3,0],"to":[7,4,1],"faces":{"east":{"texture":"atlas0","uv":[15.5,10.5,16.0,11.0]},"west":{"texture":"atlas0","uv":[15.5,10.0,16.0,10.5]},"up":{"texture":"atlas2","uv":[15.0,15.0,15.5,15.5]},"down":{"texture":"atlas2","uv":[15.5,15.0,16.0,15.5]},"north":{"texture":"atlas2","cullface":"north","uv":[11.5,6.5,12.0,7.0]}}},{"from":[8,3,0],"to":[16,4,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[11.5,7.0,12.0,7.5]},"west":{"texture":"atlas2","uv":[11.5,7.5,12.0,8.0]},"up":{"texture":"atlas0","uv":[8.0,9.0,12.0,9.5]},"down":{"texture":"atlas0","uv":[8.0,9.5,12.0,10.0]},"north":{"texture":"atlas0","cullface":"north","uv":[12.0,9.5,16.0,10.0]}}},{"from":[0,4,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,13.0,8.0,14.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,14.0,8.0,15.0]},"up":{"texture":"atlas2","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas2","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,15.0,8.0,16.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,15.0,16.0,16.0]}}},{"from":[0,6,15],"to":[6,9,16],"faces":{"east":{"texture":"atlas2","uv":[8.0,6.5,8.5,8.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.5,6.5,9.0,8.0]},"up":{"texture":"atlas0","uv":[11.0,7.0,14.0,7.5]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,14.5,11.0,16.0]}}},{"from":[10,6,15],"to":[16,9,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[9.0,6.5,9.5,8.0]},"west":{"texture":"atlas2","uv":[9.5,6.5,10.0,8.0]},"up":{"texture":"atlas0","uv":[8.0,6.5,11.0,7.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,14.5,14.0,16.0]}}},{"from":[0,6,10],"to":[16,10,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[11.0,9.5,13.5,11.5]},"west":{"texture":"atlas4","cullface":"west","uv":[13.5,9.5,16.0,11.5]},"up":{"texture":"atlas0","uv":[8.0,4.0,16.0,6.5]},"down":{"texture":"atlas0","uv":[8.0,0.0,16.0,2.5]},"north":{"texture":"atlas2","uv":[8.0,8.0,16.0,10.0]},"south":{"texture":"atlas2","uv":[8.0,10.0,16.0,12.0]}}},{"from":[1,6,6],"to":[15,10,10],"faces":{"east":{"texture":"atlas3","uv":[14.0,14.0,16.0,16.0]},"west":{"texture":"atlas4","uv":[14.0,11.5,16.0,13.5]},"up":{"texture":"atlas3","uv":[0.0,14.0,7.0,16.0]},"down":{"texture":"atlas3","uv":[7.0,14.0,14.0,16.0]},"north":{"texture":"atlas3","uv":[8.0,9.0,15.0,11.0]},"south":{"texture":"atlas3","uv":[8.0,7.0,15.0,9.0]}}},{"from":[0,6,1],"to":[16,10,6],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[11.0,7.5,13.5,9.5]},"west":{"texture":"atlas4","cullface":"west","uv":[13.5,7.5,16.0,9.5]},"up":{"texture":"atlas2","uv":[8.0,12.0,16.0,14.5]},"down":{"texture":"atlas2","uv":[8.0,0.0,16.0,2.5]},"north":{"texture":"atlas2","uv":[8.0,2.5,16.0,4.5]},"south":{"texture":"atlas2","uv":[8.0,4.5,16.0,6.5]}}},{"from":[0,6,0],"to":[1,15,1],"faces":{"east":{"texture":"atlas4","uv":[8.0,0.0,8.5,4.5]},"west":{"texture":"atlas4","cullface":"west","uv":[8.5,0.0,9.0,4.5]},"up":{"texture":"atlas2","uv":[12.0,7.5,12.5,8.0]},"down":{"texture":"atlas2","uv":[12.5,7.5,13.0,8.0]},"north":{"texture":"atlas4","cullface":"north","uv":[9.0,0.0,9.5,4.5]}}},{"from":[15,6,0],"to":[16,15,1],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[9.5,0.0,10.0,4.5]},"west":{"texture":"atlas4","uv":[10.0,0.0,10.5,4.5]},"up":{"texture":"atlas2","uv":[13.0,7.5,13.5,8.0]},"down":{"texture":"atlas2","uv":[13.5,7.5,14.0,8.0]},"north":{"texture":"atlas4","cullface":"north","uv":[10.5,0.0,11.0,4.5]}}},{"from":[0,9,15],"to":[2,14,16],"faces":{"east":{"texture":"atlas4","uv":[11.0,0.0,11.5,2.5]},"west":{"texture":"atlas4","cullface":"west","uv":[11.5,0.0,12.0,2.5]},"up":{"texture":"atlas0","uv":[15.0,9.0,16.0,9.5]},"down":{"texture":"atlas2","uv":[14.0,15.0,15.0,15.5]},"south":{"texture":"atlas4","cullface":"south","uv":[12.0,0.0,13.0,2.5]}}},{"from":[5,9,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[14.0,7.5,14.5,8.0]},"west":{"texture":"atlas2","uv":[14.5,7.5,15.0,8.0]},"up":{"texture":"atlas2","uv":[15.0,7.5,15.5,8.0]},"down":{"texture":"atlas2","uv":[15.5,7.5,16.0,8.0]},"south":{"texture":"atlas2","cullface":"south","uv":[12.0,7.0,12.5,7.5]}}},{"from":[10,9,15],"to":[11,10,16],"faces":{"east":{"texture":"atlas2","uv":[12.5,7.0,13.0,7.5]},"west":{"texture":"atlas2","uv":[13.0,7.0,13.5,7.5]},"up":{"texture":"atlas2","uv":[13.5,7.0,14.0,7.5]},"down":{"texture":"atlas2","uv":[14.0,7.0,14.5,7.5]},"south":{"texture":"atlas2","cullface":"south","uv":[14.5,7.0,15.0,7.5]}}},{"from":[14,9,15],"to":[16,14,16],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[13.0,0.0,13.5,2.5]},"west":{"texture":"atlas4","uv":[13.5,0.0,14.0,2.5]},"up":{"texture":"atlas2","uv":[14.0,15.5,15.0,16.0]},"down":{"texture":"atlas2","uv":[15.0,15.5,16.0,16.0]},"south":{"texture":"atlas4","cullface":"south","uv":[14.0,0.0,15.0,2.5]}}},{"from":[5,10,15],"to":[11,11,16],"faces":{"east":{"texture":"atlas2","uv":[15.0,7.0,15.5,7.5]},"west":{"texture":"atlas2","uv":[15.5,7.0,16.0,7.5]},"up":{"texture":"atlas0","uv":[11.0,6.5,14.0,7.0]},"down":{"texture":"atlas0","uv":[8.0,3.5,11.0,4.0]},"south":{"texture":"atlas0","cullface":"south","uv":[11.0,3.5,14.0,4.0]}}},{"from":[0,10,1],"to":[16,14,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[8.0,3.0,15.0,5.0]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,5.0,15.0,7.0]},"down":{"texture":"atlas3","uv":[0.0,0.0,8.0,7.0]},"north":{"texture":"atlas3","uv":[0.0,7.0,8.0,9.0]},"south":{"texture":"atlas3","uv":[0.0,9.0,8.0,11.0]}}},{"from":[7,11,15],"to":[8,14,16],"faces":{"east":{"texture":"atlas2","uv":[10.0,6.5,10.5,8.0]},"west":{"texture":"atlas2","uv":[10.5,6.5,11.0,8.0]},"up":{"texture":"atlas2","uv":[12.0,6.5,12.5,7.0]},"down":{"texture":"atlas2","uv":[12.5,6.5,13.0,7.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,6.5,11.5,8.0]}}},{"from":[0,14,1],"to":[16,15,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,10.0,15.5,10.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,10.5,15.5,11.0]},"up":{"texture":"atlas4","uv":[0.0,0.0,8.0,7.5]},"down":{"texture":"atlas4","uv":[0.0,7.5,8.0,15.0]},"north":{"texture":"atlas0","uv":[8.0,14.0,16.0,14.5]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,14.5,16.0,15.0]}}},{"from":[0,15,10],"to":[16,16,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,3.0,11.0,3.5]},"west":{"texture":"atlas0","cullface":"west","uv":[11.0,3.0,14.0,3.5]},"up":{"texture":"atlas3","cullface":"up","uv":[0.0,11.0,8.0,14.0]},"north":{"texture":"atlas0","uv":[8.0,13.0,16.0,13.5]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.5,16.0,14.0]}}},{"from":[0,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas0","uv":[14.0,2.5,16.0,3.0]},"west":{"texture":"atlas1","cullface":"west","uv":[14.0,15.5,16.0,16.0]},"up":{"texture":"atlas4","cullface":"up","uv":[8.0,11.5,11.0,13.5]},"north":{"texture":"atlas0","uv":[8.0,2.5,11.0,3.0]},"south":{"texture":"atlas0","uv":[11.0,2.5,14.0,3.0]}}},{"from":[10,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas2","uv":[14.0,14.5,16.0,15.0]},"up":{"texture":"atlas4","cullface":"up","uv":[11.0,11.5,14.0,13.5]},"north":{"texture":"atlas1","uv":[8.0,15.5,11.0,16.0]},"south":{"texture":"atlas1","uv":[11.0,15.5,14.0,16.0]}}},{"from":[0,15,0],"to":[16,16,6],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,7.5,11.0,8.0]},"west":{"texture":"atlas1","cullface":"west","uv":[11.0,7.5,14.0,8.0]},"up":{"texture":"atlas3","cullface":"up","uv":[8.0,11.0,16.0,14.0]},"down":{"texture":"atlas3","uv":[8.0,0.0,16.0,3.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,12.5,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,12.0,16.0,12.5]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/disk_drive.json b/src/main/resources/assets/oc2/models/block/disk_drive.json deleted file mode 100644 index 6456d38a..00000000 --- a/src/main/resources/assets/oc2/models/block/disk_drive.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/disk_drive/disk_drive_atlas0","atlas1":"oc2:block/disk_drive/disk_drive_atlas1","atlas2":"oc2:block/disk_drive/disk_drive_atlas2","atlas3":"oc2:block/disk_drive/disk_drive_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,3.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,3.0,8.0,6.0]},"up":{"texture":"atlas0","uv":[0.0,6.0,8.0,14.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,6.0,16.0,14.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,3.0,16.0,6.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,3.0]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[14.0,0.0,14.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,0.0,15.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,15.5,11.0,16.0]},"down":{"texture":"atlas2","uv":[11.0,15.5,14.0,16.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,0.0,11.0,2.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas2","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,13.5,11.0,14.0]},"down":{"texture":"atlas2","uv":[11.0,13.5,14.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,0.0,14.0,2.0]}}},{"from":[0,6,0],"to":[16,9,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,14.0,15.5,15.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,12.0,15.5,13.5]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,7.5]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,14.0,8.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,14.0,16.0,15.5]}}},{"from":[0,9,1],"to":[16,10,15],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[0.0,15.5,7.0,16.0]},"west":{"texture":"atlas1","cullface":"west","uv":[7.0,15.5,14.0,16.0]},"up":{"texture":"atlas1","uv":[0.0,7.5,8.0,14.5]},"down":{"texture":"atlas1","uv":[8.0,7.5,16.0,14.5]},"north":{"texture":"atlas0","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,9,0],"to":[3,12,1],"faces":{"east":{"texture":"atlas2","uv":[15.5,12.0,16.0,13.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,14.0,16.0,15.5]},"up":{"texture":"atlas1","uv":[14.0,15.5,15.5,16.0]},"down":{"texture":"atlas2","uv":[14.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,0.0,1.5,1.5]}}},{"from":[13,9,0],"to":[16,12,1],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[1.5,0.0,2.0,1.5]},"west":{"texture":"atlas3","uv":[2.0,0.0,2.5,1.5]},"up":{"texture":"atlas2","uv":[14.0,13.5,15.5,14.0]},"down":{"texture":"atlas3","uv":[0.0,1.5,1.5,2.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,2.0,1.5,3.5]}}},{"from":[0,10,1],"to":[16,12,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,2.0,15.5,3.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,3.0,15.5,4.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,7.5]},"north":{"texture":"atlas1","uv":[0.0,14.5,8.0,15.5]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,14.5,16.0,15.5]}}},{"from":[0,12,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[0.0,0.0,8.0,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[0.0,2.0,8.0,4.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,4.0,8.0,12.0]},"down":{"texture":"atlas2","uv":[8.0,4.0,16.0,12.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,12.0,8.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,14.0,8.0,16.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/flash_memory_flasher.json b/src/main/resources/assets/oc2/models/block/flash_memory_flasher.json deleted file mode 100644 index 6456d38a..00000000 --- a/src/main/resources/assets/oc2/models/block/flash_memory_flasher.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/disk_drive/disk_drive_atlas0","atlas1":"oc2:block/disk_drive/disk_drive_atlas1","atlas2":"oc2:block/disk_drive/disk_drive_atlas2","atlas3":"oc2:block/disk_drive/disk_drive_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,3.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,3.0,8.0,6.0]},"up":{"texture":"atlas0","uv":[0.0,6.0,8.0,14.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,6.0,16.0,14.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,3.0,16.0,6.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,3.0]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[14.0,0.0,14.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,0.0,15.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,15.5,11.0,16.0]},"down":{"texture":"atlas2","uv":[11.0,15.5,14.0,16.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,0.0,11.0,2.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas2","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,13.5,11.0,14.0]},"down":{"texture":"atlas2","uv":[11.0,13.5,14.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,0.0,14.0,2.0]}}},{"from":[0,6,0],"to":[16,9,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,14.0,15.5,15.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,12.0,15.5,13.5]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,7.5]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,14.0,8.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,14.0,16.0,15.5]}}},{"from":[0,9,1],"to":[16,10,15],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[0.0,15.5,7.0,16.0]},"west":{"texture":"atlas1","cullface":"west","uv":[7.0,15.5,14.0,16.0]},"up":{"texture":"atlas1","uv":[0.0,7.5,8.0,14.5]},"down":{"texture":"atlas1","uv":[8.0,7.5,16.0,14.5]},"north":{"texture":"atlas0","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,9,0],"to":[3,12,1],"faces":{"east":{"texture":"atlas2","uv":[15.5,12.0,16.0,13.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,14.0,16.0,15.5]},"up":{"texture":"atlas1","uv":[14.0,15.5,15.5,16.0]},"down":{"texture":"atlas2","uv":[14.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,0.0,1.5,1.5]}}},{"from":[13,9,0],"to":[16,12,1],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[1.5,0.0,2.0,1.5]},"west":{"texture":"atlas3","uv":[2.0,0.0,2.5,1.5]},"up":{"texture":"atlas2","uv":[14.0,13.5,15.5,14.0]},"down":{"texture":"atlas3","uv":[0.0,1.5,1.5,2.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,2.0,1.5,3.5]}}},{"from":[0,10,1],"to":[16,12,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,2.0,15.5,3.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,3.0,15.5,4.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,7.5]},"north":{"texture":"atlas1","uv":[0.0,14.5,8.0,15.5]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,14.5,16.0,15.5]}}},{"from":[0,12,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[0.0,0.0,8.0,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[0.0,2.0,8.0,4.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,4.0,8.0,12.0]},"down":{"texture":"atlas2","uv":[8.0,4.0,16.0,12.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,12.0,8.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,14.0,8.0,16.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/keyboard.json b/src/main/resources/assets/oc2/models/block/keyboard.json deleted file mode 100644 index 80a6cf6c..00000000 --- a/src/main/resources/assets/oc2/models/block/keyboard.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/keyboard/keyboard_atlas0","atlas1":"oc2:block/keyboard/keyboard_atlas1","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,15.0,3.0,15.5]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,15.5,3.0,16.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,0.0,8.0,3.0]},"north":{"texture":"atlas0","uv":[0.0,3.0,8.0,3.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,3.5,8.0,4.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas0","uv":[9.0,15.0,11.0,15.5]},"west":{"texture":"atlas0","cullface":"west","uv":[11.0,15.0,13.0,15.5]},"down":{"texture":"atlas1","cullface":"down","uv":[12.0,14.0,15.0,16.0]},"north":{"texture":"atlas0","uv":[3.0,15.5,6.0,16.0]},"south":{"texture":"atlas0","uv":[6.0,15.5,9.0,16.0]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[13.0,15.0,15.0,15.5]},"west":{"texture":"atlas0","uv":[8.0,7.5,10.0,8.0]},"down":{"texture":"atlas1","cullface":"down","uv":[12.0,12.0,15.0,14.0]},"north":{"texture":"atlas0","uv":[9.0,15.5,12.0,16.0]},"south":{"texture":"atlas0","uv":[12.0,15.5,15.0,16.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[3.0,15.0,6.0,15.5]},"west":{"texture":"atlas0","cullface":"west","uv":[6.0,15.0,9.0,15.5]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,8.0,7.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,7.0,8.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,8.0,8.0]}}},{"from":[0,1,0],"to":[16,8,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,8.0,8.0,11.5]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,11.5,8.0,15.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,11.5,16.0,15.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,8.0,16.0,11.5]}}},{"from":[0,8,8],"to":[16,12,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,12.0,12.0,14.0]},"west":{"texture":"atlas1","cullface":"west","uv":[8.0,14.0,12.0,16.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,12.0]},"north":{"texture":"atlas0","uv":[8.0,4.0,16.0,6.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,2.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/monitor.json b/src/main/resources/assets/oc2/models/block/monitor.json deleted file mode 100644 index 1a9b8ae3..00000000 --- a/src/main/resources/assets/oc2/models/block/monitor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "loader": "forge:obj", - "flip_v": true, - "model": "oc2:models/block/monitor.obj", - "textures": { - "texture0": "oc2:block/monitor/monitor", - "particle": "oc2:block/monitor/monitor" - } -} diff --git a/src/main/resources/assets/oc2/models/block/network_connector.json b/src/main/resources/assets/oc2/models/block/network_connector.json deleted file mode 100644 index b5ce00d4..00000000 --- a/src/main/resources/assets/oc2/models/block/network_connector.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/network_connector/network_connector_atlas0","particle":"#atlas0"},"elements":[{"from":[5,0,5],"to":[11,1,11],"faces":{"east":{"texture":"atlas0","uv":[0.0,0.0,3.0,0.5]},"west":{"texture":"atlas0","uv":[0.0,0.5,3.0,1.0]},"up":{"texture":"atlas0","uv":[0.0,1.0,3.0,4.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,3.0,7.0]},"north":{"texture":"atlas0","uv":[0.0,7.0,3.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,3.0,8.0]}}},{"from":[6,1,10],"to":[10,3,11],"faces":{"east":{"texture":"atlas0","uv":[7.0,1.0,7.5,2.0]},"west":{"texture":"atlas0","uv":[7.5,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[3.0,15.5,5.0,16.0]},"south":{"texture":"atlas0","uv":[3.0,11.0,5.0,12.0]}}},{"from":[5,1,6],"to":[11,3,10],"faces":{"east":{"texture":"atlas0","uv":[5.0,11.0,7.0,12.0]},"west":{"texture":"atlas0","uv":[7.0,11.0,9.0,12.0]},"up":{"texture":"atlas0","uv":[0.0,8.0,3.0,10.0]},"north":{"texture":"atlas0","uv":[0.0,10.0,3.0,11.0]},"south":{"texture":"atlas0","uv":[0.0,11.0,3.0,12.0]}}},{"from":[6,1,5],"to":[10,3,6],"faces":{"east":{"texture":"atlas0","uv":[8.0,1.0,8.5,2.0]},"west":{"texture":"atlas0","uv":[8.5,1.0,9.0,2.0]},"up":{"texture":"atlas0","uv":[5.0,15.5,7.0,16.0]},"north":{"texture":"atlas0","uv":[9.0,11.0,11.0,12.0]}}},{"from":[6,3,10],"to":[7,4,11],"faces":{"east":{"texture":"atlas0","uv":[7.0,14.5,7.5,15.0]},"west":{"texture":"atlas0","uv":[7.5,14.5,8.0,15.0]},"up":{"texture":"atlas0","uv":[8.0,14.5,8.5,15.0]},"down":{"texture":"atlas0","uv":[8.5,14.5,9.0,15.0]},"south":{"texture":"atlas0","uv":[9.0,14.5,9.5,15.0]}}},{"from":[9,3,10],"to":[10,4,11],"faces":{"east":{"texture":"atlas0","uv":[9.5,14.5,10.0,15.0]},"west":{"texture":"atlas0","uv":[10.0,14.5,10.5,15.0]},"up":{"texture":"atlas0","uv":[10.5,14.5,11.0,15.0]},"down":{"texture":"atlas0","uv":[11.0,14.5,11.5,15.0]},"south":{"texture":"atlas0","uv":[11.5,14.5,12.0,15.0]}}},{"from":[5,3,9],"to":[11,4,10],"faces":{"east":{"texture":"atlas0","uv":[12.0,14.5,12.5,15.0]},"west":{"texture":"atlas0","uv":[12.5,14.5,13.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,3.0,12.5]},"down":{"texture":"atlas0","uv":[0.0,12.5,3.0,13.0]},"north":{"texture":"atlas0","uv":[0.0,13.0,3.0,13.5]},"south":{"texture":"atlas0","uv":[0.0,13.5,3.0,14.0]}}},{"from":[6,3,7],"to":[10,4,9],"faces":{"east":{"texture":"atlas0","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas0","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[11.0,11.0,13.0,12.0]},"down":{"texture":"atlas0","uv":[13.0,11.0,15.0,12.0]},"north":{"texture":"atlas0","uv":[7.0,15.5,9.0,16.0]},"south":{"texture":"atlas0","uv":[9.0,15.5,11.0,16.0]}}},{"from":[5,3,6],"to":[11,4,7],"faces":{"east":{"texture":"atlas0","uv":[13.0,14.5,13.5,15.0]},"west":{"texture":"atlas0","uv":[13.5,14.5,14.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,14.0,3.0,14.5]},"down":{"texture":"atlas0","uv":[0.0,14.5,3.0,15.0]},"north":{"texture":"atlas0","uv":[0.0,15.0,3.0,15.5]},"south":{"texture":"atlas0","uv":[0.0,15.5,3.0,16.0]}}},{"from":[6,3,5],"to":[7,4,6],"faces":{"east":{"texture":"atlas0","uv":[14.0,14.5,14.5,15.0]},"west":{"texture":"atlas0","uv":[14.5,14.5,15.0,15.0]},"up":{"texture":"atlas0","uv":[15.0,14.5,15.5,15.0]},"down":{"texture":"atlas0","uv":[15.5,14.5,16.0,15.0]},"north":{"texture":"atlas0","uv":[3.0,14.0,3.5,14.5]}}},{"from":[9,3,5],"to":[10,4,6],"faces":{"east":{"texture":"atlas0","uv":[3.5,14.0,4.0,14.5]},"west":{"texture":"atlas0","uv":[4.0,14.0,4.5,14.5]},"up":{"texture":"atlas0","uv":[4.5,14.0,5.0,14.5]},"down":{"texture":"atlas0","uv":[5.0,14.0,5.5,14.5]},"north":{"texture":"atlas0","uv":[5.5,14.0,6.0,14.5]}}},{"from":[6,4,10],"to":[10,7,11],"faces":{"east":{"texture":"atlas0","uv":[5.0,1.0,5.5,2.5]},"west":{"texture":"atlas0","uv":[5.5,1.0,6.0,2.5]},"up":{"texture":"atlas0","uv":[11.0,15.5,13.0,16.0]},"down":{"texture":"atlas0","uv":[13.0,15.5,15.0,16.0]},"south":{"texture":"atlas0","uv":[3.0,4.0,5.0,5.5]}}},{"from":[5,4,6],"to":[11,7,10],"faces":{"east":{"texture":"atlas0","uv":[3.0,5.5,5.0,7.0]},"west":{"texture":"atlas0","uv":[5.0,5.5,7.0,7.0]},"up":{"texture":"atlas0","uv":[3.0,8.0,6.0,10.0]},"down":{"texture":"atlas0","uv":[6.0,8.0,9.0,10.0]},"north":{"texture":"atlas0","uv":[9.0,8.0,12.0,9.5]},"south":{"texture":"atlas0","uv":[12.0,8.0,15.0,9.5]}}},{"from":[6,4,5],"to":[10,7,6],"faces":{"east":{"texture":"atlas0","uv":[6.0,1.0,6.5,2.5]},"west":{"texture":"atlas0","uv":[6.5,1.0,7.0,2.5]},"up":{"texture":"atlas0","uv":[3.0,15.0,5.0,15.5]},"down":{"texture":"atlas0","uv":[5.0,15.0,7.0,15.5]},"north":{"texture":"atlas0","uv":[7.0,5.5,9.0,7.0]}}},{"from":[6,7,6],"to":[10,8,10],"faces":{"east":{"texture":"atlas0","uv":[7.0,15.0,9.0,15.5]},"west":{"texture":"atlas0","uv":[9.0,15.0,11.0,15.5]},"up":{"texture":"atlas0","uv":[3.0,1.0,5.0,3.0]},"north":{"texture":"atlas0","uv":[11.0,15.0,13.0,15.5]},"south":{"texture":"atlas0","uv":[13.0,15.0,15.0,15.5]}}},{"from":[7,8,7],"to":[9,9,9],"faces":{"east":{"texture":"atlas0","uv":[3.0,14.5,4.0,15.0]},"west":{"texture":"atlas0","uv":[4.0,14.5,5.0,15.0]},"up":{"texture":"atlas0","uv":[15.0,11.0,16.0,12.0]},"north":{"texture":"atlas0","uv":[5.0,14.5,6.0,15.0]},"south":{"texture":"atlas0","uv":[6.0,14.5,7.0,15.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/network_hub.json b/src/main/resources/assets/oc2/models/block/network_hub.json deleted file mode 100644 index 1522434f..00000000 --- a/src/main/resources/assets/oc2/models/block/network_hub.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/network_hub/network_hub_atlas0","atlas1":"oc2:block/network_hub/network_hub_atlas1","atlas2":"oc2:block/network_hub/network_hub_atlas2","atlas3":"oc2:block/network_hub/network_hub_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,7.0,11.0,7.5]},"west":{"texture":"atlas1","cullface":"west","uv":[8.0,7.5,11.0,8.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,0.0,8.0,3.0]},"north":{"texture":"atlas0","uv":[0.0,3.0,8.0,3.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,3.5,8.0,4.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas1","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas1","cullface":"west","uv":[14.0,7.0,16.0,7.5]},"down":{"texture":"atlas3","cullface":"down","uv":[0.0,0.0,3.0,2.0]},"north":{"texture":"atlas1","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas1","uv":[11.0,7.0,14.0,7.5]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[9.0,14.5,11.0,15.0]},"west":{"texture":"atlas3","uv":[11.0,14.5,13.0,15.0]},"down":{"texture":"atlas3","cullface":"down","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas3","uv":[0.0,4.0,3.0,4.5]},"south":{"texture":"atlas3","uv":[0.0,4.5,3.0,5.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,5.0,3.0,5.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,5.5,3.0,6.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,8.0,7.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,7.0,8.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,8.0,8.0]}}},{"from":[0,1,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,8.0,8.0,10.5]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,10.5,8.0,13.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,13.0,8.0,15.5]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,15.5]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas3","uv":[0.0,6.0,3.0,6.5]},"down":{"texture":"atlas3","uv":[0.0,6.5,3.0,7.0]},"south":{"texture":"atlas3","cullface":"south","uv":[0.0,7.0,3.0,9.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,2.0,15.5,4.0]},"west":{"texture":"atlas2","uv":[15.5,2.0,16.0,4.0]},"up":{"texture":"atlas3","uv":[0.0,9.0,3.0,9.5]},"down":{"texture":"atlas3","uv":[0.0,9.5,3.0,10.0]},"south":{"texture":"atlas3","cullface":"south","uv":[0.0,10.0,3.0,12.0]}}},{"from":[0,6,10],"to":[16,10,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[3.0,10.0,5.5,12.0]},"west":{"texture":"atlas3","cullface":"west","uv":[5.5,10.0,8.0,12.0]},"up":{"texture":"atlas0","uv":[8.0,10.5,16.0,13.0]},"down":{"texture":"atlas0","uv":[8.0,8.0,16.0,10.5]},"north":{"texture":"atlas0","uv":[8.0,4.0,16.0,6.0]},"south":{"texture":"atlas0","uv":[8.0,0.0,16.0,2.0]}}},{"from":[1,6,6],"to":[15,10,10],"faces":{"east":{"texture":"atlas3","uv":[13.0,10.0,15.0,12.0]},"west":{"texture":"atlas3","uv":[3.0,7.0,5.0,9.0]},"up":{"texture":"atlas2","uv":[8.0,0.0,15.0,2.0]},"down":{"texture":"atlas2","uv":[8.0,2.0,15.0,4.0]},"north":{"texture":"atlas2","uv":[8.0,4.0,15.0,6.0]},"south":{"texture":"atlas2","uv":[8.0,6.0,15.0,8.0]}}},{"from":[0,6,1],"to":[16,10,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[8.0,10.0,10.5,12.0]},"west":{"texture":"atlas3","cullface":"west","uv":[10.5,10.0,13.0,12.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,10.5]},"down":{"texture":"atlas1","uv":[8.0,10.5,16.0,13.0]},"north":{"texture":"atlas1","uv":[8.0,13.0,16.0,15.0]},"south":{"texture":"atlas1","uv":[8.0,0.0,16.0,2.0]}}},{"from":[0,6,0],"to":[6,10,1],"faces":{"east":{"texture":"atlas2","uv":[15.0,4.0,15.5,6.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,4.0,16.0,6.0]},"up":{"texture":"atlas3","uv":[0.0,12.0,3.0,12.5]},"down":{"texture":"atlas3","uv":[0.0,12.5,3.0,13.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,13.0,3.0,15.0]}}},{"from":[10,6,0],"to":[16,10,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,6.0,15.5,8.0]},"west":{"texture":"atlas2","uv":[15.5,6.0,16.0,8.0]},"up":{"texture":"atlas3","uv":[0.0,15.0,3.0,15.5]},"down":{"texture":"atlas3","uv":[0.0,15.5,3.0,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[3.0,13.0,6.0,15.0]}}},{"from":[0,10,0],"to":[16,15,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,2.0,16.0,4.5]},"west":{"texture":"atlas1","cullface":"west","uv":[8.0,4.5,16.0,7.0]},"up":{"texture":"atlas2","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas2","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,8.0,16.0,10.5]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,10.5,16.0,13.0]}}},{"from":[0,15,13],"to":[16,16,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[11.0,13.0,12.5,13.5]},"west":{"texture":"atlas3","cullface":"west","uv":[12.5,13.0,14.0,13.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,13.0,16.0,14.5]},"north":{"texture":"atlas0","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,15,12],"to":[6,16,13],"faces":{"east":{"texture":"atlas3","uv":[15.5,13.0,16.0,13.5]},"west":{"texture":"atlas3","cullface":"west","uv":[13.5,12.5,14.0,13.0]},"up":{"texture":"atlas3","cullface":"up","uv":[3.0,15.5,6.0,16.0]},"north":{"texture":"atlas3","uv":[6.0,15.5,9.0,16.0]},"south":{"texture":"atlas3","uv":[9.0,15.5,12.0,16.0]}}},{"from":[10,15,12],"to":[16,16,13],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[14.0,12.5,14.5,13.0]},"west":{"texture":"atlas3","uv":[14.5,12.5,15.0,13.0]},"up":{"texture":"atlas3","cullface":"up","uv":[12.0,15.5,15.0,16.0]},"north":{"texture":"atlas3","uv":[3.0,15.0,6.0,15.5]},"south":{"texture":"atlas3","uv":[6.0,15.0,9.0,15.5]}}},{"from":[0,15,10],"to":[16,16,12],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","cullface":"up","uv":[8.0,6.0,16.0,7.0]},"north":{"texture":"atlas0","uv":[8.0,7.5,16.0,8.0]},"south":{"texture":"atlas0","uv":[8.0,7.0,16.0,7.5]}}},{"from":[0,15,6],"to":[3,16,10],"faces":{"east":{"texture":"atlas3","uv":[13.0,14.5,15.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[9.0,14.0,11.0,14.5]},"up":{"texture":"atlas3","cullface":"up","uv":[3.0,0.0,4.5,2.0]},"north":{"texture":"atlas3","uv":[14.0,13.0,15.5,13.5]},"south":{"texture":"atlas3","uv":[3.0,12.5,4.5,13.0]}}},{"from":[4,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas3","uv":[11.0,14.0,13.0,14.5]},"west":{"texture":"atlas3","uv":[13.0,14.0,15.0,14.5]},"up":{"texture":"atlas3","cullface":"up","uv":[4.5,0.0,5.5,2.0]},"north":{"texture":"atlas3","uv":[15.0,14.5,16.0,15.0]},"south":{"texture":"atlas3","uv":[15.0,14.0,16.0,14.5]}}},{"from":[10,15,6],"to":[12,16,10],"faces":{"east":{"texture":"atlas3","uv":[9.0,13.5,11.0,14.0]},"west":{"texture":"atlas3","uv":[11.0,13.5,13.0,14.0]},"up":{"texture":"atlas3","cullface":"up","uv":[5.5,0.0,6.5,2.0]},"north":{"texture":"atlas3","uv":[15.0,13.5,16.0,14.0]},"south":{"texture":"atlas3","uv":[10.5,12.5,11.5,13.0]}}},{"from":[13,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[13.0,13.5,15.0,14.0]},"west":{"texture":"atlas3","uv":[9.0,13.0,11.0,13.5]},"up":{"texture":"atlas3","cullface":"up","uv":[6.5,0.0,8.0,2.0]},"north":{"texture":"atlas3","uv":[4.5,12.5,6.0,13.0]},"south":{"texture":"atlas3","uv":[6.0,12.5,7.5,13.0]}}},{"from":[0,15,4],"to":[16,16,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[11.5,12.5,12.5,13.0]},"west":{"texture":"atlas3","cullface":"west","uv":[12.5,12.5,13.5,13.0]},"up":{"texture":"atlas0","cullface":"up","uv":[8.0,2.0,16.0,3.0]},"north":{"texture":"atlas0","uv":[8.0,3.5,16.0,4.0]},"south":{"texture":"atlas0","uv":[8.0,3.0,16.0,3.5]}}},{"from":[0,15,3],"to":[6,16,4],"faces":{"east":{"texture":"atlas3","uv":[15.0,12.5,15.5,13.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,12.5,16.0,13.0]},"up":{"texture":"atlas3","cullface":"up","uv":[9.0,15.0,12.0,15.5]},"north":{"texture":"atlas3","uv":[12.0,15.0,15.0,15.5]},"south":{"texture":"atlas3","uv":[6.0,13.0,9.0,13.5]}}},{"from":[10,15,3],"to":[16,16,4],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[3.0,12.0,3.5,12.5]},"west":{"texture":"atlas3","uv":[3.5,12.0,4.0,12.5]},"up":{"texture":"atlas3","cullface":"up","uv":[6.0,13.5,9.0,14.0]},"north":{"texture":"atlas3","uv":[6.0,14.0,9.0,14.5]},"south":{"texture":"atlas3","uv":[6.0,14.5,9.0,15.0]}}},{"from":[0,15,0],"to":[16,16,3],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[7.5,12.5,9.0,13.0]},"west":{"texture":"atlas3","cullface":"west","uv":[9.0,12.5,10.5,13.0]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,14.5,16.0,16.0]},"north":{"texture":"atlas1","cullface":"north","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas1","uv":[8.0,15.5,16.0,16.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/pci_card_cage.json b/src/main/resources/assets/oc2/models/block/pci_card_cage.json deleted file mode 100644 index 1267853b..00000000 --- a/src/main/resources/assets/oc2/models/block/pci_card_cage.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/pci_card_cage/pci_card_cage_atlas0","atlas1":"oc2:block/pci_card_cage/pci_card_cage_atlas1","atlas2":"oc2:block/pci_card_cage/pci_card_cage_atlas2","atlas3":"oc2:block/pci_card_cage/pci_card_cage_atlas3","atlas4":"oc2:block/pci_card_cage/pci_card_cage_atlas4","atlas5":"oc2:block/pci_card_cage/pci_card_cage_atlas5","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,2,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,1.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,2.0,8.0,10.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,2.0,16.0,10.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,10.0,8.0,11.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,11.0,8.0,12.0]}}},{"from":[0,2,14],"to":[16,6,16],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[15.0,4.0,16.0,6.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,6.0,16.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,8.0,13.0]},"north":{"texture":"atlas0","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,2,2],"to":[15,6,14],"faces":{"east":{"texture":"atlas3","uv":[7.0,12.0,13.0,14.0]},"west":{"texture":"atlas4","uv":[8.0,14.0,14.0,16.0]},"up":{"texture":"atlas4","uv":[8.0,8.0,15.0,14.0]},"down":{"texture":"atlas4","uv":[8.0,0.0,15.0,6.0]},"north":{"texture":"atlas3","uv":[0.0,12.0,7.0,14.0]}}},{"from":[0,2,0],"to":[16,3,2],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[0.0,15.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,3,1],"to":[16,4,2],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.5,15.5,16.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[8.0,12.0,16.0,12.5]},"north":{"texture":"atlas0","uv":[8.0,12.5,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,11.0,16.0,11.5]}}},{"from":[0,3,0],"to":[7,4,1],"faces":{"east":{"texture":"atlas3","uv":[15.5,14.5,16.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,14.0,16.0,14.5]},"up":{"texture":"atlas3","uv":[12.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[4.0,15.0,7.5,15.5]}}},{"from":[9,3,0],"to":[16,4,1],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,14.5,4.5,15.0]},"west":{"texture":"atlas5","uv":[4.5,14.5,5.0,15.0]},"up":{"texture":"atlas3","uv":[7.5,15.0,11.0,15.5]},"north":{"texture":"atlas3","cullface":"north","uv":[11.0,15.0,14.5,15.5]}}},{"from":[0,4,0],"to":[4,12,2],"faces":{"east":{"texture":"atlas4","uv":[15.0,0.0,16.0,4.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,8.0,16.0,12.0]},"up":{"texture":"atlas4","uv":[14.0,14.0,16.0,15.0]},"down":{"texture":"atlas4","uv":[14.0,15.0,16.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[0.0,10.5,2.0,14.5]},"south":{"texture":"atlas5","uv":[2.0,10.5,4.0,14.5]}}},{"from":[6,4,0],"to":[10,5,2],"faces":{"east":{"texture":"atlas2","uv":[15.0,6.5,16.0,7.0]},"west":{"texture":"atlas2","uv":[15.0,3.0,16.0,3.5]},"up":{"texture":"atlas5","uv":[0.0,15.0,2.0,16.0]},"down":{"texture":"atlas5","uv":[2.0,15.0,4.0,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[13.5,14.5,15.5,15.0]}}},{"from":[12,4,0],"to":[16,12,2],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,10.5,5.0,14.5]},"west":{"texture":"atlas5","uv":[5.0,10.5,6.0,14.5]},"up":{"texture":"atlas5","uv":[4.0,15.0,6.0,16.0]},"down":{"texture":"atlas5","uv":[6.0,15.0,8.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[6.0,10.5,8.0,14.5]},"south":{"texture":"atlas5","uv":[8.0,10.5,10.0,14.5]}}},{"from":[0,6,15],"to":[2,7,16],"faces":{"east":{"texture":"atlas5","uv":[5.0,14.5,5.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[5.5,14.5,6.0,15.0]},"up":{"texture":"atlas2","uv":[15.0,2.5,16.0,3.0]},"down":{"texture":"atlas2","uv":[15.0,2.0,16.0,2.5]},"south":{"texture":"atlas3","cullface":"south","uv":[14.5,15.0,15.5,15.5]}}},{"from":[5,6,15],"to":[6,7,16],"faces":{"east":{"texture":"atlas5","uv":[6.0,14.5,6.5,15.0]},"west":{"texture":"atlas5","uv":[6.5,14.5,7.0,15.0]},"up":{"texture":"atlas5","uv":[7.0,14.5,7.5,15.0]},"down":{"texture":"atlas5","uv":[7.5,14.5,8.0,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[8.0,14.5,8.5,15.0]}}},{"from":[10,6,15],"to":[11,7,16],"faces":{"east":{"texture":"atlas5","uv":[8.5,14.5,9.0,15.0]},"west":{"texture":"atlas5","uv":[9.0,14.5,9.5,15.0]},"up":{"texture":"atlas5","uv":[9.5,14.5,10.0,15.0]},"down":{"texture":"atlas5","uv":[10.0,14.5,10.5,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.5,14.5,11.0,15.0]}}},{"from":[14,6,15],"to":[16,7,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[11.0,14.5,11.5,15.0]},"west":{"texture":"atlas5","uv":[11.5,14.5,12.0,15.0]},"up":{"texture":"atlas3","uv":[14.0,11.5,15.0,12.0]},"down":{"texture":"atlas3","uv":[15.0,11.5,16.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[14.0,7.5,15.0,8.0]}}},{"from":[0,6,2],"to":[16,7,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,14.0,6.5,14.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,14.5,6.5,15.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,6.5]},"down":{"texture":"atlas1","uv":[0.0,6.5,8.0,13.0]},"north":{"texture":"atlas0","uv":[8.0,11.5,16.0,12.0]},"south":{"texture":"atlas0","uv":[8.0,10.0,16.0,10.5]}}},{"from":[0,7,15],"to":[6,8,16],"faces":{"east":{"texture":"atlas5","uv":[12.0,14.5,12.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[12.5,14.5,13.0,15.0]},"up":{"texture":"atlas3","uv":[6.5,14.0,9.5,14.5]},"down":{"texture":"atlas3","uv":[9.5,14.0,12.5,14.5]},"south":{"texture":"atlas3","cullface":"south","uv":[12.5,14.0,15.5,14.5]}}},{"from":[10,7,15],"to":[16,8,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[13.0,14.5,13.5,15.0]},"west":{"texture":"atlas5","uv":[13.5,14.5,14.0,15.0]},"up":{"texture":"atlas3","uv":[13.0,12.0,16.0,12.5]},"down":{"texture":"atlas3","uv":[13.0,12.5,16.0,13.0]},"south":{"texture":"atlas3","cullface":"south","uv":[13.0,13.0,16.0,13.5]}}},{"from":[0,7,8],"to":[16,11,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[8.0,6.0,11.5,8.0]},"west":{"texture":"atlas4","cullface":"west","uv":[11.5,6.0,15.0,8.0]},"up":{"texture":"atlas1","uv":[8.0,6.5,16.0,10.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,3.5]},"north":{"texture":"atlas1","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas1","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,7,7],"to":[15,14,8],"faces":{"east":{"texture":"atlas3","uv":[15.0,0.0,15.5,3.5]},"west":{"texture":"atlas3","uv":[15.5,0.0,16.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,15.5,15.0,16.0]},"down":{"texture":"atlas2","uv":[8.0,15.0,15.0,15.5]},"north":{"texture":"atlas3","uv":[8.0,8.0,15.0,11.5]},"south":{"texture":"atlas3","uv":[8.0,4.0,15.0,7.5]}}},{"from":[0,7,6],"to":[16,14,7],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.0,4.0,15.5,7.5]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,4.0,16.0,7.5]},"up":{"texture":"atlas0","uv":[8.0,10.5,16.0,11.0]},"down":{"texture":"atlas0","uv":[8.0,1.0,16.0,1.5]},"north":{"texture":"atlas2","uv":[0.0,0.0,8.0,3.5]},"south":{"texture":"atlas2","uv":[0.0,3.5,8.0,7.0]}}},{"from":[1,7,5],"to":[15,14,6],"faces":{"east":{"texture":"atlas3","uv":[15.0,8.0,15.5,11.5]},"west":{"texture":"atlas3","uv":[15.5,8.0,16.0,11.5]},"up":{"texture":"atlas2","uv":[8.0,6.5,15.0,7.0]},"down":{"texture":"atlas2","uv":[8.0,2.0,15.0,2.5]},"north":{"texture":"atlas3","uv":[8.0,0.0,15.0,3.5]},"south":{"texture":"atlas5","uv":[0.0,0.0,7.0,3.5]}}},{"from":[0,7,4],"to":[16,14,5],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[7.0,0.0,7.5,3.5]},"west":{"texture":"atlas5","cullface":"west","uv":[7.5,0.0,8.0,3.5]},"up":{"texture":"atlas0","uv":[8.0,1.5,16.0,2.0]},"down":{"texture":"atlas0","uv":[8.0,0.0,16.0,0.5]},"north":{"texture":"atlas2","uv":[0.0,7.0,8.0,10.5]},"south":{"texture":"atlas2","uv":[0.0,10.5,8.0,14.0]}}},{"from":[1,7,3],"to":[15,14,4],"faces":{"east":{"texture":"atlas5","uv":[8.0,0.0,8.5,3.5]},"west":{"texture":"atlas5","uv":[8.5,0.0,9.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,2.5,15.0,3.0]},"down":{"texture":"atlas2","uv":[8.0,3.0,15.0,3.5]},"north":{"texture":"atlas5","uv":[0.0,3.5,7.0,7.0]},"south":{"texture":"atlas5","uv":[0.0,7.0,7.0,10.5]}}},{"from":[0,7,2],"to":[16,12,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[9.0,0.0,9.5,2.5]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,0.0,10.0,2.5]},"up":{"texture":"atlas0","uv":[8.0,0.5,16.0,1.0]},"down":{"texture":"atlas1","uv":[0.0,15.0,8.0,15.5]},"north":{"texture":"atlas1","uv":[8.0,10.0,16.0,12.5]},"south":{"texture":"atlas1","uv":[8.0,3.5,16.0,6.0]}}},{"from":[0,8,15],"to":[2,9,16],"faces":{"east":{"texture":"atlas5","uv":[14.0,14.5,14.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[14.5,14.5,15.0,15.0]},"up":{"texture":"atlas3","uv":[15.0,7.5,16.0,8.0]},"down":{"texture":"atlas3","uv":[14.0,3.5,15.0,4.0]},"south":{"texture":"atlas3","cullface":"south","uv":[15.0,3.5,16.0,4.0]}}},{"from":[5,8,15],"to":[6,9,16],"faces":{"east":{"texture":"atlas5","uv":[15.0,14.5,15.5,15.0]},"west":{"texture":"atlas5","uv":[15.5,14.5,16.0,15.0]},"up":{"texture":"atlas5","uv":[10.0,10.5,10.5,11.0]},"down":{"texture":"atlas5","uv":[10.0,11.0,10.5,11.5]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,11.5,10.5,12.0]}}},{"from":[10,8,15],"to":[11,9,16],"faces":{"east":{"texture":"atlas5","uv":[10.0,12.0,10.5,12.5]},"west":{"texture":"atlas5","uv":[10.0,12.5,10.5,13.0]},"up":{"texture":"atlas5","uv":[10.0,13.0,10.5,13.5]},"down":{"texture":"atlas5","uv":[10.0,13.5,10.5,14.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,14.0,10.5,14.5]}}},{"from":[14,8,15],"to":[16,9,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[10.5,14.0,11.0,14.5]},"west":{"texture":"atlas5","uv":[11.0,14.0,11.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,12.0,16.0,12.5]},"down":{"texture":"atlas4","uv":[15.0,12.5,16.0,13.0]},"south":{"texture":"atlas4","cullface":"south","uv":[15.0,13.0,16.0,13.5]}}},{"from":[0,9,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas5","uv":[11.5,14.0,12.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[12.0,14.0,12.5,14.5]},"up":{"texture":"atlas3","uv":[13.0,13.5,16.0,14.0]},"down":{"texture":"atlas3","uv":[8.0,11.5,11.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[11.0,11.5,14.0,12.0]}}},{"from":[10,9,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.5,14.0,13.0,14.5]},"west":{"texture":"atlas5","uv":[13.0,14.0,13.5,14.5]},"up":{"texture":"atlas3","uv":[8.0,7.5,11.0,8.0]},"down":{"texture":"atlas3","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas3","cullface":"south","uv":[8.0,3.5,11.0,4.0]}}},{"from":[0,10,15],"to":[2,11,16],"faces":{"east":{"texture":"atlas5","uv":[13.5,14.0,14.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[14.0,14.0,14.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,13.5,16.0,14.0]},"down":{"texture":"atlas5","uv":[11.0,15.0,12.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[11.0,15.5,12.0,16.0]}}},{"from":[5,10,15],"to":[11,11,16],"faces":{"east":{"texture":"atlas5","uv":[14.5,14.0,15.0,14.5]},"west":{"texture":"atlas5","uv":[15.0,14.0,15.5,14.5]},"down":{"texture":"atlas3","uv":[11.0,3.5,14.0,4.0]},"south":{"texture":"atlas5","cullface":"south","uv":[0.0,14.5,3.0,15.0]}}},{"from":[14,10,15],"to":[16,11,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[15.5,14.0,16.0,14.5]},"west":{"texture":"atlas5","uv":[10.5,13.5,11.0,14.0]},"up":{"texture":"atlas5","uv":[12.0,15.5,13.0,16.0]},"down":{"texture":"atlas5","uv":[13.0,15.5,14.0,16.0]},"south":{"texture":"atlas5","cullface":"south","uv":[14.0,15.5,15.0,16.0]}}},{"from":[0,11,8],"to":[16,12,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,15.0,4.0,15.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,15.5,4.0,16.0]},"up":{"texture":"atlas3","uv":[0.0,0.0,8.0,4.0]},"down":{"texture":"atlas3","uv":[0.0,4.0,8.0,8.0]},"north":{"texture":"atlas1","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,12,15],"to":[2,13,16],"faces":{"east":{"texture":"atlas5","uv":[11.0,13.5,11.5,14.0]},"west":{"texture":"atlas5","cullface":"west","uv":[11.5,13.5,12.0,14.0]},"up":{"texture":"atlas5","uv":[15.0,15.5,16.0,16.0]},"down":{"texture":"atlas5","uv":[12.0,15.0,13.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[13.0,15.0,14.0,15.5]}}},{"from":[14,12,15],"to":[16,13,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.0,13.5,12.5,14.0]},"west":{"texture":"atlas5","uv":[12.5,13.5,13.0,14.0]},"up":{"texture":"atlas5","uv":[14.0,15.0,15.0,15.5]},"down":{"texture":"atlas5","uv":[15.0,15.0,16.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[3.0,14.5,4.0,15.0]}}},{"from":[0,12,8],"to":[16,13,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[6.5,14.5,10.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[10.0,14.5,13.5,15.0]},"up":{"texture":"atlas2","uv":[8.0,10.5,16.0,14.0]},"down":{"texture":"atlas2","uv":[8.0,7.0,16.0,10.5]},"north":{"texture":"atlas1","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas1","uv":[8.0,12.5,16.0,13.0]}}},{"from":[0,12,0],"to":[16,14,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[8.0,15.0,9.5,16.0]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,15.0,11.0,16.0]},"down":{"texture":"atlas2","uv":[0.0,14.0,8.0,15.5]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,14.0,16.0,15.0]},"south":{"texture":"atlas2","uv":[8.0,3.5,16.0,4.5]}}},{"from":[0,13,8],"to":[16,14,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[4.0,15.5,8.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,15.5,12.0,16.0]},"down":{"texture":"atlas3","uv":[0.0,8.0,8.0,12.0]},"north":{"texture":"atlas1","uv":[8.0,6.0,16.0,6.5]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,15.5,8.0,16.0]}}},{"from":[0,14,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,4.5,16.0,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,5.5,16.0,6.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas4","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,0.0,16.0,1.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,1.0,16.0,2.0]}}}]} diff --git a/src/main/resources/assets/oc2/models/block/projector.json b/src/main/resources/assets/oc2/models/block/projector.json deleted file mode 100644 index 4ef221be..00000000 --- a/src/main/resources/assets/oc2/models/block/projector.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/projector/projector_atlas0","atlas1":"oc2:block/projector/projector_atlas1","atlas2":"oc2:block/projector/projector_atlas2","atlas3":"oc2:block/projector/projector_atlas3","atlas4":"oc2:block/projector/projector_atlas4","atlas5":"oc2:block/projector/projector_atlas5","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,2,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,1.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,2.0,8.0,10.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,2.0,16.0,10.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,10.0,8.0,11.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,11.0,8.0,12.0]}}},{"from":[0,2,14],"to":[16,6,16],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[15.0,4.0,16.0,6.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,6.0,16.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,8.0,13.0]},"north":{"texture":"atlas0","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,2,2],"to":[15,6,14],"faces":{"east":{"texture":"atlas3","uv":[7.0,12.0,13.0,14.0]},"west":{"texture":"atlas4","uv":[8.0,14.0,14.0,16.0]},"up":{"texture":"atlas4","uv":[8.0,8.0,15.0,14.0]},"down":{"texture":"atlas4","uv":[8.0,0.0,15.0,6.0]},"north":{"texture":"atlas3","uv":[0.0,12.0,7.0,14.0]}}},{"from":[0,2,0],"to":[16,3,2],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[0.0,15.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,3,1],"to":[16,4,2],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.5,15.5,16.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[8.0,12.0,16.0,12.5]},"north":{"texture":"atlas0","uv":[8.0,12.5,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,11.0,16.0,11.5]}}},{"from":[0,3,0],"to":[7,4,1],"faces":{"east":{"texture":"atlas3","uv":[15.5,14.5,16.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,14.0,16.0,14.5]},"up":{"texture":"atlas3","uv":[12.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[4.0,15.0,7.5,15.5]}}},{"from":[9,3,0],"to":[16,4,1],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,14.5,4.5,15.0]},"west":{"texture":"atlas5","uv":[4.5,14.5,5.0,15.0]},"up":{"texture":"atlas3","uv":[7.5,15.0,11.0,15.5]},"north":{"texture":"atlas3","cullface":"north","uv":[11.0,15.0,14.5,15.5]}}},{"from":[0,4,0],"to":[4,12,2],"faces":{"east":{"texture":"atlas4","uv":[15.0,0.0,16.0,4.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,8.0,16.0,12.0]},"up":{"texture":"atlas4","uv":[14.0,14.0,16.0,15.0]},"down":{"texture":"atlas4","uv":[14.0,15.0,16.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[0.0,10.5,2.0,14.5]},"south":{"texture":"atlas5","uv":[2.0,10.5,4.0,14.5]}}},{"from":[6,4,0],"to":[10,5,2],"faces":{"east":{"texture":"atlas2","uv":[15.0,6.5,16.0,7.0]},"west":{"texture":"atlas2","uv":[15.0,3.0,16.0,3.5]},"up":{"texture":"atlas5","uv":[0.0,15.0,2.0,16.0]},"down":{"texture":"atlas5","uv":[2.0,15.0,4.0,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[13.5,14.5,15.5,15.0]}}},{"from":[12,4,0],"to":[16,12,2],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,10.5,5.0,14.5]},"west":{"texture":"atlas5","uv":[5.0,10.5,6.0,14.5]},"up":{"texture":"atlas5","uv":[4.0,15.0,6.0,16.0]},"down":{"texture":"atlas5","uv":[6.0,15.0,8.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[6.0,10.5,8.0,14.5]},"south":{"texture":"atlas5","uv":[8.0,10.5,10.0,14.5]}}},{"from":[0,6,15],"to":[2,7,16],"faces":{"east":{"texture":"atlas5","uv":[5.0,14.5,5.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[5.5,14.5,6.0,15.0]},"up":{"texture":"atlas2","uv":[15.0,2.5,16.0,3.0]},"down":{"texture":"atlas2","uv":[15.0,2.0,16.0,2.5]},"south":{"texture":"atlas3","cullface":"south","uv":[14.5,15.0,15.5,15.5]}}},{"from":[5,6,15],"to":[6,7,16],"faces":{"east":{"texture":"atlas5","uv":[6.0,14.5,6.5,15.0]},"west":{"texture":"atlas5","uv":[6.5,14.5,7.0,15.0]},"up":{"texture":"atlas5","uv":[7.0,14.5,7.5,15.0]},"down":{"texture":"atlas5","uv":[7.5,14.5,8.0,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[8.0,14.5,8.5,15.0]}}},{"from":[10,6,15],"to":[11,7,16],"faces":{"east":{"texture":"atlas5","uv":[8.5,14.5,9.0,15.0]},"west":{"texture":"atlas5","uv":[9.0,14.5,9.5,15.0]},"up":{"texture":"atlas5","uv":[9.5,14.5,10.0,15.0]},"down":{"texture":"atlas5","uv":[10.0,14.5,10.5,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.5,14.5,11.0,15.0]}}},{"from":[14,6,15],"to":[16,7,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[11.0,14.5,11.5,15.0]},"west":{"texture":"atlas5","uv":[11.5,14.5,12.0,15.0]},"up":{"texture":"atlas3","uv":[14.0,11.5,15.0,12.0]},"down":{"texture":"atlas3","uv":[15.0,11.5,16.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[14.0,7.5,15.0,8.0]}}},{"from":[0,6,2],"to":[16,7,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,14.0,6.5,14.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,14.5,6.5,15.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,6.5]},"down":{"texture":"atlas1","uv":[0.0,6.5,8.0,13.0]},"north":{"texture":"atlas0","uv":[8.0,11.5,16.0,12.0]},"south":{"texture":"atlas0","uv":[8.0,10.0,16.0,10.5]}}},{"from":[0,7,15],"to":[6,8,16],"faces":{"east":{"texture":"atlas5","uv":[12.0,14.5,12.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[12.5,14.5,13.0,15.0]},"up":{"texture":"atlas3","uv":[6.5,14.0,9.5,14.5]},"down":{"texture":"atlas3","uv":[9.5,14.0,12.5,14.5]},"south":{"texture":"atlas3","cullface":"south","uv":[12.5,14.0,15.5,14.5]}}},{"from":[10,7,15],"to":[16,8,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[13.0,14.5,13.5,15.0]},"west":{"texture":"atlas5","uv":[13.5,14.5,14.0,15.0]},"up":{"texture":"atlas3","uv":[13.0,12.0,16.0,12.5]},"down":{"texture":"atlas3","uv":[13.0,12.5,16.0,13.0]},"south":{"texture":"atlas3","cullface":"south","uv":[13.0,13.0,16.0,13.5]}}},{"from":[0,7,8],"to":[16,11,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[8.0,6.0,11.5,8.0]},"west":{"texture":"atlas4","cullface":"west","uv":[11.5,6.0,15.0,8.0]},"up":{"texture":"atlas1","uv":[8.0,6.5,16.0,10.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,3.5]},"north":{"texture":"atlas1","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas1","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,7,7],"to":[15,14,8],"faces":{"east":{"texture":"atlas3","uv":[15.0,0.0,15.5,3.5]},"west":{"texture":"atlas3","uv":[15.5,0.0,16.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,15.5,15.0,16.0]},"down":{"texture":"atlas2","uv":[8.0,15.0,15.0,15.5]},"north":{"texture":"atlas3","uv":[8.0,8.0,15.0,11.5]},"south":{"texture":"atlas3","uv":[8.0,4.0,15.0,7.5]}}},{"from":[0,7,6],"to":[16,14,7],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.0,4.0,15.5,7.5]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,4.0,16.0,7.5]},"up":{"texture":"atlas0","uv":[8.0,10.5,16.0,11.0]},"down":{"texture":"atlas0","uv":[8.0,1.0,16.0,1.5]},"north":{"texture":"atlas2","uv":[0.0,0.0,8.0,3.5]},"south":{"texture":"atlas2","uv":[0.0,3.5,8.0,7.0]}}},{"from":[1,7,5],"to":[15,14,6],"faces":{"east":{"texture":"atlas3","uv":[15.0,8.0,15.5,11.5]},"west":{"texture":"atlas3","uv":[15.5,8.0,16.0,11.5]},"up":{"texture":"atlas2","uv":[8.0,6.5,15.0,7.0]},"down":{"texture":"atlas2","uv":[8.0,2.0,15.0,2.5]},"north":{"texture":"atlas3","uv":[8.0,0.0,15.0,3.5]},"south":{"texture":"atlas5","uv":[0.0,0.0,7.0,3.5]}}},{"from":[0,7,4],"to":[16,14,5],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[7.0,0.0,7.5,3.5]},"west":{"texture":"atlas5","cullface":"west","uv":[7.5,0.0,8.0,3.5]},"up":{"texture":"atlas0","uv":[8.0,1.5,16.0,2.0]},"down":{"texture":"atlas0","uv":[8.0,0.0,16.0,0.5]},"north":{"texture":"atlas2","uv":[0.0,7.0,8.0,10.5]},"south":{"texture":"atlas2","uv":[0.0,10.5,8.0,14.0]}}},{"from":[1,7,3],"to":[15,14,4],"faces":{"east":{"texture":"atlas5","uv":[8.0,0.0,8.5,3.5]},"west":{"texture":"atlas5","uv":[8.5,0.0,9.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,2.5,15.0,3.0]},"down":{"texture":"atlas2","uv":[8.0,3.0,15.0,3.5]},"north":{"texture":"atlas5","uv":[0.0,3.5,7.0,7.0]},"south":{"texture":"atlas5","uv":[0.0,7.0,7.0,10.5]}}},{"from":[0,7,2],"to":[16,12,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[9.0,0.0,9.5,2.5]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,0.0,10.0,2.5]},"up":{"texture":"atlas0","uv":[8.0,0.5,16.0,1.0]},"down":{"texture":"atlas1","uv":[0.0,15.0,8.0,15.5]},"north":{"texture":"atlas1","uv":[8.0,10.0,16.0,12.5]},"south":{"texture":"atlas1","uv":[8.0,3.5,16.0,6.0]}}},{"from":[0,8,15],"to":[2,9,16],"faces":{"east":{"texture":"atlas5","uv":[14.0,14.5,14.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[14.5,14.5,15.0,15.0]},"up":{"texture":"atlas3","uv":[15.0,7.5,16.0,8.0]},"down":{"texture":"atlas3","uv":[14.0,3.5,15.0,4.0]},"south":{"texture":"atlas3","cullface":"south","uv":[15.0,3.5,16.0,4.0]}}},{"from":[5,8,15],"to":[6,9,16],"faces":{"east":{"texture":"atlas5","uv":[15.0,14.5,15.5,15.0]},"west":{"texture":"atlas5","uv":[15.5,14.5,16.0,15.0]},"up":{"texture":"atlas5","uv":[10.0,10.5,10.5,11.0]},"down":{"texture":"atlas5","uv":[10.0,11.0,10.5,11.5]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,11.5,10.5,12.0]}}},{"from":[10,8,15],"to":[11,9,16],"faces":{"east":{"texture":"atlas5","uv":[10.0,12.0,10.5,12.5]},"west":{"texture":"atlas5","uv":[10.0,12.5,10.5,13.0]},"up":{"texture":"atlas5","uv":[10.0,13.0,10.5,13.5]},"down":{"texture":"atlas5","uv":[10.0,13.5,10.5,14.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,14.0,10.5,14.5]}}},{"from":[14,8,15],"to":[16,9,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[10.5,14.0,11.0,14.5]},"west":{"texture":"atlas5","uv":[11.0,14.0,11.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,12.0,16.0,12.5]},"down":{"texture":"atlas4","uv":[15.0,12.5,16.0,13.0]},"south":{"texture":"atlas4","cullface":"south","uv":[15.0,13.0,16.0,13.5]}}},{"from":[0,9,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas5","uv":[11.5,14.0,12.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[12.0,14.0,12.5,14.5]},"up":{"texture":"atlas3","uv":[13.0,13.5,16.0,14.0]},"down":{"texture":"atlas3","uv":[8.0,11.5,11.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[11.0,11.5,14.0,12.0]}}},{"from":[10,9,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.5,14.0,13.0,14.5]},"west":{"texture":"atlas5","uv":[13.0,14.0,13.5,14.5]},"up":{"texture":"atlas3","uv":[8.0,7.5,11.0,8.0]},"down":{"texture":"atlas3","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas3","cullface":"south","uv":[8.0,3.5,11.0,4.0]}}},{"from":[0,10,15],"to":[2,11,16],"faces":{"east":{"texture":"atlas5","uv":[13.5,14.0,14.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[14.0,14.0,14.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,13.5,16.0,14.0]},"down":{"texture":"atlas5","uv":[11.0,15.0,12.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[11.0,15.5,12.0,16.0]}}},{"from":[5,10,15],"to":[11,11,16],"faces":{"east":{"texture":"atlas5","uv":[14.5,14.0,15.0,14.5]},"west":{"texture":"atlas5","uv":[15.0,14.0,15.5,14.5]},"down":{"texture":"atlas3","uv":[11.0,3.5,14.0,4.0]},"south":{"texture":"atlas5","cullface":"south","uv":[0.0,14.5,3.0,15.0]}}},{"from":[14,10,15],"to":[16,11,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[15.5,14.0,16.0,14.5]},"west":{"texture":"atlas5","uv":[10.5,13.5,11.0,14.0]},"up":{"texture":"atlas5","uv":[12.0,15.5,13.0,16.0]},"down":{"texture":"atlas5","uv":[13.0,15.5,14.0,16.0]},"south":{"texture":"atlas5","cullface":"south","uv":[14.0,15.5,15.0,16.0]}}},{"from":[0,11,8],"to":[16,12,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,15.0,4.0,15.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,15.5,4.0,16.0]},"up":{"texture":"atlas3","uv":[0.0,0.0,8.0,4.0]},"down":{"texture":"atlas3","uv":[0.0,4.0,8.0,8.0]},"north":{"texture":"atlas1","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,12,15],"to":[2,13,16],"faces":{"east":{"texture":"atlas5","uv":[11.0,13.5,11.5,14.0]},"west":{"texture":"atlas5","cullface":"west","uv":[11.5,13.5,12.0,14.0]},"up":{"texture":"atlas5","uv":[15.0,15.5,16.0,16.0]},"down":{"texture":"atlas5","uv":[12.0,15.0,13.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[13.0,15.0,14.0,15.5]}}},{"from":[14,12,15],"to":[16,13,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.0,13.5,12.5,14.0]},"west":{"texture":"atlas5","uv":[12.5,13.5,13.0,14.0]},"up":{"texture":"atlas5","uv":[14.0,15.0,15.0,15.5]},"down":{"texture":"atlas5","uv":[15.0,15.0,16.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[3.0,14.5,4.0,15.0]}}},{"from":[0,12,8],"to":[16,13,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[6.5,14.5,10.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[10.0,14.5,13.5,15.0]},"up":{"texture":"atlas2","uv":[8.0,10.5,16.0,14.0]},"down":{"texture":"atlas2","uv":[8.0,7.0,16.0,10.5]},"north":{"texture":"atlas1","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas1","uv":[8.0,12.5,16.0,13.0]}}},{"from":[0,12,0],"to":[16,14,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[8.0,15.0,9.5,16.0]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,15.0,11.0,16.0]},"down":{"texture":"atlas2","uv":[0.0,14.0,8.0,15.5]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,14.0,16.0,15.0]},"south":{"texture":"atlas2","uv":[8.0,3.5,16.0,4.5]}}},{"from":[0,13,8],"to":[16,14,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[4.0,15.5,8.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,15.5,12.0,16.0]},"down":{"texture":"atlas3","uv":[0.0,8.0,8.0,12.0]},"north":{"texture":"atlas1","uv":[8.0,6.0,16.0,6.5]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,15.5,8.0,16.0]}}},{"from":[0,14,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,4.5,16.0,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,5.5,16.0,6.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas4","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,0.0,16.0,1.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,1.0,16.0,2.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/redstone_interface.json b/src/main/resources/assets/oc2/models/block/redstone_interface.json deleted file mode 100644 index 79f39615..00000000 --- a/src/main/resources/assets/oc2/models/block/redstone_interface.json +++ /dev/null @@ -1 +0,0 @@ -{"parent":"block/block","textures":{"atlas0":"oc2:block/redstone_interface/redstone_interface_atlas0","atlas1":"oc2:block/redstone_interface/redstone_interface_atlas1","atlas2":"oc2:block/redstone_interface/redstone_interface_atlas2","atlas3":"oc2:block/redstone_interface/redstone_interface_atlas3","atlas4":"oc2:block/redstone_interface/redstone_interface_atlas4","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,7.5,11.0,8.0]},"west":{"texture":"atlas1","cullface":"west","uv":[11.0,7.5,14.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,8.0,3.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,3.0,8.0,6.0]},"north":{"texture":"atlas0","uv":[0.0,6.0,8.0,6.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,6.5,8.0,7.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas1","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,14.0,16.0,14.5]},"up":{"texture":"atlas2","uv":[8.0,4.5,11.0,6.5]},"down":{"texture":"atlas2","cullface":"down","uv":[11.0,4.5,14.0,6.5]},"north":{"texture":"atlas2","uv":[8.0,11.0,11.0,11.5]},"south":{"texture":"atlas2","uv":[11.0,11.0,14.0,11.5]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,14.5,16.0,15.0]},"west":{"texture":"atlas2","uv":[14.0,15.0,16.0,15.5]},"up":{"texture":"atlas2","uv":[8.0,2.5,11.0,4.5]},"down":{"texture":"atlas2","cullface":"down","uv":[11.0,2.5,14.0,4.5]},"north":{"texture":"atlas2","uv":[8.0,8.5,11.0,9.0]},"south":{"texture":"atlas2","uv":[11.0,8.5,14.0,9.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,0.0,11.0,0.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,0.5,11.0,1.0]},"up":{"texture":"atlas0","uv":[0.0,7.0,8.0,10.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,10.0,8.0,13.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,13.0,8.0,13.5]},"south":{"texture":"atlas0","uv":[0.0,13.5,8.0,14.0]}}},{"from":[0,1,15],"to":[5,3,16],"faces":{"east":{"texture":"atlas0","uv":[15.0,5.0,15.5,6.0]},"west":{"texture":"atlas0","cullface":"west","uv":[15.5,5.0,16.0,6.0]},"up":{"texture":"atlas4","uv":[0.0,4.0,2.5,4.5]},"down":{"texture":"atlas4","uv":[0.0,4.5,2.5,5.0]},"south":{"texture":"atlas4","cullface":"south","uv":[0.0,5.0,2.5,6.0]}}},{"from":[11,1,15],"to":[16,3,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[15.0,6.5,15.5,7.5]},"west":{"texture":"atlas1","uv":[15.5,6.5,16.0,7.5]},"up":{"texture":"atlas4","uv":[0.0,6.0,2.5,6.5]},"down":{"texture":"atlas4","uv":[0.0,6.5,2.5,7.0]},"south":{"texture":"atlas4","cullface":"south","uv":[0.0,7.0,2.5,8.0]}}},{"from":[0,1,11],"to":[16,3,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,4.5,16.0,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,5.5,16.0,6.5]},"up":{"texture":"atlas0","uv":[0.0,14.0,8.0,16.0]},"down":{"texture":"atlas0","uv":[8.0,14.0,16.0,16.0]},"north":{"texture":"atlas0","uv":[8.0,10.0,16.0,11.0]},"south":{"texture":"atlas0","uv":[8.0,11.0,16.0,12.0]}}},{"from":[1,1,5],"to":[15,3,11],"faces":{"east":{"texture":"atlas2","uv":[8.0,1.0,11.0,2.0]},"west":{"texture":"atlas2","uv":[11.0,1.0,14.0,2.0]},"down":{"texture":"atlas3","uv":[8.0,0.0,15.0,3.0]},"north":{"texture":"atlas0","uv":[8.0,5.0,15.0,6.0]},"south":{"texture":"atlas1","uv":[8.0,6.5,15.0,7.5]}}},{"from":[0,1,1],"to":[16,3,5],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,2.5,16.0,3.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,3.5,16.0,4.5]},"up":{"texture":"atlas0","uv":[8.0,7.0,16.0,9.0]},"down":{"texture":"atlas0","uv":[8.0,3.0,16.0,5.0]},"north":{"texture":"atlas0","uv":[8.0,12.0,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,9.0,16.0,10.0]}}},{"from":[0,1,0],"to":[5,3,1],"faces":{"east":{"texture":"atlas2","uv":[14.0,1.0,14.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,1.0,15.0,2.0]},"up":{"texture":"atlas4","uv":[0.0,8.0,2.5,8.5]},"down":{"texture":"atlas4","uv":[0.0,8.5,2.5,9.0]},"north":{"texture":"atlas4","cullface":"north","uv":[0.0,9.0,2.5,10.0]}}},{"from":[11,1,0],"to":[16,3,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,1.0,15.5,2.0]},"west":{"texture":"atlas2","uv":[15.5,1.0,16.0,2.0]},"up":{"texture":"atlas4","uv":[0.0,10.0,2.5,10.5]},"down":{"texture":"atlas4","uv":[0.0,10.5,2.5,11.0]},"north":{"texture":"atlas4","cullface":"north","uv":[0.0,11.0,2.5,12.0]}}},{"from":[0,3,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,0.0,16.0,1.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,1.5,16.0,3.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas1","cullface":"north","uv":[8.0,8.0,16.0,9.5]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,9.5,16.0,11.0]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[15.0,6.5,15.5,8.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,6.5,16.0,8.5]},"up":{"texture":"atlas2","uv":[8.0,2.0,11.0,2.5]},"down":{"texture":"atlas2","uv":[11.0,2.0,14.0,2.5]},"south":{"texture":"atlas3","cullface":"south","uv":[8.0,14.0,11.0,16.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,9.0,15.5,11.0]},"west":{"texture":"atlas2","uv":[15.5,9.0,16.0,11.0]},"up":{"texture":"atlas2","uv":[11.0,0.5,14.0,1.0]},"down":{"texture":"atlas2","uv":[11.0,0.0,14.0,0.5]},"south":{"texture":"atlas3","cullface":"south","uv":[11.0,14.0,14.0,16.0]}}},{"from":[0,6,10],"to":[16,10,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[0.0,12.0,2.5,14.0]},"west":{"texture":"atlas4","cullface":"west","uv":[0.0,14.0,2.5,16.0]},"up":{"texture":"atlas1","uv":[8.0,11.0,16.0,13.5]},"down":{"texture":"atlas1","uv":[8.0,13.5,16.0,16.0]},"north":{"texture":"atlas1","uv":[8.0,0.0,16.0,2.0]},"south":{"texture":"atlas1","uv":[8.0,2.0,16.0,4.0]}}},{"from":[1,6,6],"to":[15,10,10],"faces":{"east":{"texture":"atlas3","uv":[14.0,14.0,16.0,16.0]},"west":{"texture":"atlas3","uv":[14.0,4.0,16.0,6.0]},"up":{"texture":"atlas2","uv":[0.0,14.0,7.0,16.0]},"down":{"texture":"atlas2","uv":[7.0,14.0,14.0,16.0]},"north":{"texture":"atlas2","uv":[8.0,9.0,15.0,11.0]},"south":{"texture":"atlas2","uv":[8.0,6.5,15.0,8.5]}}},{"from":[0,6,1],"to":[16,10,6],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[2.5,14.0,5.0,16.0]},"west":{"texture":"atlas4","cullface":"west","uv":[5.0,14.0,7.5,16.0]},"up":{"texture":"atlas1","uv":[8.0,4.0,16.0,6.5]},"down":{"texture":"atlas2","uv":[0.0,0.0,8.0,2.5]},"north":{"texture":"atlas2","uv":[0.0,2.5,8.0,4.5]},"south":{"texture":"atlas2","uv":[0.0,4.5,8.0,6.5]}}},{"from":[0,6,0],"to":[6,10,1],"faces":{"east":{"texture":"atlas3","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas3","uv":[8.0,3.0,11.0,3.5]},"down":{"texture":"atlas3","uv":[8.0,3.5,11.0,4.0]},"north":{"texture":"atlas3","cullface":"north","uv":[8.0,4.0,11.0,6.0]}}},{"from":[10,6,0],"to":[16,10,1],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[3.0,0.0,3.5,2.0]},"west":{"texture":"atlas4","uv":[3.5,0.0,4.0,2.0]},"up":{"texture":"atlas3","uv":[8.0,6.0,11.0,6.5]},"down":{"texture":"atlas3","uv":[8.0,6.5,11.0,7.0]},"north":{"texture":"atlas3","cullface":"north","uv":[11.0,4.0,14.0,6.0]}}},{"from":[0,10,0],"to":[16,15,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[0.0,6.5,8.0,9.0]},"west":{"texture":"atlas2","cullface":"west","uv":[0.0,9.0,8.0,11.5]},"up":{"texture":"atlas3","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas3","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,11.5,8.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,11.5,16.0,14.0]}}},{"from":[0,15,10],"to":[16,16,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[8.0,7.0,11.0,7.5]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,7.5,11.0,8.0]},"up":{"texture":"atlas3","cullface":"up","uv":[8.0,8.0,16.0,11.0]},"north":{"texture":"atlas0","uv":[8.0,13.5,16.0,14.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,13.5]}}},{"from":[0,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,15.5,16.0,16.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,11.0,16.0,11.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,0.0,3.0,2.0]},"north":{"texture":"atlas3","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas3","uv":[11.0,7.0,14.0,7.5]}}},{"from":[10,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,8.5,16.0,9.0]},"west":{"texture":"atlas2","uv":[14.0,2.0,16.0,2.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas3","uv":[11.0,6.5,14.0,7.0]},"south":{"texture":"atlas3","uv":[11.0,6.0,14.0,6.5]}}},{"from":[0,15,0],"to":[16,16,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[11.0,3.5,14.0,4.0]},"west":{"texture":"atlas3","cullface":"west","uv":[11.0,3.0,14.0,3.5]},"up":{"texture":"atlas3","cullface":"up","uv":[8.0,11.0,16.0,14.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,6.5,16.0,7.0]},"south":{"texture":"atlas0","uv":[8.0,6.0,16.0,6.5]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/block_operations_module.json b/src/main/resources/assets/oc2/models/item/block_operations_module.json deleted file mode 100644 index e6fb8121..00000000 --- a/src/main/resources/assets/oc2/models/item/block_operations_module.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/block_operations_module" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/charger.json b/src/main/resources/assets/oc2/models/item/charger.json deleted file mode 100644 index 07b7176c..00000000 --- a/src/main/resources/assets/oc2/models/item/charger.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/charger" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/circuit_board.json b/src/main/resources/assets/oc2/models/item/circuit_board.json deleted file mode 100644 index 784d3d6d..00000000 --- a/src/main/resources/assets/oc2/models/item/circuit_board.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/circuit_board" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/computer.json b/src/main/resources/assets/oc2/models/item/computer.json deleted file mode 100644 index d49dbf47..00000000 --- a/src/main/resources/assets/oc2/models/item/computer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/computer" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/creative_energy.json b/src/main/resources/assets/oc2/models/item/creative_energy.json deleted file mode 100644 index b9a5c584..00000000 --- a/src/main/resources/assets/oc2/models/item/creative_energy.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/creative_energy" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/disk_drive.json b/src/main/resources/assets/oc2/models/item/disk_drive.json deleted file mode 100644 index 43dcd0f0..00000000 --- a/src/main/resources/assets/oc2/models/item/disk_drive.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/disk_drive" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/file_import_export_card.json b/src/main/resources/assets/oc2/models/item/file_import_export_card.json deleted file mode 100644 index 9584f85b..00000000 --- a/src/main/resources/assets/oc2/models/item/file_import_export_card.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/file_import_export_card" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/flash_memory.json b/src/main/resources/assets/oc2/models/item/flash_memory.json deleted file mode 100644 index 3b6f2a2f..00000000 --- a/src/main/resources/assets/oc2/models/item/flash_memory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/flash_memory" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/flash_memory_flasher.json b/src/main/resources/assets/oc2/models/item/flash_memory_flasher.json deleted file mode 100644 index 4d0591e6..00000000 --- a/src/main/resources/assets/oc2/models/item/flash_memory_flasher.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/flash_memory_flasher" -} diff --git a/src/main/resources/assets/oc2/models/item/floppy.json b/src/main/resources/assets/oc2/models/item/floppy.json deleted file mode 100644 index 44a3c651..00000000 --- a/src/main/resources/assets/oc2/models/item/floppy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/floppy_base", - "layer1": "oc2:item/floppy_tint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/floppy_modern.json b/src/main/resources/assets/oc2/models/item/floppy_modern.json deleted file mode 100644 index 44a3c651..00000000 --- a/src/main/resources/assets/oc2/models/item/floppy_modern.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/floppy_base", - "layer1": "oc2:item/floppy_tint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/hard_drive_custom.json b/src/main/resources/assets/oc2/models/item/hard_drive_custom.json deleted file mode 100644 index 0d9aa83a..00000000 --- a/src/main/resources/assets/oc2/models/item/hard_drive_custom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/hard_drive_base", - "layer1": "oc2:item/hard_drive_tint" - } -} diff --git a/src/main/resources/assets/oc2/models/item/hard_drive_extra_large.json b/src/main/resources/assets/oc2/models/item/hard_drive_extra_large.json deleted file mode 100644 index 327b1241..00000000 --- a/src/main/resources/assets/oc2/models/item/hard_drive_extra_large.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/hard_drive_base", - "layer1": "oc2:item/hard_drive_tint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/hard_drive_large.json b/src/main/resources/assets/oc2/models/item/hard_drive_large.json deleted file mode 100644 index 327b1241..00000000 --- a/src/main/resources/assets/oc2/models/item/hard_drive_large.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/hard_drive_base", - "layer1": "oc2:item/hard_drive_tint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/hard_drive_medium.json b/src/main/resources/assets/oc2/models/item/hard_drive_medium.json deleted file mode 100644 index 327b1241..00000000 --- a/src/main/resources/assets/oc2/models/item/hard_drive_medium.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/hard_drive_base", - "layer1": "oc2:item/hard_drive_tint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/hard_drive_small.json b/src/main/resources/assets/oc2/models/item/hard_drive_small.json deleted file mode 100644 index 327b1241..00000000 --- a/src/main/resources/assets/oc2/models/item/hard_drive_small.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/hard_drive_base", - "layer1": "oc2:item/hard_drive_tint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/inventory_operations_module.json b/src/main/resources/assets/oc2/models/item/inventory_operations_module.json deleted file mode 100644 index 597db1d1..00000000 --- a/src/main/resources/assets/oc2/models/item/inventory_operations_module.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/inventory_operations_module" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/keyboard.json b/src/main/resources/assets/oc2/models/item/keyboard.json deleted file mode 100644 index 3c8c7fac..00000000 --- a/src/main/resources/assets/oc2/models/item/keyboard.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/keyboard" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/manual.json b/src/main/resources/assets/oc2/models/item/manual.json deleted file mode 100644 index 450243b2..00000000 --- a/src/main/resources/assets/oc2/models/item/manual.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/manual" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/memory_large.json b/src/main/resources/assets/oc2/models/item/memory_large.json deleted file mode 100644 index 4007c8b1..00000000 --- a/src/main/resources/assets/oc2/models/item/memory_large.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/memory_large" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/memory_medium.json b/src/main/resources/assets/oc2/models/item/memory_medium.json deleted file mode 100644 index 67f03bd4..00000000 --- a/src/main/resources/assets/oc2/models/item/memory_medium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/memory_medium" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/memory_small.json b/src/main/resources/assets/oc2/models/item/memory_small.json deleted file mode 100644 index 3744a27f..00000000 --- a/src/main/resources/assets/oc2/models/item/memory_small.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/memory_small" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/monitor.json b/src/main/resources/assets/oc2/models/item/monitor.json deleted file mode 100644 index d49dbf47..00000000 --- a/src/main/resources/assets/oc2/models/item/monitor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/computer" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/network_cable.json b/src/main/resources/assets/oc2/models/item/network_cable.json deleted file mode 100644 index 43193234..00000000 --- a/src/main/resources/assets/oc2/models/item/network_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/network_cable" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/network_hub.json b/src/main/resources/assets/oc2/models/item/network_hub.json deleted file mode 100644 index 657ac54b..00000000 --- a/src/main/resources/assets/oc2/models/item/network_hub.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/network_hub" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/network_interface_card.json b/src/main/resources/assets/oc2/models/item/network_interface_card.json deleted file mode 100644 index 63464399..00000000 --- a/src/main/resources/assets/oc2/models/item/network_interface_card.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/network_interface_card" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/network_switch.json b/src/main/resources/assets/oc2/models/item/network_switch.json deleted file mode 100644 index 657bd289..00000000 --- a/src/main/resources/assets/oc2/models/item/network_switch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/network_switch" -} diff --git a/src/main/resources/assets/oc2/models/item/network_tunnel_card.json b/src/main/resources/assets/oc2/models/item/network_tunnel_card.json deleted file mode 100644 index b9588a59..00000000 --- a/src/main/resources/assets/oc2/models/item/network_tunnel_card.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/network_tunnel_card" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/network_tunnel_module.json b/src/main/resources/assets/oc2/models/item/network_tunnel_module.json deleted file mode 100644 index c0490936..00000000 --- a/src/main/resources/assets/oc2/models/item/network_tunnel_module.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/network_tunnel_module" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/pci_card_cage.json b/src/main/resources/assets/oc2/models/item/pci_card_cage.json deleted file mode 100644 index b01fc003..00000000 --- a/src/main/resources/assets/oc2/models/item/pci_card_cage.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/pci_card_cage" -} diff --git a/src/main/resources/assets/oc2/models/item/projector.json b/src/main/resources/assets/oc2/models/item/projector.json deleted file mode 100644 index f40a65a6..00000000 --- a/src/main/resources/assets/oc2/models/item/projector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/projector" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/redstone_interface.json b/src/main/resources/assets/oc2/models/item/redstone_interface.json deleted file mode 100644 index 63064536..00000000 --- a/src/main/resources/assets/oc2/models/item/redstone_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/redstone_interface" -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/redstone_interface_card.json b/src/main/resources/assets/oc2/models/item/redstone_interface_card.json deleted file mode 100644 index a13bee72..00000000 --- a/src/main/resources/assets/oc2/models/item/redstone_interface_card.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/redstone_interface_card" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/sound_card.json b/src/main/resources/assets/oc2/models/item/sound_card.json deleted file mode 100644 index a320642d..00000000 --- a/src/main/resources/assets/oc2/models/item/sound_card.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/sound_card" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/transistor.json b/src/main/resources/assets/oc2/models/item/transistor.json deleted file mode 100644 index 94a0f77d..00000000 --- a/src/main/resources/assets/oc2/models/item/transistor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/transistor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/vxlan_hub.json b/src/main/resources/assets/oc2/models/item/vxlan_hub.json deleted file mode 100644 index eee4e7ff..00000000 --- a/src/main/resources/assets/oc2/models/item/vxlan_hub.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oc2:block/vxlan_hub" -} diff --git a/src/main/resources/assets/oc2/models/item/wrench.json b/src/main/resources/assets/oc2/models/item/wrench.json deleted file mode 100644 index c5361867..00000000 --- a/src/main/resources/assets/oc2/models/item/wrench.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "oc2:item/wrench" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/sounds.json b/src/main/resources/assets/oc2/sounds.json deleted file mode 100644 index fd992f76..00000000 --- a/src/main/resources/assets/oc2/sounds.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "computer_running": { - "category": "block", - "subtitle": "subtitles.oc2.computer", - "sounds": [ - { - "name": "oc2:computer_running", - "stream": true, - "volume": 0.25 - } - ] - }, - "floppy_access": { - "category": "block", - "subtitle": "subtitles.oc2.floppy", - "sounds": [ - "oc2:floppy_access1", - "oc2:floppy_access2", - "oc2:floppy_access3", - "oc2:floppy_access4", - "oc2:floppy_access5", - "oc2:floppy_access6" - ] - }, - "floppy_eject": { - "category": "block", - "subtitle": "subtitles.oc2.floppy_eject", - "sounds": [ - "oc2:floppy_eject" - ] - }, - "floppy_insert": { - "category": "block", - "subtitle": "subtitles.oc2.floppy_insert", - "sounds": [ - "oc2:floppy_insert" - ] - }, - "hdd_access": { - "category": "block", - "subtitle": "subtitles.oc2.hdd", - "sounds": [ - "oc2:hdd_access1", - "oc2:hdd_access2", - "oc2:hdd_access3", - "oc2:hdd_access4", - "oc2:hdd_access5", - "oc2:hdd_access6", - "oc2:hdd_access7" - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/blockstates/bus_cable.json b/src/main/resources/assets/oc2r/blockstates/bus_cable.json similarity index 77% rename from src/main/resources/assets/oc2/blockstates/bus_cable.json rename to src/main/resources/assets/oc2r/blockstates/bus_cable.json index afac4b92..3a529bb3 100644 --- a/src/main/resources/assets/oc2/blockstates/bus_cable.json +++ b/src/main/resources/assets/oc2r/blockstates/bus_cable.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "oc2:block/cable_base" + "model": "oc2r:block/cable_base" } }, { @@ -11,7 +11,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_link", + "model": "oc2r:block/cable_link", "x": -90, "y": 270 } @@ -22,7 +22,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_plug", + "model": "oc2r:block/cable_plug", "x": -90, "y": 270 } @@ -33,7 +33,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_link", + "model": "oc2r:block/cable_link", "x": 90, "y": 270 } @@ -44,7 +44,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_plug", + "model": "oc2r:block/cable_plug", "x": 90, "y": 270 } @@ -55,7 +55,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_link", + "model": "oc2r:block/cable_link", "y": 180 } }, @@ -65,7 +65,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_plug", + "model": "oc2r:block/cable_plug", "y": 180 } }, @@ -75,7 +75,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_link" + "model": "oc2r:block/cable_link" } }, { @@ -84,7 +84,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_plug" + "model": "oc2r:block/cable_plug" } }, { @@ -93,7 +93,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_link", + "model": "oc2r:block/cable_link", "y": 90 } }, @@ -103,7 +103,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_plug", + "model": "oc2r:block/cable_plug", "y": 90 } }, @@ -113,7 +113,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_link", + "model": "oc2r:block/cable_link", "y": 270 } }, @@ -123,9 +123,9 @@ "has_facade": "false" }, "apply": { - "model": "oc2:block/cable_plug", + "model": "oc2r:block/cable_plug", "y": 270 } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2/blockstates/charger.json b/src/main/resources/assets/oc2r/blockstates/charger.json similarity index 54% rename from src/main/resources/assets/oc2/blockstates/charger.json rename to src/main/resources/assets/oc2r/blockstates/charger.json index 77ef6577..34d24703 100644 --- a/src/main/resources/assets/oc2/blockstates/charger.json +++ b/src/main/resources/assets/oc2r/blockstates/charger.json @@ -1,19 +1,19 @@ { "variants": { "facing=north": { - "model": "oc2:block/charger" + "model": "oc2r:block/charger" }, "facing=south": { - "model": "oc2:block/charger", + "model": "oc2r:block/charger", "y": 180 }, "facing=west": { - "model": "oc2:block/charger", + "model": "oc2r:block/charger", "y": 270 }, "facing=east": { - "model": "oc2:block/charger", + "model": "oc2r:block/charger", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2/blockstates/vxlan_hub.json b/src/main/resources/assets/oc2r/blockstates/computer.json similarity index 54% rename from src/main/resources/assets/oc2/blockstates/vxlan_hub.json rename to src/main/resources/assets/oc2r/blockstates/computer.json index c951dc4e..f13155d7 100644 --- a/src/main/resources/assets/oc2/blockstates/vxlan_hub.json +++ b/src/main/resources/assets/oc2r/blockstates/computer.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2:block/vxlan_hub" + "model": "oc2r:block/computer" }, "facing=south": { - "model": "oc2:block/vxlan_hub", + "model": "oc2r:block/computer", "y": 180 }, "facing=west": { - "model": "oc2:block/vxlan_hub", + "model": "oc2r:block/computer", "y": 270 }, "facing=east": { - "model": "oc2:block/vxlan_hub", + "model": "oc2r:block/computer", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/creative_energy.json b/src/main/resources/assets/oc2r/blockstates/creative_energy.json new file mode 100644 index 00000000..75bd6b82 --- /dev/null +++ b/src/main/resources/assets/oc2r/blockstates/creative_energy.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "oc2r:block/creative_energy" + } + } +} diff --git a/src/main/resources/assets/oc2r/blockstates/disk_drive.json b/src/main/resources/assets/oc2r/blockstates/disk_drive.json new file mode 100644 index 00000000..12f20b4f --- /dev/null +++ b/src/main/resources/assets/oc2r/blockstates/disk_drive.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "oc2r:block/disk_drive" + }, + "facing=south": { + "model": "oc2r:block/disk_drive", + "y": 180 + }, + "facing=west": { + "model": "oc2r:block/disk_drive", + "y": 270 + }, + "facing=east": { + "model": "oc2r:block/disk_drive", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json b/src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json new file mode 100644 index 00000000..0b2976cc --- /dev/null +++ b/src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "oc2r:block/flash_memory_flasher" + }, + "facing=south": { + "model": "oc2r:block/flash_memory_flasher", + "y": 180 + }, + "facing=west": { + "model": "oc2r:block/flash_memory_flasher", + "y": 270 + }, + "facing=east": { + "model": "oc2r:block/flash_memory_flasher", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/oc2/blockstates/keyboard.json b/src/main/resources/assets/oc2r/blockstates/keyboard.json similarity index 53% rename from src/main/resources/assets/oc2/blockstates/keyboard.json rename to src/main/resources/assets/oc2r/blockstates/keyboard.json index a31574ff..276023b0 100644 --- a/src/main/resources/assets/oc2/blockstates/keyboard.json +++ b/src/main/resources/assets/oc2r/blockstates/keyboard.json @@ -1,19 +1,19 @@ { "variants": { "facing=north": { - "model": "oc2:block/keyboard" + "model": "oc2r:block/keyboard" }, "facing=south": { - "model": "oc2:block/keyboard", + "model": "oc2r:block/keyboard", "y": 180 }, "facing=west": { - "model": "oc2:block/keyboard", + "model": "oc2r:block/keyboard", "y": 270 }, "facing=east": { - "model": "oc2:block/keyboard", + "model": "oc2r:block/keyboard", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2/blockstates/monitor.json b/src/main/resources/assets/oc2r/blockstates/monitor.json similarity index 55% rename from src/main/resources/assets/oc2/blockstates/monitor.json rename to src/main/resources/assets/oc2r/blockstates/monitor.json index f24d17b1..197642b5 100644 --- a/src/main/resources/assets/oc2/blockstates/monitor.json +++ b/src/main/resources/assets/oc2r/blockstates/monitor.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2:block/monitor" + "model": "oc2r:block/monitor" }, "facing=south": { - "model": "oc2:block/monitor", + "model": "oc2r:block/monitor", "y": 180 }, "facing=west": { - "model": "oc2:block/monitor", + "model": "oc2r:block/monitor", "y": 270 }, "facing=east": { - "model": "oc2:block/monitor", + "model": "oc2r:block/monitor", "y": 90 } } diff --git a/src/main/resources/assets/oc2/blockstates/network_connector.json b/src/main/resources/assets/oc2r/blockstates/network_connector.json similarity index 57% rename from src/main/resources/assets/oc2/blockstates/network_connector.json rename to src/main/resources/assets/oc2r/blockstates/network_connector.json index a4003de3..19baa4c0 100644 --- a/src/main/resources/assets/oc2/blockstates/network_connector.json +++ b/src/main/resources/assets/oc2r/blockstates/network_connector.json @@ -1,57 +1,57 @@ { "variants": { "face=floor,facing=north": { - "model": "oc2:block/network_connector" + "model": "oc2r:block/network_connector" }, "face=wall,facing=north": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 90 }, "face=ceiling,facing=north": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 180, "y": 180 }, "face=floor,facing=south": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "y": 180 }, "face=wall,facing=south": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 90, "y": 180 }, "face=ceiling,facing=south": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 180 }, "face=floor,facing=west": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "y": 270 }, "face=wall,facing=west": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 90, "y": 270 }, "face=ceiling,facing=west": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 180, "y": 90 }, "face=floor,facing=east": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "y": 90 }, "face=wall,facing=east": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 90, "y": 90 }, "face=ceiling,facing=east": { - "model": "oc2:block/network_connector", + "model": "oc2r:block/network_connector", "x": 180, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2/blockstates/network_hub.json b/src/main/resources/assets/oc2r/blockstates/network_hub.json similarity index 52% rename from src/main/resources/assets/oc2/blockstates/network_hub.json rename to src/main/resources/assets/oc2r/blockstates/network_hub.json index a719382f..9e790fa4 100644 --- a/src/main/resources/assets/oc2/blockstates/network_hub.json +++ b/src/main/resources/assets/oc2r/blockstates/network_hub.json @@ -1,19 +1,19 @@ { "variants": { "facing=north": { - "model": "oc2:block/network_hub" + "model": "oc2r:block/network_hub" }, "facing=south": { - "model": "oc2:block/network_hub", + "model": "oc2r:block/network_hub", "y": 180 }, "facing=west": { - "model": "oc2:block/network_hub", + "model": "oc2r:block/network_hub", "y": 270 }, "facing=east": { - "model": "oc2:block/network_hub", + "model": "oc2r:block/network_hub", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2/blockstates/network_switch.json b/src/main/resources/assets/oc2r/blockstates/network_switch.json similarity index 50% rename from src/main/resources/assets/oc2/blockstates/network_switch.json rename to src/main/resources/assets/oc2r/blockstates/network_switch.json index cb558822..eb2f9747 100644 --- a/src/main/resources/assets/oc2/blockstates/network_switch.json +++ b/src/main/resources/assets/oc2r/blockstates/network_switch.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2:block/network_switch" + "model": "oc2r:block/network_switch" }, "facing=south": { - "model": "oc2:block/network_switch", + "model": "oc2r:block/network_switch", "y": 180 }, "facing=west": { - "model": "oc2:block/network_switch", + "model": "oc2r:block/network_switch", "y": 270 }, "facing=east": { - "model": "oc2:block/network_switch", + "model": "oc2r:block/network_switch", "y": 90 } } diff --git a/src/main/resources/assets/oc2/blockstates/pci_card_cage.json b/src/main/resources/assets/oc2r/blockstates/pci_card_cage.json similarity index 54% rename from src/main/resources/assets/oc2/blockstates/pci_card_cage.json rename to src/main/resources/assets/oc2r/blockstates/pci_card_cage.json index 769b106f..e1fe97ee 100644 --- a/src/main/resources/assets/oc2/blockstates/pci_card_cage.json +++ b/src/main/resources/assets/oc2r/blockstates/pci_card_cage.json @@ -1,33 +1,33 @@ { "variants": { "facing=north,lit=false": { - "model": "oc2:block/pci_card_cage" + "model": "oc2r:block/pci_card_cage" }, "facing=south,lit=false": { - "model": "oc2:block/pci_card_cage", + "model": "oc2r:block/pci_card_cage", "y": 180 }, "facing=west,lit=false": { - "model": "oc2:block/pci_card_cage", + "model": "oc2r:block/pci_card_cage", "y": 270 }, "facing=east,lit=false": { - "model": "oc2:block/pci_card_cage", + "model": "oc2r:block/pci_card_cage", "y": 90 }, "facing=north,lit=true": { - "model": "oc2:block/pci_card_cage" + "model": "oc2r:block/pci_card_cage" }, "facing=south,lit=true": { - "model": "oc2:block/pci_card_cage", + "model": "oc2r:block/pci_card_cage", "y": 180 }, "facing=west,lit=true": { - "model": "oc2:block/pci_card_cage", + "model": "oc2r:block/pci_card_cage", "y": 270 }, "facing=east,lit=true": { - "model": "oc2:block/pci_card_cage", + "model": "oc2r:block/pci_card_cage", "y": 90 } } diff --git a/src/main/resources/assets/oc2/blockstates/projector.json b/src/main/resources/assets/oc2r/blockstates/projector.json similarity index 56% rename from src/main/resources/assets/oc2/blockstates/projector.json rename to src/main/resources/assets/oc2r/blockstates/projector.json index ae6b8b51..eebe0ffd 100644 --- a/src/main/resources/assets/oc2/blockstates/projector.json +++ b/src/main/resources/assets/oc2r/blockstates/projector.json @@ -1,34 +1,34 @@ { "variants": { "facing=north,lit=false": { - "model": "oc2:block/projector" + "model": "oc2r:block/projector" }, "facing=south,lit=false": { - "model": "oc2:block/projector", + "model": "oc2r:block/projector", "y": 180 }, "facing=west,lit=false": { - "model": "oc2:block/projector", + "model": "oc2r:block/projector", "y": 270 }, "facing=east,lit=false": { - "model": "oc2:block/projector", + "model": "oc2r:block/projector", "y": 90 }, "facing=north,lit=true": { - "model": "oc2:block/projector" + "model": "oc2r:block/projector" }, "facing=south,lit=true": { - "model": "oc2:block/projector", + "model": "oc2r:block/projector", "y": 180 }, "facing=west,lit=true": { - "model": "oc2:block/projector", + "model": "oc2r:block/projector", "y": 270 }, "facing=east,lit=true": { - "model": "oc2:block/projector", + "model": "oc2r:block/projector", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2r/blockstates/redstone_interface.json b/src/main/resources/assets/oc2r/blockstates/redstone_interface.json new file mode 100644 index 00000000..a37c62e1 --- /dev/null +++ b/src/main/resources/assets/oc2r/blockstates/redstone_interface.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "oc2r:block/redstone_interface" + }, + "facing=south": { + "model": "oc2r:block/redstone_interface", + "y": 180 + }, + "facing=west": { + "model": "oc2r:block/redstone_interface", + "y": 270 + }, + "facing=east": { + "model": "oc2r:block/redstone_interface", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/oc2/blockstates/disk_drive.json b/src/main/resources/assets/oc2r/blockstates/vxlan_hub.json similarity index 53% rename from src/main/resources/assets/oc2/blockstates/disk_drive.json rename to src/main/resources/assets/oc2r/blockstates/vxlan_hub.json index 592da97a..093f5c10 100644 --- a/src/main/resources/assets/oc2/blockstates/disk_drive.json +++ b/src/main/resources/assets/oc2r/blockstates/vxlan_hub.json @@ -1,19 +1,19 @@ { "variants": { "facing=north": { - "model": "oc2:block/disk_drive" + "model": "oc2r:block/vxlan_hub" }, "facing=south": { - "model": "oc2:block/disk_drive", + "model": "oc2r:block/vxlan_hub", "y": 180 }, "facing=west": { - "model": "oc2:block/disk_drive", + "model": "oc2r:block/vxlan_hub", "y": 270 }, "facing=east": { - "model": "oc2:block/disk_drive", + "model": "oc2r:block/vxlan_hub", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2/doc/en_us/basics.md b/src/main/resources/assets/oc2r/doc/en_us/basics.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/basics.md rename to src/main/resources/assets/oc2r/doc/en_us/basics.md diff --git a/src/main/resources/assets/oc2/doc/en_us/block/bus_cable.md b/src/main/resources/assets/oc2r/doc/en_us/block/bus_cable.md similarity index 86% rename from src/main/resources/assets/oc2/doc/en_us/block/bus_cable.md rename to src/main/resources/assets/oc2r/doc/en_us/block/bus_cable.md index 3ca641d8..699ef9cf 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/bus_cable.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/bus_cable.md @@ -1,5 +1,5 @@ # Bus Cable -![Party Bus](block:oc2:bus_cable) +![Party Bus](block:oc2r:bus_cable) The bus cable connects [bus interfaces](bus_interface.md) to a computer. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/bus_interface.md b/src/main/resources/assets/oc2r/doc/en_us/block/bus_interface.md similarity index 94% rename from src/main/resources/assets/oc2/doc/en_us/block/bus_interface.md rename to src/main/resources/assets/oc2r/doc/en_us/block/bus_interface.md index 11cafbc8..bdda5162 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/bus_interface.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/bus_interface.md @@ -1,5 +1,5 @@ # Bus Interface -![Plug and play](item:oc2:bus_interface) +![Plug and play](item:oc2r:bus_interface) Bus interfaces connect external devices to [computers](computer.md). This includes explicit device blocks, such as the [redstone interface](redstone_interface.md). Some generic functionality blocks of blocks is also available, such as information on energy storage. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/charger.md b/src/main/resources/assets/oc2r/doc/en_us/block/charger.md similarity index 80% rename from src/main/resources/assets/oc2/doc/en_us/block/charger.md rename to src/main/resources/assets/oc2r/doc/en_us/block/charger.md index b1388aff..9e3cc579 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/charger.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/charger.md @@ -1,8 +1,8 @@ # Charger -![Codename: Leeroy](block:oc2:charger) +![Codename: Leeroy](block:oc2r:charger) The charger transfers energy from a connected power source to energy consumers on top of it. The employed wireless energy transfer mechanism supports any consumer accepting RF energy. In particular, blocks and entities, as well as items in regular item containers (such as blocks and entities) will be charged. -This device is particularly useful to recharge [robots](../item/robot.md) or energy consuming devices in your inventory. \ No newline at end of file +This device is particularly useful to recharge [robots](../item/robot.md) or energy consuming devices in your inventory. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/computer.md b/src/main/resources/assets/oc2r/doc/en_us/block/computer.md similarity index 96% rename from src/main/resources/assets/oc2/doc/en_us/block/computer.md rename to src/main/resources/assets/oc2r/doc/en_us/block/computer.md index 51dcc1de..dfcf5cbc 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/computer.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/computer.md @@ -1,5 +1,5 @@ # Computer -![1 + 1 = 10](block:oc2:computer) +![1 + 1 = 10](block:oc2r:computer) Computers provide a basis for building hardware capable of running an operating system or low-level software. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/disk_drive.md b/src/main/resources/assets/oc2r/doc/en_us/block/disk_drive.md similarity index 96% rename from src/main/resources/assets/oc2/doc/en_us/block/disk_drive.md rename to src/main/resources/assets/oc2r/doc/en_us/block/disk_drive.md index e655359a..88a972fe 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/disk_drive.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/disk_drive.md @@ -1,5 +1,5 @@ # Disk Drive -![Taking it for a spin](block:oc2:disk_drive) +![Taking it for a spin](block:oc2r:disk_drive) The disk drive provides an option for quick media exchange. [Floppy disks](../item/floppy.md) can be added and removed at runtime, unlike [hard drives](../item/hard_drive.md). diff --git a/src/main/resources/assets/oc2/doc/en_us/block/flash_memory_flasher.md b/src/main/resources/assets/oc2r/doc/en_us/block/flash_memory_flasher.md similarity index 93% rename from src/main/resources/assets/oc2/doc/en_us/block/flash_memory_flasher.md rename to src/main/resources/assets/oc2r/doc/en_us/block/flash_memory_flasher.md index 625c20fe..963b794c 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/flash_memory_flasher.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/flash_memory_flasher.md @@ -1,5 +1,5 @@ # Flash Memory Flasher -![Flashes before your eyes](block:oc2:flash_memory_flasher) +![Flashes before your eyes](block:oc2r:flash_memory_flasher) The memory flasher provides a way to flash custom compiled firmware onto a flash chip for your computer. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/index.md b/src/main/resources/assets/oc2r/doc/en_us/block/index.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/block/index.md rename to src/main/resources/assets/oc2r/doc/en_us/block/index.md diff --git a/src/main/resources/assets/oc2/doc/en_us/block/keyboard.md b/src/main/resources/assets/oc2r/doc/en_us/block/keyboard.md similarity index 95% rename from src/main/resources/assets/oc2/doc/en_us/block/keyboard.md rename to src/main/resources/assets/oc2r/doc/en_us/block/keyboard.md index 730070c9..d344bb67 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/keyboard.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/keyboard.md @@ -1,5 +1,5 @@ # Keyboard -![To click or not to click](block:oc2:keyboard) +![To click or not to click](block:oc2r:keyboard) The keyboard allows key presses to be picked up by [computers](computer.md). Its primary use-case is in combination with a [projector](projector.md), when using a Linux system. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/monitor.md b/src/main/resources/assets/oc2r/doc/en_us/block/monitor.md similarity index 97% rename from src/main/resources/assets/oc2/doc/en_us/block/monitor.md rename to src/main/resources/assets/oc2r/doc/en_us/block/monitor.md index bd4350b1..e2737c43 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/monitor.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/monitor.md @@ -1,5 +1,5 @@ # Monitor -![Monitor](block:oc2:monitor) +![Monitor](block:oc2r:monitor) The monitor, like the projector, provides a framebuffer device to [computers](computer.md). They have a resolution of 640 by 480 pixels, with the color format r5g6b5: 5 bits for the red color component, 6 bits for the green color component and 5 bits for the blue color component. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/network_connector.md b/src/main/resources/assets/oc2r/doc/en_us/block/network_connector.md similarity index 90% rename from src/main/resources/assets/oc2/doc/en_us/block/network_connector.md rename to src/main/resources/assets/oc2r/doc/en_us/block/network_connector.md index c8dcf56d..5da95b0f 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/network_connector.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/network_connector.md @@ -1,5 +1,5 @@ # Network Connector -![The data must flow](block:oc2:network_connector) +![The data must flow](block:oc2r:network_connector) The network connector is a fundamental part for building a network connecting different [computers](computer.md). Use [network cables](../item/network_cable.md) to connect connectors with each other. @@ -7,4 +7,4 @@ Each connector will represent one "hop" for relayed packets. Packets may only tr Note that each connector only supports up to two attached network cables. Chain multiple connectors to increase the range that can be spanned. -Create a simple multi-computer network by chaining the connectors attached to the computers. To create a mesh network, use a [network hub](network_hub.md). The hub connects all attached connectors with each other. \ No newline at end of file +Create a simple multi-computer network by chaining the connectors attached to the computers. To create a mesh network, use a [network hub](network_hub.md). The hub connects all attached connectors with each other. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/network_hub.md b/src/main/resources/assets/oc2r/doc/en_us/block/network_hub.md similarity index 83% rename from src/main/resources/assets/oc2/doc/en_us/block/network_hub.md rename to src/main/resources/assets/oc2r/doc/en_us/block/network_hub.md index 7b799802..f59f734e 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/network_hub.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/network_hub.md @@ -1,4 +1,4 @@ # Network Hub -![One to five](block:oc2:network_hub) +![One to five](block:oc2r:network_hub) -The network hub connects multiple [network connectors](network_connector.md) with each other. It forwards any packet arriving at any attached connector to all other attached connectors. This forwarding operation will consume one hop, reducing the packet's time to live. \ No newline at end of file +The network hub connects multiple [network connectors](network_connector.md) with each other. It forwards any packet arriving at any attached connector to all other attached connectors. This forwarding operation will consume one hop, reducing the packet's time to live. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/projector.md b/src/main/resources/assets/oc2r/doc/en_us/block/projector.md similarity index 96% rename from src/main/resources/assets/oc2/doc/en_us/block/projector.md rename to src/main/resources/assets/oc2r/doc/en_us/block/projector.md index 75f62e73..c3d686d7 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/projector.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/projector.md @@ -1,5 +1,5 @@ # Projector -![Shadow on the wall](block:oc2:projector) +![Shadow on the wall](block:oc2r:projector) The projector provides a framebuffer device to [computers](computer.md). They have a resolution of 640 by 480 pixels, with the color format r5g6b5: 5 bits for the red color component, 6 bits for the green color component and 5 bits for the blue color component. diff --git a/src/main/resources/assets/oc2/doc/en_us/block/redstone_interface.md b/src/main/resources/assets/oc2r/doc/en_us/block/redstone_interface.md similarity index 97% rename from src/main/resources/assets/oc2/doc/en_us/block/redstone_interface.md rename to src/main/resources/assets/oc2r/doc/en_us/block/redstone_interface.md index ab1e28f4..88449cc0 100644 --- a/src/main/resources/assets/oc2/doc/en_us/block/redstone_interface.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/redstone_interface.md @@ -1,5 +1,5 @@ # Redstone Interface -![Everything Red](block:oc2:redstone_interface) +![Everything Red](block:oc2r:redstone_interface) The redstone interface provides an omnidirectional bus to receive and emit redstone signals. @@ -34,4 +34,4 @@ Each face of the block has an indicator for convenience. Side names represent th `getRedstoneOutput(side):number` gets the emitted redstone signal for the specified side. - `side` is a string representing the side to get the output on. See the "Sides" section. -- Returns the number representing the current output signal strength. \ No newline at end of file +- Returns the number representing the current output signal strength. diff --git a/src/main/resources/assets/oc2/doc/en_us/getting_started.md b/src/main/resources/assets/oc2r/doc/en_us/getting_started.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/getting_started.md rename to src/main/resources/assets/oc2r/doc/en_us/getting_started.md diff --git a/src/main/resources/assets/oc2/doc/en_us/index.md b/src/main/resources/assets/oc2r/doc/en_us/index.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/index.md rename to src/main/resources/assets/oc2r/doc/en_us/index.md diff --git a/src/main/resources/assets/oc2/doc/en_us/item/block_operations_module.md b/src/main/resources/assets/oc2r/doc/en_us/item/block_operations_module.md similarity index 95% rename from src/main/resources/assets/oc2/doc/en_us/item/block_operations_module.md rename to src/main/resources/assets/oc2r/doc/en_us/item/block_operations_module.md index 06eb8e1b..89089b15 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/block_operations_module.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/block_operations_module.md @@ -1,5 +1,5 @@ # Block Operations Module -![Break it, quick replace it](item:oc2:block_operations_module) +![Break it, quick replace it](item:oc2r:block_operations_module) The block operations module provides to [robots](robot.md) the ability to break and place blocks in the world. @@ -27,4 +27,4 @@ The side parameter in the following methods represents a direction from the pers - Returns the remaining durability of the module's excavation tool `repair():boolean` attempts to repair the module's excavation tool using materials in the currently selected inventory slot. This method will consume one item at a time. Any regular tool may act as the source for repair materials, such as pickaxes and shovels. The quality of the tool directly effects the amount of durability restored. -- Returns whether some material could be used to repair the module's excavation tool. \ No newline at end of file +- Returns whether some material could be used to repair the module's excavation tool. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/file_import_export_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/file_import_export_card.md similarity index 92% rename from src/main/resources/assets/oc2/doc/en_us/item/file_import_export_card.md rename to src/main/resources/assets/oc2r/doc/en_us/item/file_import_export_card.md index d9da7e21..af000214 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/file_import_export_card.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/file_import_export_card.md @@ -1,5 +1,5 @@ # File Import/Export Card -![Tear down this wall!](item:oc2:file_import_export_card) +![Tear down this wall!](item:oc2r:file_import_export_card) The file import/export card allows breaking the fourth wall. It allows: - uploading files from your real computer into a virtual [computer](../block/computer.md). @@ -11,4 +11,4 @@ For added convenience, the default Linux distribution provides two utility scrip `export.lua` takes as its parameter the path to a file in a virtual computer. It then downloads this file to your real computer and offers a save dialog, offering the choice of where to save the downloaded file, or to cancel the operation. -Both scripts will prompt all users currently interacting with the computer's terminal. For upload operations (`import.lua`), the first uploaded file will be used. The prompts on other clients will be canceled. For download operations all clients will be offered to save the exported file. \ No newline at end of file +Both scripts will prompt all users currently interacting with the computer's terminal. For upload operations (`import.lua`), the first uploaded file will be used. The prompts on other clients will be canceled. For download operations all clients will be offered to save the exported file. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/flash_memory.md b/src/main/resources/assets/oc2r/doc/en_us/item/flash_memory.md similarity index 77% rename from src/main/resources/assets/oc2/doc/en_us/item/flash_memory.md rename to src/main/resources/assets/oc2r/doc/en_us/item/flash_memory.md index 718acf5d..d089e1a1 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/flash_memory.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/flash_memory.md @@ -1,4 +1,4 @@ # Flash Memory -![Not that Flash](item:oc2:flash_memory) +![Not that Flash](item:oc2r:flash_memory) -Flash memory contains the initial code loaded into a [computer's](../block/computer.md) memory upon boot. This typically at least includes the firmware for the system. The default firmware provided with new computers and [robots](robot.md) also contains a Linux kernel. This kernel expects a root filesystem to be present on the first [hard drive](hard_drive.md) in the system. \ No newline at end of file +Flash memory contains the initial code loaded into a [computer's](../block/computer.md) memory upon boot. This typically at least includes the firmware for the system. The default firmware provided with new computers and [robots](robot.md) also contains a Linux kernel. This kernel expects a root filesystem to be present on the first [hard drive](hard_drive.md) in the system. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/floppy.md b/src/main/resources/assets/oc2r/doc/en_us/item/floppy.md similarity index 73% rename from src/main/resources/assets/oc2/doc/en_us/item/floppy.md rename to src/main/resources/assets/oc2r/doc/en_us/item/floppy.md index 56827b17..af651b1e 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/floppy.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/floppy.md @@ -1,6 +1,6 @@ # Floppy -![It's not the floppy that bends](item:oc2:floppy) +![It's not the floppy that bends](item:oc2r:floppy) Floppy disks are removable media. This means they can be inserted and removed from [disk drives](../block/disk_drive.md) without the [computer](../block/disk_drive.md) using the disk drive having to reboot to use them. -Please see the [disk drive](../block/disk_drive.md) manual entry for some useful commands when working with floppies. \ No newline at end of file +Please see the [disk drive](../block/disk_drive.md) manual entry for some useful commands when working with floppies. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/hard_drive.md b/src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md similarity index 86% rename from src/main/resources/assets/oc2/doc/en_us/item/hard_drive.md rename to src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md index 68e90fa0..bdbe90bf 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/hard_drive.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md @@ -1,8 +1,8 @@ # Hard Drive -![Going in circles](item:oc2:hard_drive_large) +![Going in circles](item:oc2r:hard_drive_large) Hard drives are the main storage device used for data storage in [computers](../block/computer.md) and [robots](robot.md). Usually computers use a firmware that requires some hard drive to complete the boot process. The [flash memory](flash_memory.md) installed in newly obtained computers and robots contains a Linux distribution expecting a regular root file system on the first installed disk drive. One may typically be obtained by configuring a hard drive with the [appropriate tool](wrench.md). -Computers *have to be shut down* before installing or removing this component. Installing it while the computer is running will have no effect, removing it may lead to system errors. \ No newline at end of file +Computers *have to be shut down* before installing or removing this component. Installing it while the computer is running will have no effect, removing it may lead to system errors. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/index.md b/src/main/resources/assets/oc2r/doc/en_us/item/index.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/item/index.md rename to src/main/resources/assets/oc2r/doc/en_us/item/index.md diff --git a/src/main/resources/assets/oc2/doc/en_us/item/inventory_operations_module.md b/src/main/resources/assets/oc2r/doc/en_us/item/inventory_operations_module.md similarity index 96% rename from src/main/resources/assets/oc2/doc/en_us/item/inventory_operations_module.md rename to src/main/resources/assets/oc2r/doc/en_us/item/inventory_operations_module.md index 1401a8bd..95a6020c 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/inventory_operations_module.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/inventory_operations_module.md @@ -1,5 +1,5 @@ # Inventory Operations Module -![What's yours is mine](item:oc2:inventory_operations_module) +![What's yours is mine](item:oc2r:inventory_operations_module) The inventory operations module provides to [robots](robot.md) the ability to insert and extract items from inventories in the world. This supports both block and entity inventories. @@ -40,4 +40,4 @@ The side parameter in the following methods represents a direction from the pers - `fromSlot` is the slot to take the items from. - `count` is the number of items to take. - `side` is the relative direction to take the items from. Optional, defaults to `front`. See the "Sides" section. -- Returns the number of items taken. \ No newline at end of file +- Returns the number of items taken. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/manual.md b/src/main/resources/assets/oc2r/doc/en_us/item/manual.md similarity index 73% rename from src/main/resources/assets/oc2/doc/en_us/item/manual.md rename to src/main/resources/assets/oc2r/doc/en_us/item/manual.md index b53f4b17..d26b84b1 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/manual.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/manual.md @@ -1,6 +1,6 @@ # The Computerists Handbook -![Nobody reads me anyway...](item:oc2:manual) +![Nobody reads me anyway...](item:oc2r:manual) You handy quick-reference for all topics concerning [computers](../block/computer.md) and devices related to them. It's what you're currently reading! -For convenience, using the manual on any known block in the world will open the corresponding manual page. \ No newline at end of file +For convenience, using the manual on any known block in the world will open the corresponding manual page. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/memory.md b/src/main/resources/assets/oc2r/doc/en_us/item/memory.md similarity index 87% rename from src/main/resources/assets/oc2/doc/en_us/item/memory.md rename to src/main/resources/assets/oc2r/doc/en_us/item/memory.md index f2040d43..7875cffe 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/memory.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/memory.md @@ -1,5 +1,5 @@ # Memory -![Random Access Memories](item:oc2:memory_large) +![Random Access Memories](item:oc2r:memory_large) The random access memory (RAM) device provides working memory to [computers](../block/computer.md) and [robots](robot.md). @@ -7,4 +7,4 @@ As opposed to [hard drives](hard_drive.md), this memory is volatile and will be Also see the [getting started](../getting_started.md) manual entry. -Computers *have to be shut down* before installing or removing this component. Installing it while the computer is running will have no effect, removing it may lead to system errors. \ No newline at end of file +Computers *have to be shut down* before installing or removing this component. Installing it while the computer is running will have no effect, removing it may lead to system errors. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/network_cable.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md similarity index 87% rename from src/main/resources/assets/oc2/doc/en_us/item/network_cable.md rename to src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md index 500b2b29..e06e1308 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/network_cable.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md @@ -1,6 +1,6 @@ # Network Cable -![What the CAT!?](item:oc2:network_cable) +![What the CAT!?](item:oc2r:network_cable) Network cables connect pairs of [network connectors](../block/network_connector.md). This makes it possible to conveniently bridge large distances. To place a network cable, use it on the two network connectors to connect, one after the other. -Cables have a maximum length. It may be necessary to use network connectors as repeaters to increase the effective range of network cables. \ No newline at end of file +Cables have a maximum length. It may be necessary to use network connectors as repeaters to increase the effective range of network cables. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/network_interface_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_interface_card.md similarity index 94% rename from src/main/resources/assets/oc2/doc/en_us/item/network_interface_card.md rename to src/main/resources/assets/oc2r/doc/en_us/item/network_interface_card.md index 1e3a307e..5f512306 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/network_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/network_interface_card.md @@ -1,5 +1,5 @@ # Network Interface Card -![Talk to strangers](item:oc2:network_interface_card) +![Talk to strangers](item:oc2r:network_interface_card) The network interface card (NIC) allows [computers](../block/computer.md) to send messages to and receive messages from [network connectors](../block/network_connector.md) attached to the computer. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_card.md similarity index 95% rename from src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_card.md rename to src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_card.md index 3b91fdf6..9c6fb1c3 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_card.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_card.md @@ -1,5 +1,5 @@ # Network Tunnel Card -![Tunnel vision?](item:oc2:network_tunnel_card) +![Tunnel vision?](item:oc2r:network_tunnel_card) The network tunnel card allows [computers](../block/computer.md) to send messages to and receive messages from another tunnel device (tunnel cards and [tunnel modules](network_tunnel_module.md)) linked to the card. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_module.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_module.md similarity index 95% rename from src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_module.md rename to src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_module.md index c1544cf1..d1152a94 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_module.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_module.md @@ -1,5 +1,5 @@ # Network Tunnel Module -![Tunnel vision?](item:oc2:network_tunnel_module) +![Tunnel vision?](item:oc2r:network_tunnel_module) The network tunnel module allows [robots](robot.md) to send messages to and receive messages from another tunnel device (tunnel modules and [tunnel cards](network_tunnel_card.md)) linked to the module. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/redstone_interface_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md similarity index 88% rename from src/main/resources/assets/oc2/doc/en_us/item/redstone_interface_card.md rename to src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md index c2b2c435..ceb04b5c 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/redstone_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md @@ -1,8 +1,8 @@ # Redstone Interface Card -![Got signal?](item:oc2:redstone_interface_card) +![Got signal?](item:oc2r:redstone_interface_card) The redstone interface card is a more compact version of the [redstone interface block](../block/redstone_interface.md). It enables users to build more compact designs. The general functionality is identical to the block version. The front of the [computer](../block/computer.md) represents the primary face as described in the redstone interface block's manual entry. -The API of this device is identical to that of the redstone interface block. \ No newline at end of file +The API of this device is identical to that of the redstone interface block. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/robot.md b/src/main/resources/assets/oc2r/doc/en_us/item/robot.md similarity index 98% rename from src/main/resources/assets/oc2/doc/en_us/item/robot.md rename to src/main/resources/assets/oc2r/doc/en_us/item/robot.md index ce22dd1e..a29536ca 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/robot.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/robot.md @@ -1,5 +1,5 @@ # Robot -![I, for one, welcome our new robot overlords](item:oc2:robot) +![I, for one, welcome our new robot overlords](item:oc2r:robot) Robots are essentially mobile [computers](../block/computer.md). Due to their non-stationary nature, there is some behavior that differs from regular computers. They cannot connect to [bus interfaces](../block/bus_interface.md). Instead of card devices, they support module devices. These are specialized devices taking into account the robots' mobility. @@ -97,4 +97,4 @@ This is a Lua library. It can be used in the default Linux distribution. For exa - Returns whether the operation was successfully. `turnAsync(direction)` tries to asynchronously turn into the specified direction. Blocks until the action was successfully enqueued. -- `direction` is the direction to turn towards. \ No newline at end of file +- `direction` is the direction to turn towards. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/sound_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/sound_card.md similarity index 96% rename from src/main/resources/assets/oc2/doc/en_us/item/sound_card.md rename to src/main/resources/assets/oc2r/doc/en_us/item/sound_card.md index 526401c8..80e511eb 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/sound_card.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/sound_card.md @@ -1,5 +1,5 @@ # Sound Card -![Less sound of silence](item:oc2:sound_card) +![Less sound of silence](item:oc2r:sound_card) The sound card enables playing back various sound effects from its vast library of life-like samples. Due to internal engineering constraints, playback of sequential effects requires a small pause. Attempts to play back additional effects in this time window will have no effect. @@ -20,4 +20,4 @@ Device name: `sound` `findSound(name:string):table` returns a list of available sound effects matching the given name. Note that the number of results is limited, so overly generic queries will result in truncated results. - `name` the name query to search for. -- Returns a list of sound effect names matching the query string. \ No newline at end of file +- Returns a list of sound effect names matching the query string. diff --git a/src/main/resources/assets/oc2/doc/en_us/item/wrench.md b/src/main/resources/assets/oc2r/doc/en_us/item/wrench.md similarity index 80% rename from src/main/resources/assets/oc2/doc/en_us/item/wrench.md rename to src/main/resources/assets/oc2r/doc/en_us/item/wrench.md index 061e029f..78f3e6f1 100644 --- a/src/main/resources/assets/oc2/doc/en_us/item/wrench.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/wrench.md @@ -1,8 +1,8 @@ # Scrench -![Screw it!](item:oc2:wrench) +![Screw it!](item:oc2r:wrench) The wrench-screwdriver multi-tool, nicknamed "Scrench", can be used to directly access the configuration of some blocks, such as [computers](../block/computer.md). It is required to configure some devices such as [bus interfaces](../block/bus_interface.md). It may also be used to quickly dismantle some devices, such as [cables](../block/bus_cable.md). -This tool can also be used to remove facades from cables. \ No newline at end of file +This tool can also be used to remove facades from cables. diff --git a/src/main/resources/assets/oc2/doc/en_us/networking.md b/src/main/resources/assets/oc2r/doc/en_us/networking.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/networking.md rename to src/main/resources/assets/oc2r/doc/en_us/networking.md diff --git a/src/main/resources/assets/oc2/doc/en_us/robotics.md b/src/main/resources/assets/oc2r/doc/en_us/robotics.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/robotics.md rename to src/main/resources/assets/oc2r/doc/en_us/robotics.md diff --git a/src/main/resources/assets/oc2/doc/en_us/scripting.md b/src/main/resources/assets/oc2r/doc/en_us/scripting.md similarity index 100% rename from src/main/resources/assets/oc2/doc/en_us/scripting.md rename to src/main/resources/assets/oc2r/doc/en_us/scripting.md diff --git a/src/main/resources/assets/oc2/doc/img/getting_started_basics.png b/src/main/resources/assets/oc2r/doc/img/getting_started_basics.png similarity index 100% rename from src/main/resources/assets/oc2/doc/img/getting_started_basics.png rename to src/main/resources/assets/oc2r/doc/img/getting_started_basics.png diff --git a/src/main/resources/assets/oc2/doc/img/getting_started_energy.png b/src/main/resources/assets/oc2r/doc/img/getting_started_energy.png similarity index 100% rename from src/main/resources/assets/oc2/doc/img/getting_started_energy.png rename to src/main/resources/assets/oc2r/doc/img/getting_started_energy.png diff --git a/src/main/resources/assets/oc2/doc/img/getting_started_inventory.png b/src/main/resources/assets/oc2r/doc/img/getting_started_inventory.png similarity index 100% rename from src/main/resources/assets/oc2/doc/img/getting_started_inventory.png rename to src/main/resources/assets/oc2r/doc/img/getting_started_inventory.png diff --git a/src/main/resources/assets/oc2/doc/img/getting_started_login.png b/src/main/resources/assets/oc2r/doc/img/getting_started_login.png similarity index 100% rename from src/main/resources/assets/oc2/doc/img/getting_started_login.png rename to src/main/resources/assets/oc2r/doc/img/getting_started_login.png diff --git a/src/main/resources/assets/oc2/doc/img/scripting_lamp.png b/src/main/resources/assets/oc2r/doc/img/scripting_lamp.png similarity index 100% rename from src/main/resources/assets/oc2/doc/img/scripting_lamp.png rename to src/main/resources/assets/oc2r/doc/img/scripting_lamp.png diff --git a/src/main/resources/assets/oc2/doc/img/scripting_lua_interactive.png b/src/main/resources/assets/oc2r/doc/img/scripting_lua_interactive.png similarity index 100% rename from src/main/resources/assets/oc2/doc/img/scripting_lua_interactive.png rename to src/main/resources/assets/oc2r/doc/img/scripting_lua_interactive.png diff --git a/src/main/resources/assets/oc2/doc/img/scripting_redstone_interface.png b/src/main/resources/assets/oc2r/doc/img/scripting_redstone_interface.png similarity index 100% rename from src/main/resources/assets/oc2/doc/img/scripting_redstone_interface.png rename to src/main/resources/assets/oc2r/doc/img/scripting_redstone_interface.png diff --git a/src/main/resources/assets/oc2/doc/ru_ru/basics.md b/src/main/resources/assets/oc2r/doc/ru_ru/basics.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/basics.md rename to src/main/resources/assets/oc2r/doc/ru_ru/basics.md diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/bus_cable.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md similarity index 79% rename from src/main/resources/assets/oc2/doc/ru_ru/block/bus_cable.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md index 982c5575..a167a730 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/bus_cable.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md @@ -1,6 +1,6 @@ # Интерфейсный кабель -![Внутри бегают байтики](block:oc2:bus_cable) +![Внутри бегают байтики](block:oc2r:bus_cable) Интерфейсный кабель соединяет [интерфейсные шины](bus_interface.md) других устройств с интерфейсной шиной компьютера. -Кабели могут быть замаскированы, если кликнуть по ним любым декоративным блоком. Удаление блока производится [ключом](../item/wrench.md). \ No newline at end of file +Кабели могут быть замаскированы, если кликнуть по ним любым декоративным блоком. Удаление блока производится [ключом](../item/wrench.md). diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/bus_interface.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_interface.md similarity index 95% rename from src/main/resources/assets/oc2/doc/ru_ru/block/bus_interface.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/bus_interface.md index 935ad611..d177dcc0 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/bus_interface.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_interface.md @@ -1,5 +1,5 @@ # Интерфейсная шина -![Plug and play](item:oc2:bus_interface) +![Plug and play](item:oc2r:bus_interface) Интерфейсные шины позволяют соединять внешние устройства с [компьютерами](computer.md). Помимо компьютеров, шина присоединяется и к блокам-устройствам, вроде [красного интерфейса](redstone_interface.md). diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/charger.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md similarity index 92% rename from src/main/resources/assets/oc2/doc/ru_ru/block/charger.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md index b021c9d2..0412c31c 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/charger.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md @@ -1,8 +1,8 @@ # Зарядное устройство -![Кодовое имя: Лирой](block:oc2:charger) +![Кодовое имя: Лирой](block:oc2r:charger) Зарядное устройство передает энергию от подключенного источника питания к потребителю, установленному сверху. Установленная система беспроводной передачи энергии поддерживает любые источники RF энергии. Устройство заряжает блоки и сущности, установленные непосредственно на него или находящиеся в контейнере на зарядном устройстве. -Устройство особенно необходимо для зарядки [роботов](../item/robot.md) или иных потребителей энергии в вашем инвентаре. \ No newline at end of file +Устройство особенно необходимо для зарядки [роботов](../item/robot.md) или иных потребителей энергии в вашем инвентаре. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/computer.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/computer.md similarity index 96% rename from src/main/resources/assets/oc2/doc/ru_ru/block/computer.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/computer.md index 4278866f..0c78a161 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/computer.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/computer.md @@ -1,5 +1,5 @@ # Компьютер -![1 + 1 = 10](block:oc2:computer) +![1 + 1 = 10](block:oc2r:computer) Компьютер является основой для аппаратного обеспечения, необходимого для запуска операционной системы и низкоуровневых программ. @@ -12,4 +12,4 @@ Для подключения внешних устройств к компьютеру воспользуйтесь [интерфейсными шинами](bus_interface.md) и [интерфейсным кабелем](bus_cable.md). Обратите внимание, что компьютеры нужно подключать к кабелю интерфейсной шиной. ### Энергия -Обычно компьютеры требуют энергию для запуска. Современные генераторы, производящие RF энергию, должны подойти. Компьютеры имеют маленькое встроенное энергохранилище. Однако, его не хватает даже на небольшой срок работы. \ No newline at end of file +Обычно компьютеры требуют энергию для запуска. Современные генераторы, производящие RF энергию, должны подойти. Компьютеры имеют маленькое встроенное энергохранилище. Однако, его не хватает даже на небольшой срок работы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/disk_drive.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/disk_drive.md similarity index 96% rename from src/main/resources/assets/oc2/doc/ru_ru/block/disk_drive.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/disk_drive.md index 4eece4c7..4dc09b42 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/disk_drive.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/disk_drive.md @@ -1,5 +1,5 @@ # Дисковод -![Он заставляет дискеты крутиться](block:oc2:disk_drive) +![Он заставляет дискеты крутиться](block:oc2r:disk_drive) Дисковод предоставляет функцию быстрого обмена файлами на носителях. [Дискеты](../item/floppy.md) можно вставлять и извлекать в любое время, в отличие от [жестких дисков](../item/hard_drive.md). @@ -10,4 +10,4 @@ - `mount /dev/vdX ` для монтирования дискеты. - `umount ` для демонтирования дискеты. -Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/index.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/index.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/block/index.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/index.md diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/keyboard.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md similarity index 96% rename from src/main/resources/assets/oc2/doc/ru_ru/block/keyboard.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md index 9566a339..960ba9cd 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/keyboard.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md @@ -1,5 +1,5 @@ # Клавиатура -![Нажимать или не нажимать, вот в чем вопрос](block:oc2:keyboard) +![Нажимать или не нажимать, вот в чем вопрос](block:oc2r:keyboard) Клавиатура передает нажатия клавиш [компьютеру](computer.md). Она может использоваться совместно с [проектором](projector.md), когда на компьютере запущен Linux. @@ -9,4 +9,4 @@ Чтобы начать печатать на клавиатуре, нажмите на нее кнопкой "использовать". Опытные наборщики текста могут заметить, что при печати смотреть на клавиши не нужно (вы свободно можете смотреть по сторонам при использовании клавиатуры). Для выхода из режима печати используется та же кнопка. -Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/network_connector.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/network_connector.md similarity index 89% rename from src/main/resources/assets/oc2/doc/ru_ru/block/network_connector.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/network_connector.md index abcbe45a..fe1cc7a8 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/network_connector.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/network_connector.md @@ -1,5 +1,5 @@ # Сетевой разъем -![Данные должны двигаться](block:oc2:network_connector) +![Данные должны двигаться](block:oc2r:network_connector) Сетевой разъем является одним из основных деталей для [компьютерных](computer.md) сетей. Используйте [сетевые кабели](../item/network_cable.md) для соединения разъемов между собой. @@ -7,4 +7,4 @@ К одному разъему можно подключить не больше двух кабелей, но вы можете сделать цепочку из разъемов для преодоления этого ограничения. -Создайте простую сеть, присоединив разъемы к компьютерам. Для создания сложных сетей воспользуйтесь [сетевым концентратором](network_hub.md). Концентратор соединяет все подключенные к нему разъемы между собой. \ No newline at end of file +Создайте простую сеть, присоединив разъемы к компьютерам. Для создания сложных сетей воспользуйтесь [сетевым концентратором](network_hub.md). Концентратор соединяет все подключенные к нему разъемы между собой. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/network_hub.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/network_hub.md similarity index 86% rename from src/main/resources/assets/oc2/doc/ru_ru/block/network_hub.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/network_hub.md index 28cabe31..edaf818f 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/network_hub.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/network_hub.md @@ -1,4 +1,4 @@ # Сетевой концентратор -![От одного до пяти](block:oc2:network_hub) +![От одного до пяти](block:oc2r:network_hub) -Сетевой концентратор соединяет между собой несколько [сетевых разъемов](network_connector.md). Он рассылает пакет, пришедший с одного разъема, на остальные. Операция рассылки занимает один прыжок, снижая время жизни пакета. \ No newline at end of file +Сетевой концентратор соединяет между собой несколько [сетевых разъемов](network_connector.md). Он рассылает пакет, пришедший с одного разъема, на остальные. Операция рассылки занимает один прыжок, снижая время жизни пакета. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/projector.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md similarity index 95% rename from src/main/resources/assets/oc2/doc/ru_ru/block/projector.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md index ba9c898e..f6d73b6d 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/projector.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md @@ -1,5 +1,5 @@ # Проектор -![Тень на стене](block:oc2:projector) +![Тень на стене](block:oc2r:projector) Проектор предоставляет [компьютеру](computer.md) устройство framebuffer. Оно имеет разрешение 640 на 480 пикселей, с цветовым форматом r5g6b5: 5 битов на красный, 6 битов на зеленый и 5 битов на синий. @@ -9,4 +9,4 @@ При использовании стандартного дистрибутива Linux, возможно использование [клавиатуры](keyboard.md), для передачи нажатий в виртуальный терминал, подключенный к первому framebuffer устройству. -Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/block/redstone_interface.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/redstone_interface.md similarity index 97% rename from src/main/resources/assets/oc2/doc/ru_ru/block/redstone_interface.md rename to src/main/resources/assets/oc2r/doc/ru_ru/block/redstone_interface.md index a41aa349..123cce07 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/block/redstone_interface.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/redstone_interface.md @@ -1,5 +1,5 @@ # Красный интерфейс -![Весь красный](block:oc2:redstone_interface) +![Весь красный](block:oc2r:redstone_interface) Красный интерфейс предоставляет двунаправленную шину для получения и излучения красного сигнала. @@ -34,4 +34,4 @@ `getRedstoneOutput(side):number` возвращает уровень красного сигнала, излучаемого с указанной стороны. - `side` - строка, указывающая на сторону, сигнал с которой нужно получить. Смотрите в раздел "Стороны". -- Возвращает числовой уровень текущего сигнала на выходе. \ No newline at end of file +- Возвращает числовой уровень текущего сигнала на выходе. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/getting_started.md b/src/main/resources/assets/oc2r/doc/ru_ru/getting_started.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/getting_started.md rename to src/main/resources/assets/oc2r/doc/ru_ru/getting_started.md diff --git a/src/main/resources/assets/oc2/doc/ru_ru/index.md b/src/main/resources/assets/oc2r/doc/ru_ru/index.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/index.md rename to src/main/resources/assets/oc2r/doc/ru_ru/index.md diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/block_operations_module.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/block_operations_module.md similarity index 95% rename from src/main/resources/assets/oc2/doc/ru_ru/item/block_operations_module.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/block_operations_module.md index 05ec2eaf..d34d0240 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/block_operations_module.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/block_operations_module.md @@ -1,5 +1,5 @@ # Модуль управления блоками -![Сломай и быстро замени](item:oc2:block_operations_module) +![Сломай и быстро замени](item:oc2r:block_operations_module) Модуль управления блоками позволяет [роботам](robot.md) ломать и ставить блоки в игровом мире. @@ -27,4 +27,4 @@ - Возвращает оставшуюся прочность модуля в числовом виде. `repair():boolean` пытается починить модуль, используя материалы в текущем слоте. Метод берет по одному предмету за раз. Источником материала может служить любой добывающий инструмент вроде кирки или лопаты. Качество предмета напрямую влияет на количество восстанавливаемой прочности модуля. -- Возвращает статус успешности починки (`true` - удача, `false` - неудача). \ No newline at end of file +- Возвращает статус успешности починки (`true` - удача, `false` - неудача). diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/file_import_export_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/file_import_export_card.md similarity index 95% rename from src/main/resources/assets/oc2/doc/ru_ru/item/file_import_export_card.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/file_import_export_card.md index e9fd6f88..b1f26dda 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/file_import_export_card.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/file_import_export_card.md @@ -1,5 +1,5 @@ # Карта импорта/экспорта файлов -![Разрушим эту стену!](item:oc2:file_import_export_card) +![Разрушим эту стену!](item:oc2r:file_import_export_card) Карта импорта/экспорта файлов напрочь ломает четвертую стену. Она позволяет: - выгружать файлы с вашего реального ПК на [компьютеры](../block/computer.md) из мода. @@ -11,4 +11,4 @@ `export.lua` в качестве первого параметра принимает название файла, который необходимо выгрузить на реальный компьютер. После выгрузки откроется диалог сохранения, где можно выбрать, куда сохранять файл, или, если нужно, отменить процесс. -Оба скрипта приглашат в диалог всех пользователей, в данный момент работающих с виртуальным компьютером. Для операции импорта (`import.lua`) будет использован первый выбранный файл, а файлы остальных клиентов будут проигнорированы. Для операции экспорта у всех пользователей откроется диалог для сохранения файла на реальный компьютер. \ No newline at end of file +Оба скрипта приглашат в диалог всех пользователей, в данный момент работающих с виртуальным компьютером. Для операции импорта (`import.lua`) будет использован первый выбранный файл, а файлы остальных клиентов будут проигнорированы. Для операции экспорта у всех пользователей откроется диалог для сохранения файла на реальный компьютер. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/flash_memory.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/flash_memory.md similarity index 89% rename from src/main/resources/assets/oc2/doc/ru_ru/item/flash_memory.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/flash_memory.md index 710bf7ca..89fb7d87 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/flash_memory.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/flash_memory.md @@ -1,4 +1,4 @@ # Карта памяти -![К бумажным картам отношения не имеет](item:oc2:flash_memory) +![К бумажным картам отношения не имеет](item:oc2r:flash_memory) -Карта памяти содержит загрузочный код, загружаемый в [компьютерную](../block/computer.md) память при его старте. Проще говоря, она содержит прошивку для компьютера. Прошивка, поставляемая с новыми компьютерами и [роботами](robot.md) содержит в себе ядро Linux. Ядро загружает корневую файловую систему, хранящуюся на первом [жестком диске](hard_drive.md) в системе. \ No newline at end of file +Карта памяти содержит загрузочный код, загружаемый в [компьютерную](../block/computer.md) память при его старте. Проще говоря, она содержит прошивку для компьютера. Прошивка, поставляемая с новыми компьютерами и [роботами](robot.md) содержит в себе ядро Linux. Ядро загружает корневую файловую систему, хранящуюся на первом [жестком диске](hard_drive.md) в системе. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/floppy.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md similarity index 88% rename from src/main/resources/assets/oc2/doc/ru_ru/item/floppy.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md index 55ffcb87..01d335ab 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/floppy.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md @@ -1,6 +1,6 @@ # Дискета -![Лучше не гните ее](item:oc2:floppy) +![Лучше не гните ее](item:oc2r:floppy) Дискета является сменным носителем. Это значит, что их можно менять в [дисководе](../block/disk_drive.md) не перезагружая [компьютер](../block/disk_drive.md). -Загляните в раздел по [дисководу](../block/disk_drive.md), в нем содержатся полезные команды для работы с дискетами в Linux. \ No newline at end of file +Загляните в раздел по [дисководу](../block/disk_drive.md), в нем содержатся полезные команды для работы с дискетами в Linux. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/hard_drive.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md similarity index 92% rename from src/main/resources/assets/oc2/doc/ru_ru/item/hard_drive.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md index 1a431182..743dd621 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/hard_drive.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md @@ -1,8 +1,8 @@ # Жесткий диск -![Начинает крутиться](item:oc2:hard_drive_large) +![Начинает крутиться](item:oc2r:hard_drive_large) Жесткие диски являются основным файловым хранилищем в [компьютерах](../block/computer.md) и [роботах](robot.md). Обычно прошивка компьютера для успешной загрузки требует некоторое дисковое пространство. [Карта памяти](flash_memory.md), установленная в новые компьютеры и роботы, содержит в себе ядро Linux, монтирующее корневую файловую систему с первого жесткого диска. Создать необходимый диск можно, положив обычный жесткий диск на крафт вместе с [ключом](wrench.md). -Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/index.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/index.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/item/index.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/index.md diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/inventory_operations_module.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/inventory_operations_module.md similarity index 97% rename from src/main/resources/assets/oc2/doc/ru_ru/item/inventory_operations_module.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/inventory_operations_module.md index ae618534..60f46a07 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/inventory_operations_module.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/inventory_operations_module.md @@ -1,5 +1,5 @@ # Модуль управления инвентарем -![Что твое, то мое](item:oc2:inventory_operations_module) +![Что твое, то мое](item:oc2r:inventory_operations_module) Модуль управления инвентарем позволяет [роботам](robot.md) брать и выкидывать предметы из своего инвентаря. Это касается как предметов, так и блоков. @@ -40,4 +40,4 @@ - `intoSlot` - номер слота, откуда будут взяты предметы. - `count` - количество предметов для подбирания. - `side` - сторона, откуда будут взяты предметы. Опциональное значение, по умолчанию равно `front`. Смотрите секцию "Стороны". -- Возвращает количество подобранных предметов. \ No newline at end of file +- Возвращает количество подобранных предметов. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/manual.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md similarity index 80% rename from src/main/resources/assets/oc2/doc/ru_ru/item/manual.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md index 6ff1aacc..f1cfe7fc 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/manual.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md @@ -1,6 +1,6 @@ # Справочник компьютерщика -![Никто меня не читает...](item:oc2:manual) +![Никто меня не читает...](item:oc2r:manual) Маленькая книжечка с короткими описаниями всего, что касается [компьютеров](../block/computer.md) и устройств для них. Собственно, ее же вы сейчас и читаете! -Для удобства, можно кликнуть справочником на любой блок из мода и вы получите по нему справку. \ No newline at end of file +Для удобства, можно кликнуть справочником на любой блок из мода и вы получите по нему справку. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/memory.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md similarity index 96% rename from src/main/resources/assets/oc2/doc/ru_ru/item/memory.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md index c22814f8..edb70b4e 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/memory.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md @@ -1,5 +1,5 @@ # Память -![Воспоминания Произвольного Доступа](item:oc2:memory_large) +![Воспоминания Произвольного Доступа](item:oc2r:memory_large) Оперативное Запоминающее Устройство (ОЗУ) является одной из необходимых вещей для работы [компьютера](../block/computer.md) и [робота](robot.md). @@ -7,4 +7,4 @@ Советуем посмотреть [руководство для начинающих](../getting_started.md). -Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/network_cable.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md similarity index 87% rename from src/main/resources/assets/oc2/doc/ru_ru/item/network_cable.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md index 8bfffbb1..f9824fed 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/network_cable.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md @@ -1,6 +1,6 @@ # Сетевой кабель -![Какого КОТА!?](item:oc2:network_cable) +![Какого КОТА!?](item:oc2r:network_cable) Сетевые кабели соединяют пары [сетевых разъемов](../block/network_connector.md) между собой. Один кабель можно протянуть на довольно длинную дистанцию. Для подключения кабеля кликните им по двум сетевым разъемам. -Кабели ограничены в длине, поэтому сетевые разъемы можно использовать в качестве повторителей для увеличения дистанции. \ No newline at end of file +Кабели ограничены в длине, поэтому сетевые разъемы можно использовать в качестве повторителей для увеличения дистанции. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/network_interface_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_interface_card.md similarity index 94% rename from src/main/resources/assets/oc2/doc/ru_ru/item/network_interface_card.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/network_interface_card.md index bc0547d4..3b34dcca 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/network_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_interface_card.md @@ -1,5 +1,5 @@ # Сетевая интерфейсная карта -![Поговори с незнакомцами](item:oc2:network_interface_card) +![Поговори с незнакомцами](item:oc2r:network_interface_card) Сетевая интерфейсная карта (NIC) позволяет [компьютерам](../block/computer.md) обмениваться сообщениями через [сетевые разъемы](../block/network_connector.md), подключенные к ним. @@ -9,4 +9,4 @@ После настройки воспользуйтесь командой `ifconfig` для получения информации о текущем IP адресе. -Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_card.md similarity index 95% rename from src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_card.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_card.md index ecd72513..753c3b4b 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_card.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_card.md @@ -1,5 +1,5 @@ # Сетевая туннельная карта -![Туннельное зрение?](item:oc2:network_tunnel_card) +![Туннельное зрение?](item:oc2r:network_tunnel_card) Сетевая туннельная карта позволяет [компьютерам](../block/computer.md) отправлять и принимать сообщения с другого туннельного устройства (туннельные карты и [туннельные модули](network_tunnel_module.md)), привязанного к нему. @@ -9,4 +9,4 @@ После настройки воспользуйтесь командой `ifconfig` для получения информации о текущем IP адресе. -Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Компьютеры *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем компьютере не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_module.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_module.md similarity index 95% rename from src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_module.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_module.md index 4651370e..e5c7cc44 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_module.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_module.md @@ -1,5 +1,5 @@ # Сетевой туннельный модуль -![Туннельное зрение?](item:oc2:network_tunnel_module) +![Туннельное зрение?](item:oc2r:network_tunnel_module) Сетевой туннельный модуль позволяет [роботам](robot.md) отправлять и принимать сообщения с другого туннельного устройства (туннельные модули и [туннельные карты](network_tunnel_card.md)), привязанного к нему. @@ -9,4 +9,4 @@ После настройки воспользуйтесь командой `ifconfig` для получения информации о текущем IP адресе. -Роботов *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем роботе не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. \ No newline at end of file +Роботов *необходимо отключать* перед установкой или снятием этого компонента. Установка при работающем роботе не даст ничего (определение происходит только при загрузке), удаление может повлечь за собой сбой системы. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/redstone_interface_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md similarity index 86% rename from src/main/resources/assets/oc2/doc/ru_ru/item/redstone_interface_card.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md index 5cf6faa3..a9ec77d1 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/redstone_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md @@ -1,8 +1,8 @@ # Красная интерфейсная карта -![Есть сигнал?](item:oc2:redstone_interface_card) +![Есть сигнал?](item:oc2r:redstone_interface_card) Красная интерфейсная карта - более компактная версия [красного интерфейсного блока](../block/redstone_interface.md). Она позволяет пользователям собирать более компактные системы. Функционально карта ничем не отличается от блока, за исключением того, что вместо блока сигнал излучается непосредственно от [компьютера](../block/computer.md). Стороны аналогичны блоку. -API устройства идентично таковому в красном интерфейсном блоке. \ No newline at end of file +API устройства идентично таковому в красном интерфейсном блоке. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/robot.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md similarity index 99% rename from src/main/resources/assets/oc2/doc/ru_ru/item/robot.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md index 7c0fea2e..bbc1dc65 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/robot.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md @@ -1,5 +1,5 @@ # Робот -![Приветствую наших новых повелителей роботов](item:oc2:robot) +![Приветствую наших новых повелителей роботов](item:oc2r:robot) Фактически роботы представляют из себя маленькие [компьютеры](../block/computer.md). Однако учитывая их нестационарное назначение, роботы несколько отличаются от обычных компьютеров. Они не могут подключаться к [интерфейсной шине](../block/bus_interface.md). Вместо карт расширения они поддерживают модульные устройства. Это специальные устройства, разработанные с учетом мобильности роботов. @@ -97,4 +97,4 @@ - Возвращает статус выполненной задачи (`true` - удача, `false` - неудача). `turnAsync(direction)` пробует асинхронно повернуться в указанную сторону. Блокирует выполнение программы, пока операция не будет поставлена в очередь. -- `direction` - направление поворота. \ No newline at end of file +- `direction` - направление поворота. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/sound_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/sound_card.md similarity index 97% rename from src/main/resources/assets/oc2/doc/ru_ru/item/sound_card.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/sound_card.md index b623c2b9..dd97187b 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/sound_card.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/sound_card.md @@ -1,5 +1,5 @@ # Звуковая карта -![Меньше звука тишины](item:oc2:sound_card) +![Меньше звука тишины](item:oc2r:sound_card) Звуковая карта позволяет проигрывать разные звуковые эффекты из своей огромной библиотеки реалистичных семплов. Из-за некоторых технических особенностей, последовательное проигрывание эффектов требует небольшой паузы между ними. Если попытаться проиграть эффект в это время, то звука просто не будет. @@ -20,4 +20,4 @@ `findSound(name:string):table` возвращает список доступных звуковых эффектов с таким именем. Учитывайте, что количество выдаваемых результатов ограничено, поэтому запросы с большим количеством результатов будут обрезаться. - `name` - название звукового эффекта для поиска. -- Возвращает список названий звуковых эффектов по указанному запросу. \ No newline at end of file +- Возвращает список названий звуковых эффектов по указанному запросу. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/item/wrench.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md similarity index 87% rename from src/main/resources/assets/oc2/doc/ru_ru/item/wrench.md rename to src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md index 3ce62b73..e4d06a2c 100644 --- a/src/main/resources/assets/oc2/doc/ru_ru/item/wrench.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md @@ -1,8 +1,8 @@ # Ключ -![А зачем отвертка?](item:oc2:wrench) +![А зачем отвертка?](item:oc2r:wrench) Ключ-отвертка или просто ключ предназначен для конфигурации некоторых блоков, например [компьютеров](../block/computer.md). Он необходим для конфигурирования устройств вроде [интерфейсных шин](../block/bus_interface.md) или быстрого демонтирования, например, [кабелей](../block/bus_cable.md). -А еще им убирается маскировочный фасад у кабелей. \ No newline at end of file +А еще им убирается маскировочный фасад у кабелей. diff --git a/src/main/resources/assets/oc2/doc/ru_ru/networking.md b/src/main/resources/assets/oc2r/doc/ru_ru/networking.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/networking.md rename to src/main/resources/assets/oc2r/doc/ru_ru/networking.md diff --git a/src/main/resources/assets/oc2/doc/ru_ru/robotics.md b/src/main/resources/assets/oc2r/doc/ru_ru/robotics.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/robotics.md rename to src/main/resources/assets/oc2r/doc/ru_ru/robotics.md diff --git a/src/main/resources/assets/oc2/doc/ru_ru/scripting.md b/src/main/resources/assets/oc2r/doc/ru_ru/scripting.md similarity index 100% rename from src/main/resources/assets/oc2/doc/ru_ru/scripting.md rename to src/main/resources/assets/oc2r/doc/ru_ru/scripting.md diff --git a/src/main/resources/assets/oc2r/lang/en_us.json b/src/main/resources/assets/oc2r/lang/en_us.json new file mode 100644 index 00000000..c990fe59 --- /dev/null +++ b/src/main/resources/assets/oc2r/lang/en_us.json @@ -0,0 +1,148 @@ +{ + "item_group.oc2r.common": "OpenComputers II", + + "block.oc2r.computer": "Computer", + "block.oc2r.computer.desc": "Runs software from Flash Memory and Hard Disks.", + "block.oc2r.computer.preconfigured": "Preconfigured Computer", + "block.oc2r.monitor": "Monitor", + "block.oc2r.monitor.desc": "A special framebuffer based monitor for your computer.", + "block.oc2r.bus_cable": "Bus Cable", + "block.oc2r.bus_cable.desc": "Connects Bus Interfaces.", + "block.oc2r.network_connector": "Network Connector", + "block.oc2r.network_connector.desc": "Transmits network packets via Network Cables.", + "block.oc2r.network_hub": "Network Hub", + "block.oc2r.network_hub.desc": "Distributes network packets among all attached Network Connectors.", + "block.oc2r.redstone_interface": "Redstone Interface", + "block.oc2r.redstone_interface.desc": "Emits and reads redstone signals.", + "block.oc2r.disk_drive": "Disk Drive", + "block.oc2r.disk_drive.desc": "Used to access Floppy Disks.", + "block.oc2r.flash_memory_flasher": "Flash Memory Flasher", + "block.oc2r.flash_memory_flasher.desc": "Used to flash a new firmware onto a flash memory chip.", + "block.oc2r.charger": "Charger", + "block.oc2r.charger.desc": "Charges entities and items in containers on top of it.", + "block.oc2r.creative_energy": "Infinite Energy Cube", + "block.oc2r.creative_energy.desc": "Provides unlimited energy to adjacent blocks. Intended for testing.", + "block.oc2r.projector": "Projector", + "block.oc2r.projector.desc": "Projects images onto surfaces in front of it.", + "block.oc2r.keyboard": "Keyboard", + "block.oc2r.keyboard.desc": "Allows keyboard input when using a projector.", + + "item.oc2r.wrench": "Scrench", + "item.oc2r.wrench.desc": "Configures devices and dismantles them (while sneaking).", + "item.oc2r.manual": "The Computerist's Handbook", + "item.oc2r.manual.desc": "Holds information on all things needed when working with Computers.", + "item.oc2r.bus_interface": "Bus Interface", + "item.oc2r.bus_interface.desc": "Connects external devices to Computers.", + "item.oc2r.cpu_tier_1": "CPU Tier 1", + "item.oc2r.cpu_tier_1.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_2": "CPU Tier 2", + "item.oc2r.cpu_tier_2.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_3": "CPU Tier 3", + "item.oc2r.cpu_tier_3.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_4": "CPU Tier 4", + "item.oc2r.cpu_tier_4.desc": "Processes computer instructions.", + "item.oc2r.network_cable": "Network Cable", + "item.oc2r.network_cable.desc": "Connects Network Connectors.", + "item.oc2r.memory": "Memory", + "item.oc2r.memory.desc": "Random Access Memory (RAM) used in Computers and Robots.", + "item.oc2r.hard_drive": "Hard Drive", + "item.oc2r.hard_drive.desc": "Mass storage for operating systems and data.", + "item.oc2r.floppy": "Floppy Disk", + "item.oc2r.floppy.desc": "Portable storage used to transfer data between Computers.", + "item.oc2r.floppy_modern": "Modern Floppy Disk", + "item.oc2r.floppy_modern.desc": "Newer version of portable storage used to transfer data between Computers.", + "item.oc2r.flash_memory": "Flash Memory", + "item.oc2r.flash_memory.desc": "Readonly storage for firmware.", + "item.oc2r.redstone_interface_card": "Redstone Interface Card", + "item.oc2r.redstone_interface_card.desc": "Emits and reads redstone signals through the Computer.", + "item.oc2r.network_interface_card": "Network Interface Card", + "item.oc2r.network_interface_card.desc": "Sends and receives network packets via attached Network Connectors.", + "item.oc2r.network_interface_card.is_configured": "Has connectivity configuration.", + "item.oc2r.network_tunnel_card": "Network Tunnel Card", + "item.oc2r.network_tunnel_card.desc": "Sends and receives network packets to a linked device.", + "item.oc2r.file_import_export_card": "File Import/Export Card", + "item.oc2r.file_import_export_card.desc": "Imports and exports files from and into your real file system.", + "item.oc2r.robot": "Robot", + "item.oc2r.robot.desc": "A mobile Computer. Use a Scrench to pick it back up.", + "item.oc2r.inventory_operations_module": "Inventory Operations Module", + "item.oc2r.inventory_operations_module.desc": "Moves items in, into and out of the Robot's inventory.", + "item.oc2r.block_operations_module": "Block Operations Module", + "item.oc2r.block_operations_module.desc": "Breaks and places blocks.", + "item.oc2r.sound_card": "Sound Card", + "item.oc2r.sound_card.desc": "Plays various sounds from its highly realistic sound bank.", + "item.oc2r.network_tunnel_module": "Network Tunnel Module", + "item.oc2r.network_tunnel_module.desc": "Sends and receives network packets to a linked device.", + + "item.oc2r.transistor": "Transistor", + "item.oc2r.transistor.desc": "Crafting material.", + "item.oc2r.circuit_board": "Circuit Board", + "item.oc2r.circuit_board.desc": "Crafting material.", + + "entity.oc2r.robot": "Robot", + + "gui.oc2r.computer.error.unknown": "Unknown Error", + "gui.oc2r.computer.error.missing_firmware": "Missing Firmware", + "gui.oc2r.computer.error.insufficient_memory": "Insufficient Memory", + "gui.oc2r.computer.bus_state.incomplete": "Bus Incomplete", + "gui.oc2r.computer.bus_state.too_complex": "Bus Too Complex", + "gui.oc2r.computer.bus_state.multiple_controllers": "Multiple Bus Controllers", + "gui.oc2r.computer.error.not_enough_energy": "Not Enough Energy", + "gui.oc2r.computer.error.missing_cpu": "Missing CPU", + + "gui.oc2r.computer.capture_input.capt": "Capture Input", + "gui.oc2r.computer.capture_input.desc": "When enabled, as long as the mouse cursor is hovering the terminal contents, all input will be captured, including the escape key.", + "gui.oc2r.computer.power.capt": "Toggle Power", + "gui.oc2r.computer.power.desc": "Toggles the power state of the computer.", + + "gui.oc2r.machine.open_inventory.capt": "Open Inventory", + "gui.oc2r.machine.open_terminal.capt": "Open Terminal", + + "gui.oc2r.device_type.memory": "Memory", + "gui.oc2r.device_type.hard_drive": "Hard Drive", + "gui.oc2r.device_type.flash_memory": "Flash Memory", + "gui.oc2r.device_type.card": "Card", + + "gui.oc2r.file_chooser.title.load": "Open file", + "gui.oc2r.file_chooser.title.save": "Save file", + "gui.oc2r.file_chooser.text_field.filename": "File name", + "gui.oc2r.file_chooser.confirm_button.load": "Open", + "gui.oc2r.file_chooser.confirm_button.save": "Save", + "gui.oc2r.file_chooser.confirm_button.overwrite": "Overwrite", + "gui.oc2r.file_chooser.cancel_button": "Cancel", + + "gui.oc2r.network_interface_card.side_state": "Connectivity: %s", + "gui.oc2r.network_interface_card.connectivity.enabled": "Enabled", + "gui.oc2r.network_interface_card.connectivity.disabled": "Disabled", + "gui.oc2r.network_interface_card.info": "Drag to rotate. Click faces to toggle connectivity.", + + "gui.oc2r.keyboard.close_info": "Right click to close.", + + "gui.oc2r.network_tunnel.link": "Link", + + "manual.oc2r.home": "Home", + "manual.oc2r.blocks": "Blocks", + "manual.oc2r.items": "Items", + + "message.oc2r.connector.error.full": "Cannot attach more cables.", + "message.oc2r.connector.error.too_far": "Distance between connectors is too large.", + "message.oc2r.connector.error.obstructed": "No clear line of sight between connectors.", + "message.oc2r.import_file.file_too_large": "File is too large.", + "message.oc2r.invalid_facade_block": "This block cannot be used as a facade.", + + "tooltip.oc2r.device_needs_reboot": "Requires reboot", + "tooltip.oc2r.flash_memory_missing": "A flash memory containing a firmware is required to boot.", + "tooltip.oc2r.memory_missing": "Some memory is required to load the flash memory for execution to boot.", + "tooltip.oc2r.hard_drive_missing": "Most systems will require a root file system to boot.", + "tooltip.oc2r.cpu_missing": "A cpu is required to boot", + "tooltip.oc2r.energy": "Energy: %s", + "tooltip.oc2r.energyConsumption": "Energy Consumption: %s/t", + "tooltip.oc2r.confirm": "Confirm", + "tooltip.oc2r.cancel": "Cancel", + "tooltip.oc2r.network_tunnel_id": "Tunnel: %s", + + "subtitles.oc2r.computer": "Computer fans running", + "subtitles.oc2r.floppy": "Floppy access", + "subtitles.oc2r.floppy_eject": "Floppy ejected", + "subtitles.oc2r.floppy_insert": "Floppy inserted", + "subtitles.oc2r.hdd": "Hard drive access" +} diff --git a/src/main/resources/assets/oc2r/lang/ru_ru.json b/src/main/resources/assets/oc2r/lang/ru_ru.json new file mode 100644 index 00000000..f2cdd051 --- /dev/null +++ b/src/main/resources/assets/oc2r/lang/ru_ru.json @@ -0,0 +1,132 @@ +{ + "block.oc2r.bus_cable": "Интерфейсный кабель", + "block.oc2r.bus_cable.desc": "Соединяет интерфейсные шины.", + "block.oc2r.charger": "Зарядное устройство", + "block.oc2r.charger.desc": "Заряжает сущности и предметы в контейнерах над ним.", + "block.oc2r.computer": "Компьютер", + "block.oc2r.computer.desc": "Выполняет программы из карт памяти и жестких дисков.", + "block.oc2r.computer.preconfigured": "Собранный компьютер", + "block.oc2r.creative_energy": "Энергокуб бесконечности", + "block.oc2r.creative_energy.desc": "Подает бесконечную энергию на соседние блоки. Применять только в тестовых целях.", + "block.oc2r.disk_drive": "Дисковод", + "block.oc2r.disk_drive.desc": "Нужен для работы с дискетами.", + "block.oc2r.flash_memory_flasher": "Флэш-память", + "block.oc2r.flash_memory_flasher.desc": "Используется для прошивки новой прошивки на чип флэш-памяти.", + "block.oc2r.keyboard": "Клавиатура", + "block.oc2r.keyboard.desc": "Позволяет вводить текст при использовании проектора.", + "block.oc2r.monitor": "Monitor", + "block.oc2r.monitor.desc": "A special framebuffer based monitor for your computer.", + "block.oc2r.network_connector": "Сетевой разъем", + "block.oc2r.network_connector.desc": "Передает пакеты через сетевые кабели.", + "block.oc2r.network_hub": "Сетевой концентратор", + "block.oc2r.network_hub.desc": "Передает пакеты на все подключенные к нему сетевые разъемы.", + "block.oc2r.projector": "Проектор", + "block.oc2r.projector.desc": "Проецирует изображения на поверхности перед ним.", + "block.oc2r.redstone_interface": "Красный интерфейс", + "block.oc2r.redstone_interface.desc": "Подает и считывает редстоун сигналы.", + "entity.oc2r.robot": "Робот", + "gui.oc2r.computer.bus_state.incomplete": "Шина не заполнена", + "gui.oc2r.computer.bus_state.multiple_controllers": "Много контроллеров шины", + "gui.oc2r.computer.bus_state.too_complex": "Слишком много устройств", + "gui.oc2r.computer.capture_input.capt": "Захват ввода", + "gui.oc2r.computer.capture_input.desc": "Пока курсор находится в пределах окна терминала, ввод (включая нажатие на ESC) будет захватываться.", + "gui.oc2r.computer.error.insufficient_memory": "Недостаточно памяти", + "gui.oc2r.computer.error.missing_cpu": "Отсутствует процессор", + "gui.oc2r.computer.error.missing_firmware": "Отсутствует прошивка", + "gui.oc2r.computer.error.not_enough_energy": "Недостаточно энергии", + "gui.oc2r.computer.error.unknown": "Неизвестная ошибка", + "gui.oc2r.computer.power.capt": "Кнопка питания", + "gui.oc2r.computer.power.desc": "Включает или выключает компьютер.", + "gui.oc2r.device_type.card": "Карта", + "gui.oc2r.device_type.flash_memory": "Карта памяти", + "gui.oc2r.device_type.hard_drive": "Жесткий диск", + "gui.oc2r.device_type.memory": "Память", + "gui.oc2r.file_chooser.cancel_button": "Отмена", + "gui.oc2r.file_chooser.confirm_button.load": "Открыть", + "gui.oc2r.file_chooser.confirm_button.overwrite": "Перезаписать", + "gui.oc2r.file_chooser.confirm_button.save": "Сохранить", + "gui.oc2r.file_chooser.text_field.filename": "Имя файла", + "gui.oc2r.file_chooser.title.load": "Открыть файл", + "gui.oc2r.file_chooser.title.save": "Сохранить файл", + "gui.oc2r.keyboard.close_info": "Для закрытия нажмите ПКМ.", + "gui.oc2r.machine.open_inventory.capt": "Открыть инвентарь", + "gui.oc2r.machine.open_terminal.capt": "Открыть терминал", + "gui.oc2r.network_interface_card.connectivity.disabled": "Выключено", + "gui.oc2r.network_interface_card.connectivity.enabled": "Включено", + "gui.oc2r.network_interface_card.info": "Потяните для поворота. Клик на сторону переключит соединение.", + "gui.oc2r.network_interface_card.side_state": "Соединение: %s", + "gui.oc2r.network_tunnel.link": "Привязать", + "item.oc2r.block_operations_module": "Модуль управления блоками", + "item.oc2r.block_operations_module.desc": "Ломает и ставит блоки.", + "item.oc2r.bus_interface": "Интерфейсная шина", + "item.oc2r.bus_interface.desc": "Соединяет внешние устройства с компьютерами.", + "item.oc2r.circuit_board": "Печатная плата", + "item.oc2r.circuit_board.desc": "Материал для крафта.", + "item.oc2r.cpu_tier_1": "CPU Tier 1", + "item.oc2r.cpu_tier_1.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_2": "CPU Tier 2", + "item.oc2r.cpu_tier_2.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_3": "CPU Tier 3", + "item.oc2r.cpu_tier_3.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_4": "CPU Tier 4", + "item.oc2r.cpu_tier_4.desc": "Processes computer instructions.", + "item.oc2r.file_import_export_card": "Карта импорта/экспорта файлов", + "item.oc2r.file_import_export_card.desc": "Импортирует и экспортирует файлы между вашим реальным компьютером.", + "item.oc2r.flash_memory": "Карта памяти", + "item.oc2r.flash_memory.desc": "Накопитель для прошивки.", + "item.oc2r.floppy": "Дискета", + "item.oc2r.floppy.desc": "Съемный накопитель для переноса данных между компьютерами.", + "item.oc2r.floppy_modern": "Современная дискета", + "item.oc2r.floppy_modern.desc": "Новая версия портативного хранилища, используемого для передачи данных между компьютерами.", + "item.oc2r.hard_drive": "Жесткий диск", + "item.oc2r.hard_drive.desc": "Накопитель для операционных систем и данных.", + "item.oc2r.inventory_operations_module": "Модуль управления инвентарем", + "item.oc2r.inventory_operations_module.desc": "Позволяет роботу управлять своим инвентарем.", + "item.oc2r.manual": "Справочник компьютерщика", + "item.oc2r.manual.desc": "Содержит информацию о всем, что нужно для работы с компьютерами.", + "item.oc2r.memory": "Память", + "item.oc2r.memory.desc": "Оперативное Запоминающее Устройство (ОЗУ). Используется в компьютерах и роботах.", + "item.oc2r.network_cable": "Сетевой кабель", + "item.oc2r.network_cable.desc": "Соединяет сетевые разъемы.", + "item.oc2r.network_interface_card": "Сетевая интерфейсная карта", + "item.oc2r.network_interface_card.desc": "Отсылает и принимает пакеты через сетевой разъем.", + "item.oc2r.network_interface_card.is_configured": "Установлены настройки соединения.", + "item.oc2r.network_tunnel_card": "Сетевая туннельная карта", + "item.oc2r.network_tunnel_card.desc": "Отсылает и принимает пакеты с привязанного устройства.", + "item.oc2r.network_tunnel_module": "Сетевой туннельный модуль", + "item.oc2r.network_tunnel_module.desc": "Отсылает и принимает пакеты с привязанного устройства.", + "item.oc2r.redstone_interface_card": "Красная интерфейсная карта", + "item.oc2r.redstone_interface_card.desc": "Подает и считывает редстоун сигналы от блока компьютера.", + "item.oc2r.robot": "Робот", + "item.oc2r.robot.desc": "Портативный компьютер. Используйте ключ, чтобы убрать его", + "item.oc2r.sound_card": "Звуковая карта", + "item.oc2r.sound_card.desc": "Проигрывает разные звуки из своих высококачественных звуковых банков.", + "item.oc2r.transistor": "Транзистор", + "item.oc2r.transistor.desc": "Материал для крафта.", + "item.oc2r.wrench": "Ключ", + "item.oc2r.wrench.desc": "Конфигурирует и демонтирует (если присесть) устройства.", + "item_group.oc2r.common": "OpenComputers II", + "manual.oc2r.blocks": "Блоки", + "manual.oc2r.home": "Главная страница", + "manual.oc2r.items": "Предметы", + "message.oc2r.connector.error.full": "Подключено слишком много кабелей.", + "message.oc2r.connector.error.obstructed": "Между разъемами присутствует преграда.", + "message.oc2r.connector.error.too_far": "Дистанция между разъемами слишком велика.", + "message.oc2r.import_file.file_too_large": "Файл слишком большой.", + "message.oc2r.invalid_facade_block": "Этот блок нельзя использовать как фасад.", + "subtitles.oc2r.computer": "Запуск вентиляторов", + "subtitles.oc2r.floppy": "Жужжание дисковода", + "subtitles.oc2r.floppy_eject": "Дискета извлечена", + "subtitles.oc2r.floppy_insert": "Дискета вставлена", + "subtitles.oc2r.hdd": "Шум жесткого диска", + "tooltip.oc2r.cancel": "Отмена", + "tooltip.oc2r.confirm": "Подтвердить", + "tooltip.oc2r.cpu_missing": "Для загрузки требуется процессор", + "tooltip.oc2r.device_needs_reboot": "Требуется перезагрузка", + "tooltip.oc2r.energy": "Энергия: %s", + "tooltip.oc2r.energyConsumption": "Потребление энергии: %s/t", + "tooltip.oc2r.flash_memory_missing": "Карта памяти содержит прошивку, необходимую для загрузки.", + "tooltip.oc2r.hard_drive_missing": "Большинству ОС для загрузки необходима файловая система.", + "tooltip.oc2r.memory_missing": "Оперативная память требуется для загрузки прошивки из карты памяти и последующей работы.", + "tooltip.oc2r.network_tunnel_id": "Туннель: %s" +} diff --git a/src/main/resources/assets/oc2r/lang/zh_cn.json b/src/main/resources/assets/oc2r/lang/zh_cn.json new file mode 100644 index 00000000..79700b04 --- /dev/null +++ b/src/main/resources/assets/oc2r/lang/zh_cn.json @@ -0,0 +1,132 @@ +{ + "block.oc2r.bus_cable": "总线线缆", + "block.oc2r.bus_cable.desc": "与总线接口结合使用，以将外部设备连接到电脑。", + "block.oc2r.charger": "充电器", + "block.oc2r.charger.desc": "通过站在上面给实体和物品充电。", + "block.oc2r.computer": "电脑", + "block.oc2r.computer.desc": "使用螺丝刀扳手或者兼容的扳手来添加或移除组件。", + "block.oc2r.computer.preconfigured": "电脑（已经配置好的）", + "block.oc2r.creative_energy": "无限能量方块", + "block.oc2r.creative_energy.desc": "提供无限的能量给连接的方块。", + "block.oc2r.disk_drive": "磁盘驱动器", + "block.oc2r.disk_drive.desc": "使用这个来访问软盘。", + "block.oc2r.flash_memory_flasher": "闪存闪存器", + "block.oc2r.flash_memory_flasher.desc": "用于将新固件刷新到闪存芯片上。", + "block.oc2r.keyboard": "Keyboard", + "block.oc2r.keyboard.desc": "Allows keyboard input when using a projector.", + "block.oc2r.monitor": "Monitor", + "block.oc2r.monitor.desc": "A special framebuffer based monitor for your computer.", + "block.oc2r.network_connector": "网络连接口", + "block.oc2r.network_connector.desc": "Transmits network packets via Network Cables.", + "block.oc2r.network_hub": "网线集线器", + "block.oc2r.network_hub.desc": "Distributes network packets among all attached Network Connectors.", + "block.oc2r.projector": "Projector", + "block.oc2r.projector.desc": "Projects images onto surfaces in front of it.", + "block.oc2r.redstone_interface": "红石接口", + "block.oc2r.redstone_interface.desc": "Emits and reads redstone signals.", + "entity.oc2r.robot": "机器人", + "gui.oc2r.computer.bus_state.incomplete": "总线不完整", + "gui.oc2r.computer.bus_state.multiple_controllers": "检测到多个总线控制器", + "gui.oc2r.computer.bus_state.too_complex": "总线太复杂", + "gui.oc2r.computer.capture_input.capt": "捕获输入", + "gui.oc2r.computer.capture_input.desc": "当开启并且鼠标移动到终端内时，将捕获所有的输入，包括ESC键", + "gui.oc2r.computer.error.insufficient_memory": "内存不足", + "gui.oc2r.computer.error.missing_cpu": "缺少CPU", + "gui.oc2r.computer.error.missing_firmware": "丢失固件", + "gui.oc2r.computer.error.not_enough_energy": "能量不足", + "gui.oc2r.computer.error.unknown": "未知错误", + "gui.oc2r.computer.power.capt": "电源", + "gui.oc2r.computer.power.desc": "开启或关闭这台电脑。", + "gui.oc2r.device_type.card": "卡", + "gui.oc2r.device_type.flash_memory": "固件", + "gui.oc2r.device_type.hard_drive": "硬盘", + "gui.oc2r.device_type.memory": "内存条", + "gui.oc2r.file_chooser.cancel_button": "取消", + "gui.oc2r.file_chooser.confirm_button.load": "打开", + "gui.oc2r.file_chooser.confirm_button.overwrite": "覆盖", + "gui.oc2r.file_chooser.confirm_button.save": "保存", + "gui.oc2r.file_chooser.text_field.filename": "文件名称", + "gui.oc2r.file_chooser.title.load": "打开文件", + "gui.oc2r.file_chooser.title.save": "保存文件", + "gui.oc2r.keyboard.close_info": "Right click to close.", + "gui.oc2r.machine.open_inventory.capt": "打开物品栏", + "gui.oc2r.machine.open_terminal.capt": "打开终端", + "gui.oc2r.network_interface_card.connectivity.disabled": "Disabled", + "gui.oc2r.network_interface_card.connectivity.enabled": "Enabled", + "gui.oc2r.network_interface_card.info": "Drag to rotate. Click faces to toggle connectivity.", + "gui.oc2r.network_interface_card.side_state": "Connectivity: %s", + "gui.oc2r.network_tunnel.link": "Link", + "item.oc2r.block_operations_module": "方块操作模块", + "item.oc2r.block_operations_module.desc": "允许机器人放置/破坏方块。", + "item.oc2r.bus_interface": "总线接口", + "item.oc2r.bus_interface.desc": "通过总线线缆来和外部设备通讯。", + "item.oc2r.circuit_board": "电路板", + "item.oc2r.circuit_board.desc": "Crafting material.", + "item.oc2r.cpu_tier_1": "CPU Tier 1", + "item.oc2r.cpu_tier_1.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_2": "CPU Tier 2", + "item.oc2r.cpu_tier_2.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_3": "CPU Tier 3", + "item.oc2r.cpu_tier_3.desc": "Processes computer instructions.", + "item.oc2r.cpu_tier_4": "CPU Tier 4", + "item.oc2r.cpu_tier_4.desc": "Processes computer instructions.", + "item.oc2r.file_import_export_card": "文件导入/导出卡", + "item.oc2r.file_import_export_card.desc": "提供一个API来导入/导出文件。", + "item.oc2r.flash_memory": "固件", + "item.oc2r.flash_memory.desc": "Readonly storage for firmware.", + "item.oc2r.floppy": "软盘", + "item.oc2r.floppy.desc": "Portable storage used to transfer data between Computers.", + "item.oc2r.floppy_modern": "现代软盘", + "item.oc2r.floppy_modern.desc": "用于在计算机之间传输数据的较新版本的便携式存储。", + "item.oc2r.hard_drive": "硬盘", + "item.oc2r.hard_drive.desc": "Mass storage for operating systems and data.", + "item.oc2r.inventory_operations_module": "物品栏操作模块", + "item.oc2r.inventory_operations_module.desc": "允许机器人存取物品。", + "item.oc2r.manual": "The Computerist's Handbook", + "item.oc2r.manual.desc": "Holds information on all things needed when working with Computers.", + "item.oc2r.memory": "内存条", + "item.oc2r.memory.desc": "Random Access Memory (RAM) used in Computers and Robots.", + "item.oc2r.network_cable": "网线", + "item.oc2r.network_cable.desc": "Connects Network Connectors.", + "item.oc2r.network_interface_card": "网卡", + "item.oc2r.network_interface_card.desc": "Sends and receives network packets via attached Network Connectors.", + "item.oc2r.network_interface_card.is_configured": "Has connectivity configuration.", + "item.oc2r.network_tunnel_card": "Network Tunnel Card", + "item.oc2r.network_tunnel_card.desc": "Sends and receives network packets to a linked device.", + "item.oc2r.network_tunnel_module": "Network Tunnel Module", + "item.oc2r.network_tunnel_module.desc": "Sends and receives network packets to a linked device.", + "item.oc2r.redstone_interface_card": "红石卡", + "item.oc2r.redstone_interface_card.desc": "Emits and reads redstone signals through the Computer.", + "item.oc2r.robot": "机器人", + "item.oc2r.robot.desc": "使用螺丝刀扳手或者兼容的扳手来添加或移除组件。", + "item.oc2r.sound_card": "声卡", + "item.oc2r.sound_card.desc": "可以从其高度逼真的音库播放各种声音。", + "item.oc2r.transistor": "晶体管", + "item.oc2r.transistor.desc": "Crafting material.", + "item.oc2r.wrench": "螺丝刀扳手", + "item.oc2r.wrench.desc": "当潜行时用于配置设备和拆卸设备。", + "item_group.oc2r.common": "开放式电脑 II", + "manual.oc2r.blocks": "方块", + "manual.oc2r.home": "主页", + "manual.oc2r.items": "物品", + "message.oc2r.connector.error.full": "不能放置更多线缆。", + "message.oc2r.connector.error.obstructed": "直线内有方块", + "message.oc2r.connector.error.too_far": "距离太远了。", + "message.oc2r.import_file.file_too_large": "文件过大", + "message.oc2r.invalid_facade_block": "该方块不能被用作一个面。", + "subtitles.oc2r.computer": "电脑:运行", + "subtitles.oc2r.floppy": "软盘:访问", + "subtitles.oc2r.floppy_eject": "软盘:弹出", + "subtitles.oc2r.floppy_insert": "软盘:插入", + "subtitles.oc2r.hdd": "硬盘:访问", + "tooltip.oc2r.cancel": "取消", + "tooltip.oc2r.confirm": "确认", + "tooltip.oc2r.cpu_missing": "启动时需要CPU", + "tooltip.oc2r.device_needs_reboot": "需要重启", + "tooltip.oc2r.energy": "能量：%s", + "tooltip.oc2r.energyConsumption": "能量使用：%s/t", + "tooltip.oc2r.flash_memory_missing": "启动时需要包含固件的闪存。", + "tooltip.oc2r.hard_drive_missing": "找不到硬盘。", + "tooltip.oc2r.memory_missing": "需要一些内存来加载闪存以执行引导.", + "tooltip.oc2r.network_tunnel_id": "Tunnel: %s" +} diff --git a/src/main/resources/assets/oc2r/models/block/cable_base.json b/src/main/resources/assets/oc2r/models/block/cable_base.json new file mode 100644 index 00000000..3a1c05c0 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/cable_base.json @@ -0,0 +1 @@ +{"parent":"block/block","loader": "oc2r:bus_cable","textures":{"atlas0":"oc2r:block/cable_base/cable_base_atlas0","particle":"#atlas0"},"elements":[{"from":[6,5,6],"to":[10,6,10],"faces":{"east":{"texture":"atlas0","uv":[0.0,8.0,2.0,8.5]},"west":{"texture":"atlas0","uv":[0.0,8.5,2.0,9.0]},"down":{"texture":"atlas0","uv":[0.0,9.0,2.0,11.0]},"north":{"texture":"atlas0","uv":[0.0,11.0,2.0,11.5]},"south":{"texture":"atlas0","uv":[0.0,11.5,2.0,12.0]}}},{"from":[6,6,10],"to":[10,10,11],"faces":{"east":{"texture":"atlas0","uv":[3.0,0.0,3.5,2.0]},"west":{"texture":"atlas0","uv":[3.5,0.0,4.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,2.0,12.5]},"down":{"texture":"atlas0","uv":[0.0,12.5,2.0,13.0]},"south":{"texture":"atlas0","uv":[0.0,13.0,2.0,15.0]}}},{"from":[5,6,6],"to":[11,10,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,13.0,4.0,15.0]},"west":{"texture":"atlas0","uv":[4.0,13.0,6.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,3.0,2.0]},"down":{"texture":"atlas0","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas0","uv":[0.0,4.0,3.0,6.0]},"south":{"texture":"atlas0","uv":[0.0,6.0,3.0,8.0]}}},{"from":[6,6,5],"to":[10,10,6],"faces":{"east":{"texture":"atlas0","uv":[4.0,0.0,4.5,2.0]},"west":{"texture":"atlas0","uv":[4.5,0.0,5.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,15.0,2.0,15.5]},"down":{"texture":"atlas0","uv":[0.0,15.5,2.0,16.0]},"north":{"texture":"atlas0","uv":[6.0,13.0,8.0,15.0]}}},{"from":[6,10,6],"to":[10,11,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,15.5,4.0,16.0]},"west":{"texture":"atlas0","uv":[4.0,15.5,6.0,16.0]},"up":{"texture":"atlas0","uv":[8.0,13.0,10.0,15.0]},"north":{"texture":"atlas0","uv":[6.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,10.0,16.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_link.json b/src/main/resources/assets/oc2r/models/block/cable_link.json new file mode 100644 index 00000000..34035375 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/cable_link.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/cable_link/cable_link_atlas0","particle":"#atlas0"},"elements":[{"from":[6,5,11],"to":[10,6,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,9.0,2.5,9.5]},"west":{"texture":"atlas0","uv":[0.0,9.5,2.5,10.0]},"down":{"texture":"atlas0","uv":[3.0,0.0,5.0,2.5]},"north":{"texture":"atlas0","uv":[0.0,15.0,2.0,15.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,15.5,2.0,16.0]}}},{"from":[5,6,11],"to":[11,10,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,10.0,2.5,12.0]},"west":{"texture":"atlas0","uv":[0.0,12.0,2.5,14.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,3.0,2.5]},"down":{"texture":"atlas0","uv":[0.0,2.5,3.0,5.0]},"north":{"texture":"atlas0","uv":[0.0,5.0,3.0,7.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,7.0,3.0,9.0]}}},{"from":[6,10,11],"to":[10,11,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,14.0,2.5,14.5]},"west":{"texture":"atlas0","uv":[0.0,14.5,2.5,15.0]},"up":{"texture":"atlas0","uv":[5.0,0.0,7.0,2.5]},"north":{"texture":"atlas0","uv":[2.0,15.5,4.0,16.0]},"south":{"texture":"atlas0","cullface":"south","uv":[4.0,15.5,6.0,16.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_plug.json b/src/main/resources/assets/oc2r/models/block/cable_plug.json new file mode 100644 index 00000000..3f013338 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/cable_plug.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/cable_plug/cable_plug_atlas0","particle":"#atlas0"},"elements":[{"from":[4,4,15],"to":[12,6,16],"faces":{"east":{"texture":"atlas0","uv":[4.0,1.0,4.5,2.0]},"west":{"texture":"atlas0","uv":[4.5,1.0,5.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,4.0,0.5]},"down":{"texture":"atlas0","uv":[0.0,0.5,4.0,1.0]},"north":{"texture":"atlas0","uv":[0.0,1.0,4.0,2.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,2.0,4.0,3.0]}}},{"from":[7,4,14],"to":[9,5,15],"faces":{"east":{"texture":"atlas0","uv":[14.0,14.0,14.5,14.5]},"west":{"texture":"atlas0","uv":[14.5,14.0,15.0,14.5]},"down":{"texture":"atlas0","uv":[15.0,15.5,16.0,16.0]},"north":{"texture":"atlas0","uv":[14.0,14.5,15.0,15.0]}}},{"from":[5,5,14],"to":[11,6,15],"faces":{"east":{"texture":"atlas0","uv":[15.0,14.0,15.5,14.5]},"west":{"texture":"atlas0","uv":[15.5,14.0,16.0,14.5]},"down":{"texture":"atlas0","uv":[0.0,9.0,3.0,9.5]},"north":{"texture":"atlas0","uv":[0.0,9.5,3.0,10.0]}}},{"from":[6,5,11],"to":[10,6,14],"faces":{"east":{"texture":"atlas0","uv":[8.0,14.5,9.5,15.0]},"west":{"texture":"atlas0","uv":[9.5,14.5,11.0,15.0]},"down":{"texture":"atlas0","uv":[3.0,13.0,5.0,14.5]},"north":{"texture":"atlas0","uv":[6.0,14.5,8.0,15.0]}}},{"from":[4,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas0","uv":[6.0,10.0,6.5,12.0]},"west":{"texture":"atlas0","uv":[6.5,10.0,7.0,12.0]},"up":{"texture":"atlas0","uv":[15.0,14.5,16.0,15.0]},"down":{"texture":"atlas0","uv":[7.0,14.0,8.0,14.5]},"north":{"texture":"atlas0","uv":[7.0,10.0,8.0,12.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,10.0,9.0,12.0]}}},{"from":[10,6,15],"to":[12,10,16],"faces":{"east":{"texture":"atlas0","uv":[9.0,10.0,9.5,12.0]},"west":{"texture":"atlas0","uv":[9.5,10.0,10.0,12.0]},"up":{"texture":"atlas0","uv":[8.0,14.0,9.0,14.5]},"down":{"texture":"atlas0","uv":[9.0,14.0,10.0,14.5]},"north":{"texture":"atlas0","uv":[10.0,10.0,11.0,12.0]},"south":{"texture":"atlas0","cullface":"south","uv":[11.0,10.0,12.0,12.0]}}},{"from":[5,6,11],"to":[11,7,15],"faces":{"east":{"texture":"atlas0","uv":[6.0,15.0,8.0,15.5]},"west":{"texture":"atlas0","uv":[8.0,15.0,10.0,15.5]},"down":{"texture":"atlas0","uv":[0.0,10.0,3.0,12.0]},"north":{"texture":"atlas0","uv":[0.0,12.0,3.0,12.5]},"south":{"texture":"atlas0","uv":[0.0,12.5,3.0,13.0]}}},{"from":[7,7,15],"to":[9,9,16],"faces":{"east":{"texture":"atlas0","uv":[5.0,1.0,5.5,2.0]},"west":{"texture":"atlas0","uv":[5.5,1.0,6.0,2.0]},"up":{"texture":"atlas0","uv":[10.0,14.0,11.0,14.5]},"down":{"texture":"atlas0","uv":[11.0,14.0,12.0,14.5]},"south":{"texture":"atlas0","cullface":"south","uv":[10.0,13.0,11.0,14.0]}}},{"from":[4,7,14],"to":[12,9,15],"faces":{"east":{"texture":"atlas0","uv":[6.0,1.0,6.5,2.0]},"west":{"texture":"atlas0","uv":[6.5,1.0,7.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,3.0,4.0,3.5]},"down":{"texture":"atlas0","uv":[0.0,3.5,4.0,4.0]},"north":{"texture":"atlas0","uv":[0.0,4.0,4.0,5.0]},"south":{"texture":"atlas0","uv":[0.0,5.0,4.0,6.0]}}},{"from":[5,7,11],"to":[11,9,14],"faces":{"east":{"texture":"atlas0","uv":[7.0,13.0,8.5,14.0]},"west":{"texture":"atlas0","uv":[8.5,13.0,10.0,14.0]},"up":{"texture":"atlas0","uv":[0.0,13.0,3.0,14.5]},"down":{"texture":"atlas0","uv":[0.0,14.5,3.0,16.0]},"north":{"texture":"atlas0","uv":[3.0,14.5,6.0,15.5]}}},{"from":[5,9,11],"to":[11,10,15],"faces":{"east":{"texture":"atlas0","uv":[10.0,15.0,12.0,15.5]},"west":{"texture":"atlas0","uv":[12.0,15.0,14.0,15.5]},"up":{"texture":"atlas0","uv":[3.0,10.0,6.0,12.0]},"north":{"texture":"atlas0","uv":[3.0,15.5,6.0,16.0]},"south":{"texture":"atlas0","uv":[6.0,15.5,9.0,16.0]}}},{"from":[4,10,15],"to":[12,12,16],"faces":{"east":{"texture":"atlas0","uv":[7.0,1.0,7.5,2.0]},"west":{"texture":"atlas0","uv":[7.5,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,6.0,4.0,6.5]},"down":{"texture":"atlas0","uv":[0.0,6.5,4.0,7.0]},"north":{"texture":"atlas0","uv":[0.0,7.0,4.0,8.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,8.0,4.0,9.0]}}},{"from":[5,10,14],"to":[11,11,15],"faces":{"east":{"texture":"atlas0","uv":[11.0,13.0,11.5,13.5]},"west":{"texture":"atlas0","uv":[11.0,13.5,11.5,14.0]},"up":{"texture":"atlas0","uv":[9.0,15.5,12.0,16.0]},"north":{"texture":"atlas0","uv":[12.0,15.5,15.0,16.0]}}},{"from":[6,10,11],"to":[10,11,14],"faces":{"east":{"texture":"atlas0","uv":[11.0,14.5,12.5,15.0]},"west":{"texture":"atlas0","uv":[12.5,14.5,14.0,15.0]},"up":{"texture":"atlas0","uv":[5.0,13.0,7.0,14.5]},"north":{"texture":"atlas0","uv":[14.0,15.0,16.0,15.5]}}},{"from":[7,11,14],"to":[9,12,15],"faces":{"east":{"texture":"atlas0","uv":[11.5,13.5,12.0,14.0]},"west":{"texture":"atlas0","uv":[12.0,13.5,12.5,14.0]},"up":{"texture":"atlas0","uv":[12.0,14.0,13.0,14.5]},"north":{"texture":"atlas0","uv":[13.0,14.0,14.0,14.5]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_straight.json b/src/main/resources/assets/oc2r/models/block/cable_straight.json new file mode 100644 index 00000000..46a9435d --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/cable_straight.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/cable_straight/cable_straight_atlas0","particle":"#atlas0"},"elements":[{"from":[6,5,5],"to":[10,6,11],"faces":{"east":{"texture":"atlas0","uv":[0.0,0.0,3.0,0.5]},"west":{"texture":"atlas0","uv":[0.0,0.5,3.0,1.0]},"down":{"texture":"atlas0","uv":[0.0,1.0,2.0,4.0]},"north":{"texture":"atlas0","uv":[6.0,15.0,8.0,15.5]},"south":{"texture":"atlas0","uv":[6.0,15.5,8.0,16.0]}}},{"from":[5,6,5],"to":[11,10,11],"faces":{"east":{"texture":"atlas0","uv":[0.0,4.0,3.0,6.0]},"west":{"texture":"atlas0","uv":[0.0,6.0,3.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,8.0,3.0,11.0]},"down":{"texture":"atlas0","uv":[0.0,11.0,3.0,14.0]},"north":{"texture":"atlas0","uv":[0.0,14.0,3.0,16.0]},"south":{"texture":"atlas0","uv":[3.0,14.0,6.0,16.0]}}},{"from":[6,10,5],"to":[10,11,11],"faces":{"east":{"texture":"atlas0","uv":[6.0,14.0,9.0,14.5]},"west":{"texture":"atlas0","uv":[6.0,14.5,9.0,15.0]},"up":{"texture":"atlas0","uv":[2.0,1.0,4.0,4.0]},"north":{"texture":"atlas0","uv":[8.0,15.5,10.0,16.0]},"south":{"texture":"atlas0","uv":[10.0,15.5,12.0,16.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_support.json b/src/main/resources/assets/oc2r/models/block/cable_support.json new file mode 100644 index 00000000..c6e52785 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/cable_support.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/cable_support/cable_support_atlas0","particle":"#atlas0"},"elements":[{"from":[7,7,11],"to":[9,9,16],"faces":{"east":{"texture":"atlas0","uv":[0.0,0.0,2.5,1.0]},"west":{"texture":"atlas0","uv":[0.0,1.0,2.5,2.0]},"up":{"texture":"atlas0","uv":[0.0,2.0,1.0,4.5]},"down":{"texture":"atlas0","uv":[1.0,2.0,2.0,4.5]},"north":{"texture":"atlas0","uv":[0.0,4.5,1.0,5.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,5.5,1.0,6.5]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/charger.json b/src/main/resources/assets/oc2r/models/block/charger.json new file mode 100644 index 00000000..ec94a43b --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/charger.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/charger/charger_atlas0","atlas1":"oc2r:block/charger/charger_atlas1","atlas2":"oc2r:block/charger/charger_atlas2","atlas3":"oc2r:block/charger/charger_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,12,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,6.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,6.0,8.0,12.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","cullface":"down","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,6.0,16.0,12.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,6.0]}}},{"from":[0,12,15],"to":[3,13,16],"faces":{"east":{"texture":"atlas2","uv":[15.5,12.0,16.0,12.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,12.5,16.0,13.0]},"up":{"texture":"atlas2","uv":[14.0,7.5,15.5,8.0]},"down":{"texture":"atlas2","uv":[14.0,7.0,15.5,7.5]},"south":{"texture":"atlas2","cullface":"south","uv":[14.0,6.5,15.5,7.0]}}},{"from":[13,12,15],"to":[16,13,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.5,13.0,16.0,13.5]},"west":{"texture":"atlas2","uv":[15.5,13.5,16.0,14.0]},"up":{"texture":"atlas2","uv":[8.0,6.0,9.5,6.5]},"down":{"texture":"atlas2","uv":[9.5,6.0,11.0,6.5]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,6.0,12.5,6.5]}}},{"from":[0,12,13],"to":[16,13,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,10.5,16.0,11.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.0,10.0,16.0,10.5]},"up":{"texture":"atlas0","uv":[0.0,12.0,8.0,13.0]},"down":{"texture":"atlas0","uv":[0.0,13.0,8.0,14.0]},"north":{"texture":"atlas0","uv":[0.0,14.0,8.0,14.5]},"south":{"texture":"atlas0","uv":[0.0,14.5,8.0,15.0]}}},{"from":[1,12,3],"to":[15,13,13],"faces":{"east":{"texture":"atlas2","uv":[8.0,8.5,13.0,9.0]},"west":{"texture":"atlas2","uv":[8.0,9.0,13.0,9.5]},"up":{"texture":"atlas2","uv":[0.0,11.0,7.0,16.0]},"down":{"texture":"atlas2","uv":[7.0,11.0,14.0,16.0]},"north":{"texture":"atlas2","uv":[8.0,10.5,15.0,11.0]},"south":{"texture":"atlas2","uv":[8.0,10.0,15.0,10.5]}}},{"from":[0,12,1],"to":[16,13,3],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[11.0,4.5,12.0,5.0]},"west":{"texture":"atlas2","cullface":"west","uv":[12.0,4.5,13.0,5.0]},"up":{"texture":"atlas0","uv":[0.0,15.0,8.0,16.0]},"down":{"texture":"atlas0","uv":[8.0,15.0,16.0,16.0]},"north":{"texture":"atlas0","uv":[8.0,14.5,16.0,15.0]},"south":{"texture":"atlas0","uv":[8.0,14.0,16.0,14.5]}}},{"from":[0,12,0],"to":[3,13,1],"faces":{"east":{"texture":"atlas2","uv":[15.5,7.5,16.0,8.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,7.0,16.0,7.5]},"up":{"texture":"atlas2","uv":[12.5,6.0,14.0,6.5]},"down":{"texture":"atlas2","uv":[14.0,6.0,15.5,6.5]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,5.5,9.5,6.0]}}},{"from":[13,12,0],"to":[16,13,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.5,6.5,16.0,7.0]},"west":{"texture":"atlas2","uv":[15.5,6.0,16.0,6.5]},"up":{"texture":"atlas2","uv":[9.5,5.5,11.0,6.0]},"down":{"texture":"atlas2","uv":[11.0,5.5,12.5,6.0]},"north":{"texture":"atlas2","cullface":"north","uv":[12.5,5.5,14.0,6.0]}}},{"from":[0,13,0],"to":[16,15,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,13.0,16.0,14.0]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,12.0,16.0,13.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,16.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,8.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,0.0,8.0,1.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,1.0,8.0,2.0]}}},{"from":[0,15,13],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,5.5,15.5,6.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,4.5,9.5,5.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,2.0,8.0,3.5]},"north":{"texture":"atlas2","uv":[0.0,3.5,8.0,4.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,4.0,8.0,4.5]}}},{"from":[0,15,12],"to":[6,16,13],"faces":{"east":{"texture":"atlas2","uv":[15.5,5.5,16.0,6.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,5.0,16.0,5.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,9.5,11.0,10.0]},"north":{"texture":"atlas2","uv":[11.0,9.5,14.0,10.0]},"south":{"texture":"atlas2","uv":[13.0,9.0,16.0,9.5]}}},{"from":[10,15,12],"to":[16,16,13],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[13.0,4.0,13.5,4.5]},"west":{"texture":"atlas2","uv":[13.5,4.0,14.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[13.0,8.5,16.0,9.0]},"north":{"texture":"atlas2","uv":[8.0,8.0,11.0,8.5]},"south":{"texture":"atlas2","uv":[11.0,8.0,14.0,8.5]}}},{"from":[0,15,10],"to":[16,16,12],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[13.0,4.5,14.0,5.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,4.5,15.0,5.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,4.5,8.0,5.5]},"north":{"texture":"atlas2","uv":[0.0,5.5,8.0,6.0]},"south":{"texture":"atlas2","uv":[0.0,6.0,8.0,6.5]}}},{"from":[0,15,6],"to":[3,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,11.0,16.0,11.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,11.5,16.0,12.0]},"up":{"texture":"atlas2","cullface":"up","uv":[14.0,12.0,15.5,14.0]},"north":{"texture":"atlas2","uv":[8.0,5.0,9.5,5.5]},"south":{"texture":"atlas2","uv":[9.5,5.0,11.0,5.5]}}},{"from":[4,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,14.0,16.0,14.5]},"west":{"texture":"atlas2","uv":[14.0,14.5,16.0,15.0]},"up":{"texture":"atlas3","cullface":"up","uv":[0.0,0.0,1.0,2.0]},"north":{"texture":"atlas2","uv":[15.0,4.5,16.0,5.0]},"south":{"texture":"atlas2","uv":[8.0,4.0,9.0,4.5]}}},{"from":[10,15,6],"to":[12,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,15.0,16.0,15.5]},"west":{"texture":"atlas2","uv":[14.0,15.5,16.0,16.0]},"up":{"texture":"atlas3","cullface":"up","uv":[1.0,0.0,2.0,2.0]},"north":{"texture":"atlas2","uv":[9.0,4.0,10.0,4.5]},"south":{"texture":"atlas2","uv":[10.0,4.0,11.0,4.5]}}},{"from":[13,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,9.5,16.0,10.0]},"west":{"texture":"atlas2","uv":[14.0,8.0,16.0,8.5]},"up":{"texture":"atlas3","cullface":"up","uv":[2.0,0.0,3.5,2.0]},"north":{"texture":"atlas2","uv":[11.0,5.0,12.5,5.5]},"south":{"texture":"atlas2","uv":[12.5,5.0,14.0,5.5]}}},{"from":[0,15,4],"to":[16,16,6],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[11.0,4.0,12.0,4.5]},"west":{"texture":"atlas2","cullface":"west","uv":[12.0,4.0,13.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,6.5,8.0,7.5]},"north":{"texture":"atlas2","uv":[0.0,7.5,8.0,8.0]},"south":{"texture":"atlas2","uv":[0.0,8.0,8.0,8.5]}}},{"from":[0,15,3],"to":[6,16,4],"faces":{"east":{"texture":"atlas2","uv":[14.0,4.0,14.5,4.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,4.0,15.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,7.5,11.0,8.0]},"north":{"texture":"atlas2","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas2","uv":[8.0,6.5,11.0,7.0]}}},{"from":[10,15,3],"to":[16,16,4],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,4.0,15.5,4.5]},"west":{"texture":"atlas2","uv":[15.5,4.0,16.0,4.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,7.0,11.0,7.5]},"north":{"texture":"atlas2","uv":[11.0,7.0,14.0,7.5]},"south":{"texture":"atlas2","uv":[11.0,6.5,14.0,7.0]}}},{"from":[0,15,0],"to":[16,16,3],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,5.0,15.5,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[9.5,4.5,11.0,5.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,8.5,8.0,10.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,10.0,8.0,10.5]},"south":{"texture":"atlas2","uv":[0.0,10.5,8.0,11.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/computer.json b/src/main/resources/assets/oc2r/models/block/computer.json new file mode 100644 index 00000000..f570b80a --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/computer.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/computer/computer_atlas0","atlas1":"oc2r:block/computer/computer_atlas1","atlas2":"oc2r:block/computer/computer_atlas2","atlas3":"oc2r:block/computer/computer_atlas3","atlas4":"oc2r:block/computer/computer_atlas4","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[12.0,9.0,15.0,9.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,8.0,11.0,8.5]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,0.0,8.0,3.0]},"north":{"texture":"atlas0","uv":[0.0,3.0,8.0,3.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,3.5,8.0,4.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas0","uv":[14.0,8.5,16.0,9.0]},"west":{"texture":"atlas0","cullface":"west","uv":[14.0,8.0,16.0,8.5]},"down":{"texture":"atlas4","cullface":"down","uv":[8.0,7.5,11.0,9.5]},"north":{"texture":"atlas0","uv":[8.0,8.5,11.0,9.0]},"south":{"texture":"atlas0","uv":[11.0,8.5,14.0,9.0]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas0","uv":[14.0,7.0,16.0,7.5]},"down":{"texture":"atlas4","cullface":"down","uv":[8.0,9.5,11.0,11.5]},"north":{"texture":"atlas0","uv":[11.0,8.0,14.0,8.5]},"south":{"texture":"atlas0","uv":[8.0,7.5,11.0,8.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[11.0,7.5,14.0,8.0]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,7.0,11.0,7.5]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,8.0,7.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,7.0,8.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,8.0,8.0]}}},{"from":[0,1,0],"to":[16,3,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,8.0,8.0,9.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,9.0,8.0,10.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,10.0,8.0,11.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,11.0,8.0,12.0]}}},{"from":[0,3,1],"to":[16,4,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,11.0,15.5,11.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,11.5,15.5,12.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,15.5]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,7.5]},"north":{"texture":"atlas0","uv":[0.0,12.0,8.0,12.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,12.5,8.0,13.0]}}},{"from":[0,3,0],"to":[4,4,1],"faces":{"east":{"texture":"atlas0","uv":[15.5,11.5,16.0,12.0]},"west":{"texture":"atlas0","cullface":"west","uv":[15.5,11.0,16.0,11.5]},"up":{"texture":"atlas0","uv":[14.0,6.5,16.0,7.0]},"down":{"texture":"atlas0","uv":[14.0,3.5,16.0,4.0]},"north":{"texture":"atlas0","cullface":"north","uv":[14.0,3.0,16.0,3.5]}}},{"from":[6,3,0],"to":[7,4,1],"faces":{"east":{"texture":"atlas0","uv":[15.5,10.5,16.0,11.0]},"west":{"texture":"atlas0","uv":[15.5,10.0,16.0,10.5]},"up":{"texture":"atlas2","uv":[15.0,15.0,15.5,15.5]},"down":{"texture":"atlas2","uv":[15.5,15.0,16.0,15.5]},"north":{"texture":"atlas2","cullface":"north","uv":[11.5,6.5,12.0,7.0]}}},{"from":[8,3,0],"to":[16,4,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[11.5,7.0,12.0,7.5]},"west":{"texture":"atlas2","uv":[11.5,7.5,12.0,8.0]},"up":{"texture":"atlas0","uv":[8.0,9.0,12.0,9.5]},"down":{"texture":"atlas0","uv":[8.0,9.5,12.0,10.0]},"north":{"texture":"atlas0","cullface":"north","uv":[12.0,9.5,16.0,10.0]}}},{"from":[0,4,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,13.0,8.0,14.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,14.0,8.0,15.0]},"up":{"texture":"atlas2","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas2","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,15.0,8.0,16.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,15.0,16.0,16.0]}}},{"from":[0,6,15],"to":[6,9,16],"faces":{"east":{"texture":"atlas2","uv":[8.0,6.5,8.5,8.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.5,6.5,9.0,8.0]},"up":{"texture":"atlas0","uv":[11.0,7.0,14.0,7.5]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,14.5,11.0,16.0]}}},{"from":[10,6,15],"to":[16,9,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[9.0,6.5,9.5,8.0]},"west":{"texture":"atlas2","uv":[9.5,6.5,10.0,8.0]},"up":{"texture":"atlas0","uv":[8.0,6.5,11.0,7.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,14.5,14.0,16.0]}}},{"from":[0,6,10],"to":[16,10,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[11.0,9.5,13.5,11.5]},"west":{"texture":"atlas4","cullface":"west","uv":[13.5,9.5,16.0,11.5]},"up":{"texture":"atlas0","uv":[8.0,4.0,16.0,6.5]},"down":{"texture":"atlas0","uv":[8.0,0.0,16.0,2.5]},"north":{"texture":"atlas2","uv":[8.0,8.0,16.0,10.0]},"south":{"texture":"atlas2","uv":[8.0,10.0,16.0,12.0]}}},{"from":[1,6,6],"to":[15,10,10],"faces":{"east":{"texture":"atlas3","uv":[14.0,14.0,16.0,16.0]},"west":{"texture":"atlas4","uv":[14.0,11.5,16.0,13.5]},"up":{"texture":"atlas3","uv":[0.0,14.0,7.0,16.0]},"down":{"texture":"atlas3","uv":[7.0,14.0,14.0,16.0]},"north":{"texture":"atlas3","uv":[8.0,9.0,15.0,11.0]},"south":{"texture":"atlas3","uv":[8.0,7.0,15.0,9.0]}}},{"from":[0,6,1],"to":[16,10,6],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[11.0,7.5,13.5,9.5]},"west":{"texture":"atlas4","cullface":"west","uv":[13.5,7.5,16.0,9.5]},"up":{"texture":"atlas2","uv":[8.0,12.0,16.0,14.5]},"down":{"texture":"atlas2","uv":[8.0,0.0,16.0,2.5]},"north":{"texture":"atlas2","uv":[8.0,2.5,16.0,4.5]},"south":{"texture":"atlas2","uv":[8.0,4.5,16.0,6.5]}}},{"from":[0,6,0],"to":[1,15,1],"faces":{"east":{"texture":"atlas4","uv":[8.0,0.0,8.5,4.5]},"west":{"texture":"atlas4","cullface":"west","uv":[8.5,0.0,9.0,4.5]},"up":{"texture":"atlas2","uv":[12.0,7.5,12.5,8.0]},"down":{"texture":"atlas2","uv":[12.5,7.5,13.0,8.0]},"north":{"texture":"atlas4","cullface":"north","uv":[9.0,0.0,9.5,4.5]}}},{"from":[15,6,0],"to":[16,15,1],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[9.5,0.0,10.0,4.5]},"west":{"texture":"atlas4","uv":[10.0,0.0,10.5,4.5]},"up":{"texture":"atlas2","uv":[13.0,7.5,13.5,8.0]},"down":{"texture":"atlas2","uv":[13.5,7.5,14.0,8.0]},"north":{"texture":"atlas4","cullface":"north","uv":[10.5,0.0,11.0,4.5]}}},{"from":[0,9,15],"to":[2,14,16],"faces":{"east":{"texture":"atlas4","uv":[11.0,0.0,11.5,2.5]},"west":{"texture":"atlas4","cullface":"west","uv":[11.5,0.0,12.0,2.5]},"up":{"texture":"atlas0","uv":[15.0,9.0,16.0,9.5]},"down":{"texture":"atlas2","uv":[14.0,15.0,15.0,15.5]},"south":{"texture":"atlas4","cullface":"south","uv":[12.0,0.0,13.0,2.5]}}},{"from":[5,9,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[14.0,7.5,14.5,8.0]},"west":{"texture":"atlas2","uv":[14.5,7.5,15.0,8.0]},"up":{"texture":"atlas2","uv":[15.0,7.5,15.5,8.0]},"down":{"texture":"atlas2","uv":[15.5,7.5,16.0,8.0]},"south":{"texture":"atlas2","cullface":"south","uv":[12.0,7.0,12.5,7.5]}}},{"from":[10,9,15],"to":[11,10,16],"faces":{"east":{"texture":"atlas2","uv":[12.5,7.0,13.0,7.5]},"west":{"texture":"atlas2","uv":[13.0,7.0,13.5,7.5]},"up":{"texture":"atlas2","uv":[13.5,7.0,14.0,7.5]},"down":{"texture":"atlas2","uv":[14.0,7.0,14.5,7.5]},"south":{"texture":"atlas2","cullface":"south","uv":[14.5,7.0,15.0,7.5]}}},{"from":[14,9,15],"to":[16,14,16],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[13.0,0.0,13.5,2.5]},"west":{"texture":"atlas4","uv":[13.5,0.0,14.0,2.5]},"up":{"texture":"atlas2","uv":[14.0,15.5,15.0,16.0]},"down":{"texture":"atlas2","uv":[15.0,15.5,16.0,16.0]},"south":{"texture":"atlas4","cullface":"south","uv":[14.0,0.0,15.0,2.5]}}},{"from":[5,10,15],"to":[11,11,16],"faces":{"east":{"texture":"atlas2","uv":[15.0,7.0,15.5,7.5]},"west":{"texture":"atlas2","uv":[15.5,7.0,16.0,7.5]},"up":{"texture":"atlas0","uv":[11.0,6.5,14.0,7.0]},"down":{"texture":"atlas0","uv":[8.0,3.5,11.0,4.0]},"south":{"texture":"atlas0","cullface":"south","uv":[11.0,3.5,14.0,4.0]}}},{"from":[0,10,1],"to":[16,14,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[8.0,3.0,15.0,5.0]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,5.0,15.0,7.0]},"down":{"texture":"atlas3","uv":[0.0,0.0,8.0,7.0]},"north":{"texture":"atlas3","uv":[0.0,7.0,8.0,9.0]},"south":{"texture":"atlas3","uv":[0.0,9.0,8.0,11.0]}}},{"from":[7,11,15],"to":[8,14,16],"faces":{"east":{"texture":"atlas2","uv":[10.0,6.5,10.5,8.0]},"west":{"texture":"atlas2","uv":[10.5,6.5,11.0,8.0]},"up":{"texture":"atlas2","uv":[12.0,6.5,12.5,7.0]},"down":{"texture":"atlas2","uv":[12.5,6.5,13.0,7.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,6.5,11.5,8.0]}}},{"from":[0,14,1],"to":[16,15,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,10.0,15.5,10.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,10.5,15.5,11.0]},"up":{"texture":"atlas4","uv":[0.0,0.0,8.0,7.5]},"down":{"texture":"atlas4","uv":[0.0,7.5,8.0,15.0]},"north":{"texture":"atlas0","uv":[8.0,14.0,16.0,14.5]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,14.5,16.0,15.0]}}},{"from":[0,15,10],"to":[16,16,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,3.0,11.0,3.5]},"west":{"texture":"atlas0","cullface":"west","uv":[11.0,3.0,14.0,3.5]},"up":{"texture":"atlas3","cullface":"up","uv":[0.0,11.0,8.0,14.0]},"north":{"texture":"atlas0","uv":[8.0,13.0,16.0,13.5]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.5,16.0,14.0]}}},{"from":[0,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas0","uv":[14.0,2.5,16.0,3.0]},"west":{"texture":"atlas1","cullface":"west","uv":[14.0,15.5,16.0,16.0]},"up":{"texture":"atlas4","cullface":"up","uv":[8.0,11.5,11.0,13.5]},"north":{"texture":"atlas0","uv":[8.0,2.5,11.0,3.0]},"south":{"texture":"atlas0","uv":[11.0,2.5,14.0,3.0]}}},{"from":[10,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas2","uv":[14.0,14.5,16.0,15.0]},"up":{"texture":"atlas4","cullface":"up","uv":[11.0,11.5,14.0,13.5]},"north":{"texture":"atlas1","uv":[8.0,15.5,11.0,16.0]},"south":{"texture":"atlas1","uv":[11.0,15.5,14.0,16.0]}}},{"from":[0,15,0],"to":[16,16,6],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,7.5,11.0,8.0]},"west":{"texture":"atlas1","cullface":"west","uv":[11.0,7.5,14.0,8.0]},"up":{"texture":"atlas3","cullface":"up","uv":[8.0,11.0,16.0,14.0]},"down":{"texture":"atlas3","uv":[8.0,0.0,16.0,3.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,12.5,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,12.0,16.0,12.5]}}}]} diff --git a/src/main/resources/assets/oc2/models/block/creative_energy.json b/src/main/resources/assets/oc2r/models/block/creative_energy.json similarity index 59% rename from src/main/resources/assets/oc2/models/block/creative_energy.json rename to src/main/resources/assets/oc2r/models/block/creative_energy.json index 7a3a0d23..d18f6cb2 100644 --- a/src/main/resources/assets/oc2/models/block/creative_energy.json +++ b/src/main/resources/assets/oc2r/models/block/creative_energy.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "oc2:block/creative_energy" + "all": "oc2r:block/creative_energy" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2r/models/block/disk_drive.json b/src/main/resources/assets/oc2r/models/block/disk_drive.json new file mode 100644 index 00000000..1b8d09dd --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/disk_drive.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/disk_drive/disk_drive_atlas0","atlas1":"oc2r:block/disk_drive/disk_drive_atlas1","atlas2":"oc2r:block/disk_drive/disk_drive_atlas2","atlas3":"oc2r:block/disk_drive/disk_drive_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,3.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,3.0,8.0,6.0]},"up":{"texture":"atlas0","uv":[0.0,6.0,8.0,14.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,6.0,16.0,14.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,3.0,16.0,6.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,3.0]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[14.0,0.0,14.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,0.0,15.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,15.5,11.0,16.0]},"down":{"texture":"atlas2","uv":[11.0,15.5,14.0,16.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,0.0,11.0,2.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas2","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,13.5,11.0,14.0]},"down":{"texture":"atlas2","uv":[11.0,13.5,14.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,0.0,14.0,2.0]}}},{"from":[0,6,0],"to":[16,9,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,14.0,15.5,15.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,12.0,15.5,13.5]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,7.5]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,14.0,8.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,14.0,16.0,15.5]}}},{"from":[0,9,1],"to":[16,10,15],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[0.0,15.5,7.0,16.0]},"west":{"texture":"atlas1","cullface":"west","uv":[7.0,15.5,14.0,16.0]},"up":{"texture":"atlas1","uv":[0.0,7.5,8.0,14.5]},"down":{"texture":"atlas1","uv":[8.0,7.5,16.0,14.5]},"north":{"texture":"atlas0","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,9,0],"to":[3,12,1],"faces":{"east":{"texture":"atlas2","uv":[15.5,12.0,16.0,13.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,14.0,16.0,15.5]},"up":{"texture":"atlas1","uv":[14.0,15.5,15.5,16.0]},"down":{"texture":"atlas2","uv":[14.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,0.0,1.5,1.5]}}},{"from":[13,9,0],"to":[16,12,1],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[1.5,0.0,2.0,1.5]},"west":{"texture":"atlas3","uv":[2.0,0.0,2.5,1.5]},"up":{"texture":"atlas2","uv":[14.0,13.5,15.5,14.0]},"down":{"texture":"atlas3","uv":[0.0,1.5,1.5,2.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,2.0,1.5,3.5]}}},{"from":[0,10,1],"to":[16,12,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,2.0,15.5,3.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,3.0,15.5,4.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,7.5]},"north":{"texture":"atlas1","uv":[0.0,14.5,8.0,15.5]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,14.5,16.0,15.5]}}},{"from":[0,12,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[0.0,0.0,8.0,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[0.0,2.0,8.0,4.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,4.0,8.0,12.0]},"down":{"texture":"atlas2","uv":[8.0,4.0,16.0,12.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,12.0,8.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,14.0,8.0,16.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json b/src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json new file mode 100644 index 00000000..1b8d09dd --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/disk_drive/disk_drive_atlas0","atlas1":"oc2r:block/disk_drive/disk_drive_atlas1","atlas2":"oc2r:block/disk_drive/disk_drive_atlas2","atlas3":"oc2r:block/disk_drive/disk_drive_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,3.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,3.0,8.0,6.0]},"up":{"texture":"atlas0","uv":[0.0,6.0,8.0,14.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,6.0,16.0,14.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,3.0,16.0,6.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,3.0]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[14.0,0.0,14.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,0.0,15.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,15.5,11.0,16.0]},"down":{"texture":"atlas2","uv":[11.0,15.5,14.0,16.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,0.0,11.0,2.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas2","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas2","uv":[8.0,13.5,11.0,14.0]},"down":{"texture":"atlas2","uv":[11.0,13.5,14.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[11.0,0.0,14.0,2.0]}}},{"from":[0,6,0],"to":[16,9,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,14.0,15.5,15.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,12.0,15.5,13.5]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,7.5]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,14.0,8.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,14.0,16.0,15.5]}}},{"from":[0,9,1],"to":[16,10,15],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[0.0,15.5,7.0,16.0]},"west":{"texture":"atlas1","cullface":"west","uv":[7.0,15.5,14.0,16.0]},"up":{"texture":"atlas1","uv":[0.0,7.5,8.0,14.5]},"down":{"texture":"atlas1","uv":[8.0,7.5,16.0,14.5]},"north":{"texture":"atlas0","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,9,0],"to":[3,12,1],"faces":{"east":{"texture":"atlas2","uv":[15.5,12.0,16.0,13.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,14.0,16.0,15.5]},"up":{"texture":"atlas1","uv":[14.0,15.5,15.5,16.0]},"down":{"texture":"atlas2","uv":[14.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,0.0,1.5,1.5]}}},{"from":[13,9,0],"to":[16,12,1],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[1.5,0.0,2.0,1.5]},"west":{"texture":"atlas3","uv":[2.0,0.0,2.5,1.5]},"up":{"texture":"atlas2","uv":[14.0,13.5,15.5,14.0]},"down":{"texture":"atlas3","uv":[0.0,1.5,1.5,2.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,2.0,1.5,3.5]}}},{"from":[0,10,1],"to":[16,12,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,2.0,15.5,3.0]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,3.0,15.5,4.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,7.5]},"north":{"texture":"atlas1","uv":[0.0,14.5,8.0,15.5]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,14.5,16.0,15.5]}}},{"from":[0,12,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[0.0,0.0,8.0,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[0.0,2.0,8.0,4.0]},"up":{"texture":"atlas2","cullface":"up","uv":[0.0,4.0,8.0,12.0]},"down":{"texture":"atlas2","uv":[8.0,4.0,16.0,12.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,12.0,8.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,14.0,8.0,16.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/keyboard.json b/src/main/resources/assets/oc2r/models/block/keyboard.json new file mode 100644 index 00000000..73e7104a --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/keyboard.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/keyboard/keyboard_atlas0","atlas1":"oc2r:block/keyboard/keyboard_atlas1","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,15.0,3.0,15.5]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,15.5,3.0,16.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,0.0,8.0,3.0]},"north":{"texture":"atlas0","uv":[0.0,3.0,8.0,3.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,3.5,8.0,4.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas0","uv":[9.0,15.0,11.0,15.5]},"west":{"texture":"atlas0","cullface":"west","uv":[11.0,15.0,13.0,15.5]},"down":{"texture":"atlas1","cullface":"down","uv":[12.0,14.0,15.0,16.0]},"north":{"texture":"atlas0","uv":[3.0,15.5,6.0,16.0]},"south":{"texture":"atlas0","uv":[6.0,15.5,9.0,16.0]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[13.0,15.0,15.0,15.5]},"west":{"texture":"atlas0","uv":[8.0,7.5,10.0,8.0]},"down":{"texture":"atlas1","cullface":"down","uv":[12.0,12.0,15.0,14.0]},"north":{"texture":"atlas0","uv":[9.0,15.5,12.0,16.0]},"south":{"texture":"atlas0","uv":[12.0,15.5,15.0,16.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[3.0,15.0,6.0,15.5]},"west":{"texture":"atlas0","cullface":"west","uv":[6.0,15.0,9.0,15.5]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,8.0,7.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,7.0,8.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,8.0,8.0]}}},{"from":[0,1,0],"to":[16,8,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,8.0,8.0,11.5]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,11.5,8.0,15.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,11.5,16.0,15.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,8.0,16.0,11.5]}}},{"from":[0,8,8],"to":[16,12,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,12.0,12.0,14.0]},"west":{"texture":"atlas1","cullface":"west","uv":[8.0,14.0,12.0,16.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,12.0]},"north":{"texture":"atlas0","uv":[8.0,4.0,16.0,6.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,0.0,16.0,2.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/monitor.json b/src/main/resources/assets/oc2r/models/block/monitor.json new file mode 100644 index 00000000..94af28aa --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/monitor.json @@ -0,0 +1,9 @@ +{ + "loader": "forge:obj", + "flip_v": true, + "model": "oc2r:models/block/monitor.obj", + "textures": { + "texture0": "oc2r:block/monitor/monitor", + "particle": "oc2r:block/monitor/monitor" + } +} diff --git a/src/main/resources/assets/oc2/models/block/monitor.mtl b/src/main/resources/assets/oc2r/models/block/monitor.mtl similarity index 100% rename from src/main/resources/assets/oc2/models/block/monitor.mtl rename to src/main/resources/assets/oc2r/models/block/monitor.mtl diff --git a/src/main/resources/assets/oc2/models/block/monitor.obj b/src/main/resources/assets/oc2r/models/block/monitor.obj similarity index 100% rename from src/main/resources/assets/oc2/models/block/monitor.obj rename to src/main/resources/assets/oc2r/models/block/monitor.obj diff --git a/src/main/resources/assets/oc2r/models/block/network_connector.json b/src/main/resources/assets/oc2r/models/block/network_connector.json new file mode 100644 index 00000000..39a5e9dc --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/network_connector.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/network_connector/network_connector_atlas0","particle":"#atlas0"},"elements":[{"from":[5,0,5],"to":[11,1,11],"faces":{"east":{"texture":"atlas0","uv":[0.0,0.0,3.0,0.5]},"west":{"texture":"atlas0","uv":[0.0,0.5,3.0,1.0]},"up":{"texture":"atlas0","uv":[0.0,1.0,3.0,4.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,3.0,7.0]},"north":{"texture":"atlas0","uv":[0.0,7.0,3.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,3.0,8.0]}}},{"from":[6,1,10],"to":[10,3,11],"faces":{"east":{"texture":"atlas0","uv":[7.0,1.0,7.5,2.0]},"west":{"texture":"atlas0","uv":[7.5,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[3.0,15.5,5.0,16.0]},"south":{"texture":"atlas0","uv":[3.0,11.0,5.0,12.0]}}},{"from":[5,1,6],"to":[11,3,10],"faces":{"east":{"texture":"atlas0","uv":[5.0,11.0,7.0,12.0]},"west":{"texture":"atlas0","uv":[7.0,11.0,9.0,12.0]},"up":{"texture":"atlas0","uv":[0.0,8.0,3.0,10.0]},"north":{"texture":"atlas0","uv":[0.0,10.0,3.0,11.0]},"south":{"texture":"atlas0","uv":[0.0,11.0,3.0,12.0]}}},{"from":[6,1,5],"to":[10,3,6],"faces":{"east":{"texture":"atlas0","uv":[8.0,1.0,8.5,2.0]},"west":{"texture":"atlas0","uv":[8.5,1.0,9.0,2.0]},"up":{"texture":"atlas0","uv":[5.0,15.5,7.0,16.0]},"north":{"texture":"atlas0","uv":[9.0,11.0,11.0,12.0]}}},{"from":[6,3,10],"to":[7,4,11],"faces":{"east":{"texture":"atlas0","uv":[7.0,14.5,7.5,15.0]},"west":{"texture":"atlas0","uv":[7.5,14.5,8.0,15.0]},"up":{"texture":"atlas0","uv":[8.0,14.5,8.5,15.0]},"down":{"texture":"atlas0","uv":[8.5,14.5,9.0,15.0]},"south":{"texture":"atlas0","uv":[9.0,14.5,9.5,15.0]}}},{"from":[9,3,10],"to":[10,4,11],"faces":{"east":{"texture":"atlas0","uv":[9.5,14.5,10.0,15.0]},"west":{"texture":"atlas0","uv":[10.0,14.5,10.5,15.0]},"up":{"texture":"atlas0","uv":[10.5,14.5,11.0,15.0]},"down":{"texture":"atlas0","uv":[11.0,14.5,11.5,15.0]},"south":{"texture":"atlas0","uv":[11.5,14.5,12.0,15.0]}}},{"from":[5,3,9],"to":[11,4,10],"faces":{"east":{"texture":"atlas0","uv":[12.0,14.5,12.5,15.0]},"west":{"texture":"atlas0","uv":[12.5,14.5,13.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,3.0,12.5]},"down":{"texture":"atlas0","uv":[0.0,12.5,3.0,13.0]},"north":{"texture":"atlas0","uv":[0.0,13.0,3.0,13.5]},"south":{"texture":"atlas0","uv":[0.0,13.5,3.0,14.0]}}},{"from":[6,3,7],"to":[10,4,9],"faces":{"east":{"texture":"atlas0","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas0","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[11.0,11.0,13.0,12.0]},"down":{"texture":"atlas0","uv":[13.0,11.0,15.0,12.0]},"north":{"texture":"atlas0","uv":[7.0,15.5,9.0,16.0]},"south":{"texture":"atlas0","uv":[9.0,15.5,11.0,16.0]}}},{"from":[5,3,6],"to":[11,4,7],"faces":{"east":{"texture":"atlas0","uv":[13.0,14.5,13.5,15.0]},"west":{"texture":"atlas0","uv":[13.5,14.5,14.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,14.0,3.0,14.5]},"down":{"texture":"atlas0","uv":[0.0,14.5,3.0,15.0]},"north":{"texture":"atlas0","uv":[0.0,15.0,3.0,15.5]},"south":{"texture":"atlas0","uv":[0.0,15.5,3.0,16.0]}}},{"from":[6,3,5],"to":[7,4,6],"faces":{"east":{"texture":"atlas0","uv":[14.0,14.5,14.5,15.0]},"west":{"texture":"atlas0","uv":[14.5,14.5,15.0,15.0]},"up":{"texture":"atlas0","uv":[15.0,14.5,15.5,15.0]},"down":{"texture":"atlas0","uv":[15.5,14.5,16.0,15.0]},"north":{"texture":"atlas0","uv":[3.0,14.0,3.5,14.5]}}},{"from":[9,3,5],"to":[10,4,6],"faces":{"east":{"texture":"atlas0","uv":[3.5,14.0,4.0,14.5]},"west":{"texture":"atlas0","uv":[4.0,14.0,4.5,14.5]},"up":{"texture":"atlas0","uv":[4.5,14.0,5.0,14.5]},"down":{"texture":"atlas0","uv":[5.0,14.0,5.5,14.5]},"north":{"texture":"atlas0","uv":[5.5,14.0,6.0,14.5]}}},{"from":[6,4,10],"to":[10,7,11],"faces":{"east":{"texture":"atlas0","uv":[5.0,1.0,5.5,2.5]},"west":{"texture":"atlas0","uv":[5.5,1.0,6.0,2.5]},"up":{"texture":"atlas0","uv":[11.0,15.5,13.0,16.0]},"down":{"texture":"atlas0","uv":[13.0,15.5,15.0,16.0]},"south":{"texture":"atlas0","uv":[3.0,4.0,5.0,5.5]}}},{"from":[5,4,6],"to":[11,7,10],"faces":{"east":{"texture":"atlas0","uv":[3.0,5.5,5.0,7.0]},"west":{"texture":"atlas0","uv":[5.0,5.5,7.0,7.0]},"up":{"texture":"atlas0","uv":[3.0,8.0,6.0,10.0]},"down":{"texture":"atlas0","uv":[6.0,8.0,9.0,10.0]},"north":{"texture":"atlas0","uv":[9.0,8.0,12.0,9.5]},"south":{"texture":"atlas0","uv":[12.0,8.0,15.0,9.5]}}},{"from":[6,4,5],"to":[10,7,6],"faces":{"east":{"texture":"atlas0","uv":[6.0,1.0,6.5,2.5]},"west":{"texture":"atlas0","uv":[6.5,1.0,7.0,2.5]},"up":{"texture":"atlas0","uv":[3.0,15.0,5.0,15.5]},"down":{"texture":"atlas0","uv":[5.0,15.0,7.0,15.5]},"north":{"texture":"atlas0","uv":[7.0,5.5,9.0,7.0]}}},{"from":[6,7,6],"to":[10,8,10],"faces":{"east":{"texture":"atlas0","uv":[7.0,15.0,9.0,15.5]},"west":{"texture":"atlas0","uv":[9.0,15.0,11.0,15.5]},"up":{"texture":"atlas0","uv":[3.0,1.0,5.0,3.0]},"north":{"texture":"atlas0","uv":[11.0,15.0,13.0,15.5]},"south":{"texture":"atlas0","uv":[13.0,15.0,15.0,15.5]}}},{"from":[7,8,7],"to":[9,9,9],"faces":{"east":{"texture":"atlas0","uv":[3.0,14.5,4.0,15.0]},"west":{"texture":"atlas0","uv":[4.0,14.5,5.0,15.0]},"up":{"texture":"atlas0","uv":[15.0,11.0,16.0,12.0]},"north":{"texture":"atlas0","uv":[5.0,14.5,6.0,15.0]},"south":{"texture":"atlas0","uv":[6.0,14.5,7.0,15.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/network_hub.json b/src/main/resources/assets/oc2r/models/block/network_hub.json new file mode 100644 index 00000000..a6108a6d --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/network_hub.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/network_hub/network_hub_atlas0","atlas1":"oc2r:block/network_hub/network_hub_atlas1","atlas2":"oc2r:block/network_hub/network_hub_atlas2","atlas3":"oc2r:block/network_hub/network_hub_atlas3","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,7.0,11.0,7.5]},"west":{"texture":"atlas1","cullface":"west","uv":[8.0,7.5,11.0,8.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,0.0,8.0,3.0]},"north":{"texture":"atlas0","uv":[0.0,3.0,8.0,3.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,3.5,8.0,4.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas1","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas1","cullface":"west","uv":[14.0,7.0,16.0,7.5]},"down":{"texture":"atlas3","cullface":"down","uv":[0.0,0.0,3.0,2.0]},"north":{"texture":"atlas1","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas1","uv":[11.0,7.0,14.0,7.5]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[9.0,14.5,11.0,15.0]},"west":{"texture":"atlas3","uv":[11.0,14.5,13.0,15.0]},"down":{"texture":"atlas3","cullface":"down","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas3","uv":[0.0,4.0,3.0,4.5]},"south":{"texture":"atlas3","uv":[0.0,4.5,3.0,5.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,5.0,3.0,5.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,5.5,3.0,6.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,4.0,8.0,7.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,7.0,8.0,7.5]},"south":{"texture":"atlas0","uv":[0.0,7.5,8.0,8.0]}}},{"from":[0,1,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,8.0,8.0,10.5]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,10.5,8.0,13.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,13.0,8.0,15.5]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,15.5]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas3","uv":[0.0,6.0,3.0,6.5]},"down":{"texture":"atlas3","uv":[0.0,6.5,3.0,7.0]},"south":{"texture":"atlas3","cullface":"south","uv":[0.0,7.0,3.0,9.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,2.0,15.5,4.0]},"west":{"texture":"atlas2","uv":[15.5,2.0,16.0,4.0]},"up":{"texture":"atlas3","uv":[0.0,9.0,3.0,9.5]},"down":{"texture":"atlas3","uv":[0.0,9.5,3.0,10.0]},"south":{"texture":"atlas3","cullface":"south","uv":[0.0,10.0,3.0,12.0]}}},{"from":[0,6,10],"to":[16,10,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[3.0,10.0,5.5,12.0]},"west":{"texture":"atlas3","cullface":"west","uv":[5.5,10.0,8.0,12.0]},"up":{"texture":"atlas0","uv":[8.0,10.5,16.0,13.0]},"down":{"texture":"atlas0","uv":[8.0,8.0,16.0,10.5]},"north":{"texture":"atlas0","uv":[8.0,4.0,16.0,6.0]},"south":{"texture":"atlas0","uv":[8.0,0.0,16.0,2.0]}}},{"from":[1,6,6],"to":[15,10,10],"faces":{"east":{"texture":"atlas3","uv":[13.0,10.0,15.0,12.0]},"west":{"texture":"atlas3","uv":[3.0,7.0,5.0,9.0]},"up":{"texture":"atlas2","uv":[8.0,0.0,15.0,2.0]},"down":{"texture":"atlas2","uv":[8.0,2.0,15.0,4.0]},"north":{"texture":"atlas2","uv":[8.0,4.0,15.0,6.0]},"south":{"texture":"atlas2","uv":[8.0,6.0,15.0,8.0]}}},{"from":[0,6,1],"to":[16,10,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[8.0,10.0,10.5,12.0]},"west":{"texture":"atlas3","cullface":"west","uv":[10.5,10.0,13.0,12.0]},"up":{"texture":"atlas1","uv":[8.0,8.0,16.0,10.5]},"down":{"texture":"atlas1","uv":[8.0,10.5,16.0,13.0]},"north":{"texture":"atlas1","uv":[8.0,13.0,16.0,15.0]},"south":{"texture":"atlas1","uv":[8.0,0.0,16.0,2.0]}}},{"from":[0,6,0],"to":[6,10,1],"faces":{"east":{"texture":"atlas2","uv":[15.0,4.0,15.5,6.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,4.0,16.0,6.0]},"up":{"texture":"atlas3","uv":[0.0,12.0,3.0,12.5]},"down":{"texture":"atlas3","uv":[0.0,12.5,3.0,13.0]},"north":{"texture":"atlas3","cullface":"north","uv":[0.0,13.0,3.0,15.0]}}},{"from":[10,6,0],"to":[16,10,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,6.0,15.5,8.0]},"west":{"texture":"atlas2","uv":[15.5,6.0,16.0,8.0]},"up":{"texture":"atlas3","uv":[0.0,15.0,3.0,15.5]},"down":{"texture":"atlas3","uv":[0.0,15.5,3.0,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[3.0,13.0,6.0,15.0]}}},{"from":[0,10,0],"to":[16,15,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,2.0,16.0,4.5]},"west":{"texture":"atlas1","cullface":"west","uv":[8.0,4.5,16.0,7.0]},"up":{"texture":"atlas2","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas2","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,8.0,16.0,10.5]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,10.5,16.0,13.0]}}},{"from":[0,15,13],"to":[16,16,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[11.0,13.0,12.5,13.5]},"west":{"texture":"atlas3","cullface":"west","uv":[12.5,13.0,14.0,13.5]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,13.0,16.0,14.5]},"north":{"texture":"atlas0","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,15,12],"to":[6,16,13],"faces":{"east":{"texture":"atlas3","uv":[15.5,13.0,16.0,13.5]},"west":{"texture":"atlas3","cullface":"west","uv":[13.5,12.5,14.0,13.0]},"up":{"texture":"atlas3","cullface":"up","uv":[3.0,15.5,6.0,16.0]},"north":{"texture":"atlas3","uv":[6.0,15.5,9.0,16.0]},"south":{"texture":"atlas3","uv":[9.0,15.5,12.0,16.0]}}},{"from":[10,15,12],"to":[16,16,13],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[14.0,12.5,14.5,13.0]},"west":{"texture":"atlas3","uv":[14.5,12.5,15.0,13.0]},"up":{"texture":"atlas3","cullface":"up","uv":[12.0,15.5,15.0,16.0]},"north":{"texture":"atlas3","uv":[3.0,15.0,6.0,15.5]},"south":{"texture":"atlas3","uv":[6.0,15.0,9.0,15.5]}}},{"from":[0,15,10],"to":[16,16,12],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","cullface":"up","uv":[8.0,6.0,16.0,7.0]},"north":{"texture":"atlas0","uv":[8.0,7.5,16.0,8.0]},"south":{"texture":"atlas0","uv":[8.0,7.0,16.0,7.5]}}},{"from":[0,15,6],"to":[3,16,10],"faces":{"east":{"texture":"atlas3","uv":[13.0,14.5,15.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[9.0,14.0,11.0,14.5]},"up":{"texture":"atlas3","cullface":"up","uv":[3.0,0.0,4.5,2.0]},"north":{"texture":"atlas3","uv":[14.0,13.0,15.5,13.5]},"south":{"texture":"atlas3","uv":[3.0,12.5,4.5,13.0]}}},{"from":[4,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas3","uv":[11.0,14.0,13.0,14.5]},"west":{"texture":"atlas3","uv":[13.0,14.0,15.0,14.5]},"up":{"texture":"atlas3","cullface":"up","uv":[4.5,0.0,5.5,2.0]},"north":{"texture":"atlas3","uv":[15.0,14.5,16.0,15.0]},"south":{"texture":"atlas3","uv":[15.0,14.0,16.0,14.5]}}},{"from":[10,15,6],"to":[12,16,10],"faces":{"east":{"texture":"atlas3","uv":[9.0,13.5,11.0,14.0]},"west":{"texture":"atlas3","uv":[11.0,13.5,13.0,14.0]},"up":{"texture":"atlas3","cullface":"up","uv":[5.5,0.0,6.5,2.0]},"north":{"texture":"atlas3","uv":[15.0,13.5,16.0,14.0]},"south":{"texture":"atlas3","uv":[10.5,12.5,11.5,13.0]}}},{"from":[13,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[13.0,13.5,15.0,14.0]},"west":{"texture":"atlas3","uv":[9.0,13.0,11.0,13.5]},"up":{"texture":"atlas3","cullface":"up","uv":[6.5,0.0,8.0,2.0]},"north":{"texture":"atlas3","uv":[4.5,12.5,6.0,13.0]},"south":{"texture":"atlas3","uv":[6.0,12.5,7.5,13.0]}}},{"from":[0,15,4],"to":[16,16,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[11.5,12.5,12.5,13.0]},"west":{"texture":"atlas3","cullface":"west","uv":[12.5,12.5,13.5,13.0]},"up":{"texture":"atlas0","cullface":"up","uv":[8.0,2.0,16.0,3.0]},"north":{"texture":"atlas0","uv":[8.0,3.5,16.0,4.0]},"south":{"texture":"atlas0","uv":[8.0,3.0,16.0,3.5]}}},{"from":[0,15,3],"to":[6,16,4],"faces":{"east":{"texture":"atlas3","uv":[15.0,12.5,15.5,13.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,12.5,16.0,13.0]},"up":{"texture":"atlas3","cullface":"up","uv":[9.0,15.0,12.0,15.5]},"north":{"texture":"atlas3","uv":[12.0,15.0,15.0,15.5]},"south":{"texture":"atlas3","uv":[6.0,13.0,9.0,13.5]}}},{"from":[10,15,3],"to":[16,16,4],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[3.0,12.0,3.5,12.5]},"west":{"texture":"atlas3","uv":[3.5,12.0,4.0,12.5]},"up":{"texture":"atlas3","cullface":"up","uv":[6.0,13.5,9.0,14.0]},"north":{"texture":"atlas3","uv":[6.0,14.0,9.0,14.5]},"south":{"texture":"atlas3","uv":[6.0,14.5,9.0,15.0]}}},{"from":[0,15,0],"to":[16,16,3],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[7.5,12.5,9.0,13.0]},"west":{"texture":"atlas3","cullface":"west","uv":[9.0,12.5,10.5,13.0]},"up":{"texture":"atlas2","cullface":"up","uv":[8.0,14.5,16.0,16.0]},"north":{"texture":"atlas1","cullface":"north","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas1","uv":[8.0,15.5,16.0,16.0]}}}]} diff --git a/src/main/resources/assets/oc2/models/block/network_switch.json b/src/main/resources/assets/oc2r/models/block/network_switch.json similarity index 97% rename from src/main/resources/assets/oc2/models/block/network_switch.json rename to src/main/resources/assets/oc2r/models/block/network_switch.json index 36b365b8..58d7c5ea 100644 --- a/src/main/resources/assets/oc2/models/block/network_switch.json +++ b/src/main/resources/assets/oc2r/models/block/network_switch.json @@ -1,11 +1,11 @@ { "parent": "block/block", "textures": { - "particle": "oc2:block/network_switch/network_switch_atlas0", - "atlas0": "oc2:block/network_switch/network_switch_atlas0", - "atlas1": "oc2:block/network_switch/network_switch_atlas1", - "atlas2": "oc2:block/network_switch/network_switch_atlas2", - "atlas3": "oc2:block/network_switch/network_switch_atlas3" + "particle": "oc2r:block/network_switch/network_switch_atlas0", + "atlas0": "oc2r:block/network_switch/network_switch_atlas0", + "atlas1": "oc2r:block/network_switch/network_switch_atlas1", + "atlas2": "oc2r:block/network_switch/network_switch_atlas2", + "atlas3": "oc2r:block/network_switch/network_switch_atlas3" }, "elements": [ { diff --git a/src/main/resources/assets/oc2r/models/block/pci_card_cage.json b/src/main/resources/assets/oc2r/models/block/pci_card_cage.json new file mode 100644 index 00000000..33e97ae2 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/pci_card_cage.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/pci_card_cage/pci_card_cage_atlas0","atlas1":"oc2r:block/pci_card_cage/pci_card_cage_atlas1","atlas2":"oc2r:block/pci_card_cage/pci_card_cage_atlas2","atlas3":"oc2r:block/pci_card_cage/pci_card_cage_atlas3","atlas4":"oc2r:block/pci_card_cage/pci_card_cage_atlas4","atlas5":"oc2r:block/pci_card_cage/pci_card_cage_atlas5","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,2,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,1.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,2.0,8.0,10.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,2.0,16.0,10.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,10.0,8.0,11.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,11.0,8.0,12.0]}}},{"from":[0,2,14],"to":[16,6,16],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[15.0,4.0,16.0,6.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,6.0,16.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,8.0,13.0]},"north":{"texture":"atlas0","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,2,2],"to":[15,6,14],"faces":{"east":{"texture":"atlas3","uv":[7.0,12.0,13.0,14.0]},"west":{"texture":"atlas4","uv":[8.0,14.0,14.0,16.0]},"up":{"texture":"atlas4","uv":[8.0,8.0,15.0,14.0]},"down":{"texture":"atlas4","uv":[8.0,0.0,15.0,6.0]},"north":{"texture":"atlas3","uv":[0.0,12.0,7.0,14.0]}}},{"from":[0,2,0],"to":[16,3,2],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[0.0,15.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,3,1],"to":[16,4,2],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.5,15.5,16.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[8.0,12.0,16.0,12.5]},"north":{"texture":"atlas0","uv":[8.0,12.5,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,11.0,16.0,11.5]}}},{"from":[0,3,0],"to":[7,4,1],"faces":{"east":{"texture":"atlas3","uv":[15.5,14.5,16.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,14.0,16.0,14.5]},"up":{"texture":"atlas3","uv":[12.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[4.0,15.0,7.5,15.5]}}},{"from":[9,3,0],"to":[16,4,1],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,14.5,4.5,15.0]},"west":{"texture":"atlas5","uv":[4.5,14.5,5.0,15.0]},"up":{"texture":"atlas3","uv":[7.5,15.0,11.0,15.5]},"north":{"texture":"atlas3","cullface":"north","uv":[11.0,15.0,14.5,15.5]}}},{"from":[0,4,0],"to":[4,12,2],"faces":{"east":{"texture":"atlas4","uv":[15.0,0.0,16.0,4.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,8.0,16.0,12.0]},"up":{"texture":"atlas4","uv":[14.0,14.0,16.0,15.0]},"down":{"texture":"atlas4","uv":[14.0,15.0,16.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[0.0,10.5,2.0,14.5]},"south":{"texture":"atlas5","uv":[2.0,10.5,4.0,14.5]}}},{"from":[6,4,0],"to":[10,5,2],"faces":{"east":{"texture":"atlas2","uv":[15.0,6.5,16.0,7.0]},"west":{"texture":"atlas2","uv":[15.0,3.0,16.0,3.5]},"up":{"texture":"atlas5","uv":[0.0,15.0,2.0,16.0]},"down":{"texture":"atlas5","uv":[2.0,15.0,4.0,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[13.5,14.5,15.5,15.0]}}},{"from":[12,4,0],"to":[16,12,2],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,10.5,5.0,14.5]},"west":{"texture":"atlas5","uv":[5.0,10.5,6.0,14.5]},"up":{"texture":"atlas5","uv":[4.0,15.0,6.0,16.0]},"down":{"texture":"atlas5","uv":[6.0,15.0,8.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[6.0,10.5,8.0,14.5]},"south":{"texture":"atlas5","uv":[8.0,10.5,10.0,14.5]}}},{"from":[0,6,15],"to":[2,7,16],"faces":{"east":{"texture":"atlas5","uv":[5.0,14.5,5.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[5.5,14.5,6.0,15.0]},"up":{"texture":"atlas2","uv":[15.0,2.5,16.0,3.0]},"down":{"texture":"atlas2","uv":[15.0,2.0,16.0,2.5]},"south":{"texture":"atlas3","cullface":"south","uv":[14.5,15.0,15.5,15.5]}}},{"from":[5,6,15],"to":[6,7,16],"faces":{"east":{"texture":"atlas5","uv":[6.0,14.5,6.5,15.0]},"west":{"texture":"atlas5","uv":[6.5,14.5,7.0,15.0]},"up":{"texture":"atlas5","uv":[7.0,14.5,7.5,15.0]},"down":{"texture":"atlas5","uv":[7.5,14.5,8.0,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[8.0,14.5,8.5,15.0]}}},{"from":[10,6,15],"to":[11,7,16],"faces":{"east":{"texture":"atlas5","uv":[8.5,14.5,9.0,15.0]},"west":{"texture":"atlas5","uv":[9.0,14.5,9.5,15.0]},"up":{"texture":"atlas5","uv":[9.5,14.5,10.0,15.0]},"down":{"texture":"atlas5","uv":[10.0,14.5,10.5,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.5,14.5,11.0,15.0]}}},{"from":[14,6,15],"to":[16,7,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[11.0,14.5,11.5,15.0]},"west":{"texture":"atlas5","uv":[11.5,14.5,12.0,15.0]},"up":{"texture":"atlas3","uv":[14.0,11.5,15.0,12.0]},"down":{"texture":"atlas3","uv":[15.0,11.5,16.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[14.0,7.5,15.0,8.0]}}},{"from":[0,6,2],"to":[16,7,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,14.0,6.5,14.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,14.5,6.5,15.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,6.5]},"down":{"texture":"atlas1","uv":[0.0,6.5,8.0,13.0]},"north":{"texture":"atlas0","uv":[8.0,11.5,16.0,12.0]},"south":{"texture":"atlas0","uv":[8.0,10.0,16.0,10.5]}}},{"from":[0,7,15],"to":[6,8,16],"faces":{"east":{"texture":"atlas5","uv":[12.0,14.5,12.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[12.5,14.5,13.0,15.0]},"up":{"texture":"atlas3","uv":[6.5,14.0,9.5,14.5]},"down":{"texture":"atlas3","uv":[9.5,14.0,12.5,14.5]},"south":{"texture":"atlas3","cullface":"south","uv":[12.5,14.0,15.5,14.5]}}},{"from":[10,7,15],"to":[16,8,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[13.0,14.5,13.5,15.0]},"west":{"texture":"atlas5","uv":[13.5,14.5,14.0,15.0]},"up":{"texture":"atlas3","uv":[13.0,12.0,16.0,12.5]},"down":{"texture":"atlas3","uv":[13.0,12.5,16.0,13.0]},"south":{"texture":"atlas3","cullface":"south","uv":[13.0,13.0,16.0,13.5]}}},{"from":[0,7,8],"to":[16,11,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[8.0,6.0,11.5,8.0]},"west":{"texture":"atlas4","cullface":"west","uv":[11.5,6.0,15.0,8.0]},"up":{"texture":"atlas1","uv":[8.0,6.5,16.0,10.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,3.5]},"north":{"texture":"atlas1","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas1","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,7,7],"to":[15,14,8],"faces":{"east":{"texture":"atlas3","uv":[15.0,0.0,15.5,3.5]},"west":{"texture":"atlas3","uv":[15.5,0.0,16.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,15.5,15.0,16.0]},"down":{"texture":"atlas2","uv":[8.0,15.0,15.0,15.5]},"north":{"texture":"atlas3","uv":[8.0,8.0,15.0,11.5]},"south":{"texture":"atlas3","uv":[8.0,4.0,15.0,7.5]}}},{"from":[0,7,6],"to":[16,14,7],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.0,4.0,15.5,7.5]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,4.0,16.0,7.5]},"up":{"texture":"atlas0","uv":[8.0,10.5,16.0,11.0]},"down":{"texture":"atlas0","uv":[8.0,1.0,16.0,1.5]},"north":{"texture":"atlas2","uv":[0.0,0.0,8.0,3.5]},"south":{"texture":"atlas2","uv":[0.0,3.5,8.0,7.0]}}},{"from":[1,7,5],"to":[15,14,6],"faces":{"east":{"texture":"atlas3","uv":[15.0,8.0,15.5,11.5]},"west":{"texture":"atlas3","uv":[15.5,8.0,16.0,11.5]},"up":{"texture":"atlas2","uv":[8.0,6.5,15.0,7.0]},"down":{"texture":"atlas2","uv":[8.0,2.0,15.0,2.5]},"north":{"texture":"atlas3","uv":[8.0,0.0,15.0,3.5]},"south":{"texture":"atlas5","uv":[0.0,0.0,7.0,3.5]}}},{"from":[0,7,4],"to":[16,14,5],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[7.0,0.0,7.5,3.5]},"west":{"texture":"atlas5","cullface":"west","uv":[7.5,0.0,8.0,3.5]},"up":{"texture":"atlas0","uv":[8.0,1.5,16.0,2.0]},"down":{"texture":"atlas0","uv":[8.0,0.0,16.0,0.5]},"north":{"texture":"atlas2","uv":[0.0,7.0,8.0,10.5]},"south":{"texture":"atlas2","uv":[0.0,10.5,8.0,14.0]}}},{"from":[1,7,3],"to":[15,14,4],"faces":{"east":{"texture":"atlas5","uv":[8.0,0.0,8.5,3.5]},"west":{"texture":"atlas5","uv":[8.5,0.0,9.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,2.5,15.0,3.0]},"down":{"texture":"atlas2","uv":[8.0,3.0,15.0,3.5]},"north":{"texture":"atlas5","uv":[0.0,3.5,7.0,7.0]},"south":{"texture":"atlas5","uv":[0.0,7.0,7.0,10.5]}}},{"from":[0,7,2],"to":[16,12,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[9.0,0.0,9.5,2.5]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,0.0,10.0,2.5]},"up":{"texture":"atlas0","uv":[8.0,0.5,16.0,1.0]},"down":{"texture":"atlas1","uv":[0.0,15.0,8.0,15.5]},"north":{"texture":"atlas1","uv":[8.0,10.0,16.0,12.5]},"south":{"texture":"atlas1","uv":[8.0,3.5,16.0,6.0]}}},{"from":[0,8,15],"to":[2,9,16],"faces":{"east":{"texture":"atlas5","uv":[14.0,14.5,14.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[14.5,14.5,15.0,15.0]},"up":{"texture":"atlas3","uv":[15.0,7.5,16.0,8.0]},"down":{"texture":"atlas3","uv":[14.0,3.5,15.0,4.0]},"south":{"texture":"atlas3","cullface":"south","uv":[15.0,3.5,16.0,4.0]}}},{"from":[5,8,15],"to":[6,9,16],"faces":{"east":{"texture":"atlas5","uv":[15.0,14.5,15.5,15.0]},"west":{"texture":"atlas5","uv":[15.5,14.5,16.0,15.0]},"up":{"texture":"atlas5","uv":[10.0,10.5,10.5,11.0]},"down":{"texture":"atlas5","uv":[10.0,11.0,10.5,11.5]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,11.5,10.5,12.0]}}},{"from":[10,8,15],"to":[11,9,16],"faces":{"east":{"texture":"atlas5","uv":[10.0,12.0,10.5,12.5]},"west":{"texture":"atlas5","uv":[10.0,12.5,10.5,13.0]},"up":{"texture":"atlas5","uv":[10.0,13.0,10.5,13.5]},"down":{"texture":"atlas5","uv":[10.0,13.5,10.5,14.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,14.0,10.5,14.5]}}},{"from":[14,8,15],"to":[16,9,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[10.5,14.0,11.0,14.5]},"west":{"texture":"atlas5","uv":[11.0,14.0,11.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,12.0,16.0,12.5]},"down":{"texture":"atlas4","uv":[15.0,12.5,16.0,13.0]},"south":{"texture":"atlas4","cullface":"south","uv":[15.0,13.0,16.0,13.5]}}},{"from":[0,9,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas5","uv":[11.5,14.0,12.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[12.0,14.0,12.5,14.5]},"up":{"texture":"atlas3","uv":[13.0,13.5,16.0,14.0]},"down":{"texture":"atlas3","uv":[8.0,11.5,11.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[11.0,11.5,14.0,12.0]}}},{"from":[10,9,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.5,14.0,13.0,14.5]},"west":{"texture":"atlas5","uv":[13.0,14.0,13.5,14.5]},"up":{"texture":"atlas3","uv":[8.0,7.5,11.0,8.0]},"down":{"texture":"atlas3","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas3","cullface":"south","uv":[8.0,3.5,11.0,4.0]}}},{"from":[0,10,15],"to":[2,11,16],"faces":{"east":{"texture":"atlas5","uv":[13.5,14.0,14.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[14.0,14.0,14.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,13.5,16.0,14.0]},"down":{"texture":"atlas5","uv":[11.0,15.0,12.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[11.0,15.5,12.0,16.0]}}},{"from":[5,10,15],"to":[11,11,16],"faces":{"east":{"texture":"atlas5","uv":[14.5,14.0,15.0,14.5]},"west":{"texture":"atlas5","uv":[15.0,14.0,15.5,14.5]},"down":{"texture":"atlas3","uv":[11.0,3.5,14.0,4.0]},"south":{"texture":"atlas5","cullface":"south","uv":[0.0,14.5,3.0,15.0]}}},{"from":[14,10,15],"to":[16,11,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[15.5,14.0,16.0,14.5]},"west":{"texture":"atlas5","uv":[10.5,13.5,11.0,14.0]},"up":{"texture":"atlas5","uv":[12.0,15.5,13.0,16.0]},"down":{"texture":"atlas5","uv":[13.0,15.5,14.0,16.0]},"south":{"texture":"atlas5","cullface":"south","uv":[14.0,15.5,15.0,16.0]}}},{"from":[0,11,8],"to":[16,12,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,15.0,4.0,15.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,15.5,4.0,16.0]},"up":{"texture":"atlas3","uv":[0.0,0.0,8.0,4.0]},"down":{"texture":"atlas3","uv":[0.0,4.0,8.0,8.0]},"north":{"texture":"atlas1","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,12,15],"to":[2,13,16],"faces":{"east":{"texture":"atlas5","uv":[11.0,13.5,11.5,14.0]},"west":{"texture":"atlas5","cullface":"west","uv":[11.5,13.5,12.0,14.0]},"up":{"texture":"atlas5","uv":[15.0,15.5,16.0,16.0]},"down":{"texture":"atlas5","uv":[12.0,15.0,13.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[13.0,15.0,14.0,15.5]}}},{"from":[14,12,15],"to":[16,13,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.0,13.5,12.5,14.0]},"west":{"texture":"atlas5","uv":[12.5,13.5,13.0,14.0]},"up":{"texture":"atlas5","uv":[14.0,15.0,15.0,15.5]},"down":{"texture":"atlas5","uv":[15.0,15.0,16.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[3.0,14.5,4.0,15.0]}}},{"from":[0,12,8],"to":[16,13,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[6.5,14.5,10.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[10.0,14.5,13.5,15.0]},"up":{"texture":"atlas2","uv":[8.0,10.5,16.0,14.0]},"down":{"texture":"atlas2","uv":[8.0,7.0,16.0,10.5]},"north":{"texture":"atlas1","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas1","uv":[8.0,12.5,16.0,13.0]}}},{"from":[0,12,0],"to":[16,14,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[8.0,15.0,9.5,16.0]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,15.0,11.0,16.0]},"down":{"texture":"atlas2","uv":[0.0,14.0,8.0,15.5]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,14.0,16.0,15.0]},"south":{"texture":"atlas2","uv":[8.0,3.5,16.0,4.5]}}},{"from":[0,13,8],"to":[16,14,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[4.0,15.5,8.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,15.5,12.0,16.0]},"down":{"texture":"atlas3","uv":[0.0,8.0,8.0,12.0]},"north":{"texture":"atlas1","uv":[8.0,6.0,16.0,6.5]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,15.5,8.0,16.0]}}},{"from":[0,14,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,4.5,16.0,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,5.5,16.0,6.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas4","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,0.0,16.0,1.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,1.0,16.0,2.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/projector.json b/src/main/resources/assets/oc2r/models/block/projector.json new file mode 100644 index 00000000..17c087b9 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/projector.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/projector/projector_atlas0","atlas1":"oc2r:block/projector/projector_atlas1","atlas2":"oc2r:block/projector/projector_atlas2","atlas3":"oc2r:block/projector/projector_atlas3","atlas4":"oc2r:block/projector/projector_atlas4","atlas5":"oc2r:block/projector/projector_atlas5","particle":"#atlas0"},"elements":[{"from":[0,0,0],"to":[16,2,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[0.0,0.0,8.0,1.0]},"west":{"texture":"atlas0","cullface":"west","uv":[0.0,1.0,8.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,2.0,8.0,10.0]},"down":{"texture":"atlas0","cullface":"down","uv":[8.0,2.0,16.0,10.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,10.0,8.0,11.0]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,11.0,8.0,12.0]}}},{"from":[0,2,14],"to":[16,6,16],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[15.0,4.0,16.0,6.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,6.0,16.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,8.0,13.0]},"north":{"texture":"atlas0","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,2,2],"to":[15,6,14],"faces":{"east":{"texture":"atlas3","uv":[7.0,12.0,13.0,14.0]},"west":{"texture":"atlas4","uv":[8.0,14.0,14.0,16.0]},"up":{"texture":"atlas4","uv":[8.0,8.0,15.0,14.0]},"down":{"texture":"atlas4","uv":[8.0,0.0,15.0,6.0]},"north":{"texture":"atlas3","uv":[0.0,12.0,7.0,14.0]}}},{"from":[0,2,0],"to":[16,3,2],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,15.5,16.0,16.0]},"west":{"texture":"atlas2","cullface":"west","uv":[15.0,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[0.0,15.0,8.0,16.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas0","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,3,1],"to":[16,4,2],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.5,15.5,16.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,15.0,16.0,15.5]},"up":{"texture":"atlas0","uv":[8.0,12.0,16.0,12.5]},"north":{"texture":"atlas0","uv":[8.0,12.5,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,11.0,16.0,11.5]}}},{"from":[0,3,0],"to":[7,4,1],"faces":{"east":{"texture":"atlas3","uv":[15.5,14.5,16.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,14.0,16.0,14.5]},"up":{"texture":"atlas3","uv":[12.0,15.5,15.5,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[4.0,15.0,7.5,15.5]}}},{"from":[9,3,0],"to":[16,4,1],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,14.5,4.5,15.0]},"west":{"texture":"atlas5","uv":[4.5,14.5,5.0,15.0]},"up":{"texture":"atlas3","uv":[7.5,15.0,11.0,15.5]},"north":{"texture":"atlas3","cullface":"north","uv":[11.0,15.0,14.5,15.5]}}},{"from":[0,4,0],"to":[4,12,2],"faces":{"east":{"texture":"atlas4","uv":[15.0,0.0,16.0,4.0]},"west":{"texture":"atlas4","cullface":"west","uv":[15.0,8.0,16.0,12.0]},"up":{"texture":"atlas4","uv":[14.0,14.0,16.0,15.0]},"down":{"texture":"atlas4","uv":[14.0,15.0,16.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[0.0,10.5,2.0,14.5]},"south":{"texture":"atlas5","uv":[2.0,10.5,4.0,14.5]}}},{"from":[6,4,0],"to":[10,5,2],"faces":{"east":{"texture":"atlas2","uv":[15.0,6.5,16.0,7.0]},"west":{"texture":"atlas2","uv":[15.0,3.0,16.0,3.5]},"up":{"texture":"atlas5","uv":[0.0,15.0,2.0,16.0]},"down":{"texture":"atlas5","uv":[2.0,15.0,4.0,16.0]},"north":{"texture":"atlas3","cullface":"north","uv":[13.5,14.5,15.5,15.0]}}},{"from":[12,4,0],"to":[16,12,2],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[4.0,10.5,5.0,14.5]},"west":{"texture":"atlas5","uv":[5.0,10.5,6.0,14.5]},"up":{"texture":"atlas5","uv":[4.0,15.0,6.0,16.0]},"down":{"texture":"atlas5","uv":[6.0,15.0,8.0,16.0]},"north":{"texture":"atlas5","cullface":"north","uv":[6.0,10.5,8.0,14.5]},"south":{"texture":"atlas5","uv":[8.0,10.5,10.0,14.5]}}},{"from":[0,6,15],"to":[2,7,16],"faces":{"east":{"texture":"atlas5","uv":[5.0,14.5,5.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[5.5,14.5,6.0,15.0]},"up":{"texture":"atlas2","uv":[15.0,2.5,16.0,3.0]},"down":{"texture":"atlas2","uv":[15.0,2.0,16.0,2.5]},"south":{"texture":"atlas3","cullface":"south","uv":[14.5,15.0,15.5,15.5]}}},{"from":[5,6,15],"to":[6,7,16],"faces":{"east":{"texture":"atlas5","uv":[6.0,14.5,6.5,15.0]},"west":{"texture":"atlas5","uv":[6.5,14.5,7.0,15.0]},"up":{"texture":"atlas5","uv":[7.0,14.5,7.5,15.0]},"down":{"texture":"atlas5","uv":[7.5,14.5,8.0,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[8.0,14.5,8.5,15.0]}}},{"from":[10,6,15],"to":[11,7,16],"faces":{"east":{"texture":"atlas5","uv":[8.5,14.5,9.0,15.0]},"west":{"texture":"atlas5","uv":[9.0,14.5,9.5,15.0]},"up":{"texture":"atlas5","uv":[9.5,14.5,10.0,15.0]},"down":{"texture":"atlas5","uv":[10.0,14.5,10.5,15.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.5,14.5,11.0,15.0]}}},{"from":[14,6,15],"to":[16,7,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[11.0,14.5,11.5,15.0]},"west":{"texture":"atlas5","uv":[11.5,14.5,12.0,15.0]},"up":{"texture":"atlas3","uv":[14.0,11.5,15.0,12.0]},"down":{"texture":"atlas3","uv":[15.0,11.5,16.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[14.0,7.5,15.0,8.0]}}},{"from":[0,6,2],"to":[16,7,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,14.0,6.5,14.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,14.5,6.5,15.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,6.5]},"down":{"texture":"atlas1","uv":[0.0,6.5,8.0,13.0]},"north":{"texture":"atlas0","uv":[8.0,11.5,16.0,12.0]},"south":{"texture":"atlas0","uv":[8.0,10.0,16.0,10.5]}}},{"from":[0,7,15],"to":[6,8,16],"faces":{"east":{"texture":"atlas5","uv":[12.0,14.5,12.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[12.5,14.5,13.0,15.0]},"up":{"texture":"atlas3","uv":[6.5,14.0,9.5,14.5]},"down":{"texture":"atlas3","uv":[9.5,14.0,12.5,14.5]},"south":{"texture":"atlas3","cullface":"south","uv":[12.5,14.0,15.5,14.5]}}},{"from":[10,7,15],"to":[16,8,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[13.0,14.5,13.5,15.0]},"west":{"texture":"atlas5","uv":[13.5,14.5,14.0,15.0]},"up":{"texture":"atlas3","uv":[13.0,12.0,16.0,12.5]},"down":{"texture":"atlas3","uv":[13.0,12.5,16.0,13.0]},"south":{"texture":"atlas3","cullface":"south","uv":[13.0,13.0,16.0,13.5]}}},{"from":[0,7,8],"to":[16,11,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[8.0,6.0,11.5,8.0]},"west":{"texture":"atlas4","cullface":"west","uv":[11.5,6.0,15.0,8.0]},"up":{"texture":"atlas1","uv":[8.0,6.5,16.0,10.0]},"down":{"texture":"atlas1","uv":[8.0,0.0,16.0,3.5]},"north":{"texture":"atlas1","uv":[0.0,13.0,8.0,15.0]},"south":{"texture":"atlas1","uv":[8.0,13.0,16.0,15.0]}}},{"from":[1,7,7],"to":[15,14,8],"faces":{"east":{"texture":"atlas3","uv":[15.0,0.0,15.5,3.5]},"west":{"texture":"atlas3","uv":[15.5,0.0,16.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,15.5,15.0,16.0]},"down":{"texture":"atlas2","uv":[8.0,15.0,15.0,15.5]},"north":{"texture":"atlas3","uv":[8.0,8.0,15.0,11.5]},"south":{"texture":"atlas3","uv":[8.0,4.0,15.0,7.5]}}},{"from":[0,7,6],"to":[16,14,7],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[15.0,4.0,15.5,7.5]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,4.0,16.0,7.5]},"up":{"texture":"atlas0","uv":[8.0,10.5,16.0,11.0]},"down":{"texture":"atlas0","uv":[8.0,1.0,16.0,1.5]},"north":{"texture":"atlas2","uv":[0.0,0.0,8.0,3.5]},"south":{"texture":"atlas2","uv":[0.0,3.5,8.0,7.0]}}},{"from":[1,7,5],"to":[15,14,6],"faces":{"east":{"texture":"atlas3","uv":[15.0,8.0,15.5,11.5]},"west":{"texture":"atlas3","uv":[15.5,8.0,16.0,11.5]},"up":{"texture":"atlas2","uv":[8.0,6.5,15.0,7.0]},"down":{"texture":"atlas2","uv":[8.0,2.0,15.0,2.5]},"north":{"texture":"atlas3","uv":[8.0,0.0,15.0,3.5]},"south":{"texture":"atlas5","uv":[0.0,0.0,7.0,3.5]}}},{"from":[0,7,4],"to":[16,14,5],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[7.0,0.0,7.5,3.5]},"west":{"texture":"atlas5","cullface":"west","uv":[7.5,0.0,8.0,3.5]},"up":{"texture":"atlas0","uv":[8.0,1.5,16.0,2.0]},"down":{"texture":"atlas0","uv":[8.0,0.0,16.0,0.5]},"north":{"texture":"atlas2","uv":[0.0,7.0,8.0,10.5]},"south":{"texture":"atlas2","uv":[0.0,10.5,8.0,14.0]}}},{"from":[1,7,3],"to":[15,14,4],"faces":{"east":{"texture":"atlas5","uv":[8.0,0.0,8.5,3.5]},"west":{"texture":"atlas5","uv":[8.5,0.0,9.0,3.5]},"up":{"texture":"atlas2","uv":[8.0,2.5,15.0,3.0]},"down":{"texture":"atlas2","uv":[8.0,3.0,15.0,3.5]},"north":{"texture":"atlas5","uv":[0.0,3.5,7.0,7.0]},"south":{"texture":"atlas5","uv":[0.0,7.0,7.0,10.5]}}},{"from":[0,7,2],"to":[16,12,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[9.0,0.0,9.5,2.5]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,0.0,10.0,2.5]},"up":{"texture":"atlas0","uv":[8.0,0.5,16.0,1.0]},"down":{"texture":"atlas1","uv":[0.0,15.0,8.0,15.5]},"north":{"texture":"atlas1","uv":[8.0,10.0,16.0,12.5]},"south":{"texture":"atlas1","uv":[8.0,3.5,16.0,6.0]}}},{"from":[0,8,15],"to":[2,9,16],"faces":{"east":{"texture":"atlas5","uv":[14.0,14.5,14.5,15.0]},"west":{"texture":"atlas5","cullface":"west","uv":[14.5,14.5,15.0,15.0]},"up":{"texture":"atlas3","uv":[15.0,7.5,16.0,8.0]},"down":{"texture":"atlas3","uv":[14.0,3.5,15.0,4.0]},"south":{"texture":"atlas3","cullface":"south","uv":[15.0,3.5,16.0,4.0]}}},{"from":[5,8,15],"to":[6,9,16],"faces":{"east":{"texture":"atlas5","uv":[15.0,14.5,15.5,15.0]},"west":{"texture":"atlas5","uv":[15.5,14.5,16.0,15.0]},"up":{"texture":"atlas5","uv":[10.0,10.5,10.5,11.0]},"down":{"texture":"atlas5","uv":[10.0,11.0,10.5,11.5]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,11.5,10.5,12.0]}}},{"from":[10,8,15],"to":[11,9,16],"faces":{"east":{"texture":"atlas5","uv":[10.0,12.0,10.5,12.5]},"west":{"texture":"atlas5","uv":[10.0,12.5,10.5,13.0]},"up":{"texture":"atlas5","uv":[10.0,13.0,10.5,13.5]},"down":{"texture":"atlas5","uv":[10.0,13.5,10.5,14.0]},"south":{"texture":"atlas5","cullface":"south","uv":[10.0,14.0,10.5,14.5]}}},{"from":[14,8,15],"to":[16,9,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[10.5,14.0,11.0,14.5]},"west":{"texture":"atlas5","uv":[11.0,14.0,11.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,12.0,16.0,12.5]},"down":{"texture":"atlas4","uv":[15.0,12.5,16.0,13.0]},"south":{"texture":"atlas4","cullface":"south","uv":[15.0,13.0,16.0,13.5]}}},{"from":[0,9,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas5","uv":[11.5,14.0,12.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[12.0,14.0,12.5,14.5]},"up":{"texture":"atlas3","uv":[13.0,13.5,16.0,14.0]},"down":{"texture":"atlas3","uv":[8.0,11.5,11.0,12.0]},"south":{"texture":"atlas3","cullface":"south","uv":[11.0,11.5,14.0,12.0]}}},{"from":[10,9,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.5,14.0,13.0,14.5]},"west":{"texture":"atlas5","uv":[13.0,14.0,13.5,14.5]},"up":{"texture":"atlas3","uv":[8.0,7.5,11.0,8.0]},"down":{"texture":"atlas3","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas3","cullface":"south","uv":[8.0,3.5,11.0,4.0]}}},{"from":[0,10,15],"to":[2,11,16],"faces":{"east":{"texture":"atlas5","uv":[13.5,14.0,14.0,14.5]},"west":{"texture":"atlas5","cullface":"west","uv":[14.0,14.0,14.5,14.5]},"up":{"texture":"atlas4","uv":[15.0,13.5,16.0,14.0]},"down":{"texture":"atlas5","uv":[11.0,15.0,12.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[11.0,15.5,12.0,16.0]}}},{"from":[5,10,15],"to":[11,11,16],"faces":{"east":{"texture":"atlas5","uv":[14.5,14.0,15.0,14.5]},"west":{"texture":"atlas5","uv":[15.0,14.0,15.5,14.5]},"down":{"texture":"atlas3","uv":[11.0,3.5,14.0,4.0]},"south":{"texture":"atlas5","cullface":"south","uv":[0.0,14.5,3.0,15.0]}}},{"from":[14,10,15],"to":[16,11,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[15.5,14.0,16.0,14.5]},"west":{"texture":"atlas5","uv":[10.5,13.5,11.0,14.0]},"up":{"texture":"atlas5","uv":[12.0,15.5,13.0,16.0]},"down":{"texture":"atlas5","uv":[13.0,15.5,14.0,16.0]},"south":{"texture":"atlas5","cullface":"south","uv":[14.0,15.5,15.0,16.0]}}},{"from":[0,11,8],"to":[16,12,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[0.0,15.0,4.0,15.5]},"west":{"texture":"atlas3","cullface":"west","uv":[0.0,15.5,4.0,16.0]},"up":{"texture":"atlas3","uv":[0.0,0.0,8.0,4.0]},"down":{"texture":"atlas3","uv":[0.0,4.0,8.0,8.0]},"north":{"texture":"atlas1","uv":[0.0,15.5,8.0,16.0]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,15.5,16.0,16.0]}}},{"from":[0,12,15],"to":[2,13,16],"faces":{"east":{"texture":"atlas5","uv":[11.0,13.5,11.5,14.0]},"west":{"texture":"atlas5","cullface":"west","uv":[11.5,13.5,12.0,14.0]},"up":{"texture":"atlas5","uv":[15.0,15.5,16.0,16.0]},"down":{"texture":"atlas5","uv":[12.0,15.0,13.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[13.0,15.0,14.0,15.5]}}},{"from":[14,12,15],"to":[16,13,16],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[12.0,13.5,12.5,14.0]},"west":{"texture":"atlas5","uv":[12.5,13.5,13.0,14.0]},"up":{"texture":"atlas5","uv":[14.0,15.0,15.0,15.5]},"down":{"texture":"atlas5","uv":[15.0,15.0,16.0,15.5]},"south":{"texture":"atlas5","cullface":"south","uv":[3.0,14.5,4.0,15.0]}}},{"from":[0,12,8],"to":[16,13,15],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[6.5,14.5,10.0,15.0]},"west":{"texture":"atlas3","cullface":"west","uv":[10.0,14.5,13.5,15.0]},"up":{"texture":"atlas2","uv":[8.0,10.5,16.0,14.0]},"down":{"texture":"atlas2","uv":[8.0,7.0,16.0,10.5]},"north":{"texture":"atlas1","uv":[8.0,15.0,16.0,15.5]},"south":{"texture":"atlas1","uv":[8.0,12.5,16.0,13.0]}}},{"from":[0,12,0],"to":[16,14,3],"faces":{"east":{"texture":"atlas5","cullface":"east","uv":[8.0,15.0,9.5,16.0]},"west":{"texture":"atlas5","cullface":"west","uv":[9.5,15.0,11.0,16.0]},"down":{"texture":"atlas2","uv":[0.0,14.0,8.0,15.5]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,14.0,16.0,15.0]},"south":{"texture":"atlas2","uv":[8.0,3.5,16.0,4.5]}}},{"from":[0,13,8],"to":[16,14,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[4.0,15.5,8.0,16.0]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,15.5,12.0,16.0]},"down":{"texture":"atlas3","uv":[0.0,8.0,8.0,12.0]},"north":{"texture":"atlas1","uv":[8.0,6.0,16.0,6.5]},"south":{"texture":"atlas2","cullface":"south","uv":[0.0,15.5,8.0,16.0]}}},{"from":[0,14,0],"to":[16,16,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,4.5,16.0,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,5.5,16.0,6.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas4","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[8.0,0.0,16.0,1.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,1.0,16.0,2.0]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/redstone_interface.json b/src/main/resources/assets/oc2r/models/block/redstone_interface.json new file mode 100644 index 00000000..0a549f26 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/block/redstone_interface.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"atlas0":"oc2r:block/redstone_interface/redstone_interface_atlas0","atlas1":"oc2r:block/redstone_interface/redstone_interface_atlas1","atlas2":"oc2r:block/redstone_interface/redstone_interface_atlas2","atlas3":"oc2r:block/redstone_interface/redstone_interface_atlas3","atlas4":"oc2r:block/redstone_interface/redstone_interface_atlas4","particle":"#atlas0"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[8.0,7.5,11.0,8.0]},"west":{"texture":"atlas1","cullface":"west","uv":[11.0,7.5,14.0,8.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,8.0,3.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,3.0,8.0,6.0]},"north":{"texture":"atlas0","uv":[0.0,6.0,8.0,6.5]},"south":{"texture":"atlas0","cullface":"south","uv":[0.0,6.5,8.0,7.0]}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas1","uv":[14.0,7.5,16.0,8.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,14.0,16.0,14.5]},"up":{"texture":"atlas2","uv":[8.0,4.5,11.0,6.5]},"down":{"texture":"atlas2","cullface":"down","uv":[11.0,4.5,14.0,6.5]},"north":{"texture":"atlas2","uv":[8.0,11.0,11.0,11.5]},"south":{"texture":"atlas2","uv":[11.0,11.0,14.0,11.5]}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,14.5,16.0,15.0]},"west":{"texture":"atlas2","uv":[14.0,15.0,16.0,15.5]},"up":{"texture":"atlas2","uv":[8.0,2.5,11.0,4.5]},"down":{"texture":"atlas2","cullface":"down","uv":[11.0,2.5,14.0,4.5]},"north":{"texture":"atlas2","uv":[8.0,8.5,11.0,9.0]},"south":{"texture":"atlas2","uv":[11.0,8.5,14.0,9.0]}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[8.0,0.0,11.0,0.5]},"west":{"texture":"atlas2","cullface":"west","uv":[8.0,0.5,11.0,1.0]},"up":{"texture":"atlas0","uv":[0.0,7.0,8.0,10.0]},"down":{"texture":"atlas0","cullface":"down","uv":[0.0,10.0,8.0,13.0]},"north":{"texture":"atlas0","cullface":"north","uv":[0.0,13.0,8.0,13.5]},"south":{"texture":"atlas0","uv":[0.0,13.5,8.0,14.0]}}},{"from":[0,1,15],"to":[5,3,16],"faces":{"east":{"texture":"atlas0","uv":[15.0,5.0,15.5,6.0]},"west":{"texture":"atlas0","cullface":"west","uv":[15.5,5.0,16.0,6.0]},"up":{"texture":"atlas4","uv":[0.0,4.0,2.5,4.5]},"down":{"texture":"atlas4","uv":[0.0,4.5,2.5,5.0]},"south":{"texture":"atlas4","cullface":"south","uv":[0.0,5.0,2.5,6.0]}}},{"from":[11,1,15],"to":[16,3,16],"faces":{"east":{"texture":"atlas1","cullface":"east","uv":[15.0,6.5,15.5,7.5]},"west":{"texture":"atlas1","uv":[15.5,6.5,16.0,7.5]},"up":{"texture":"atlas4","uv":[0.0,6.0,2.5,6.5]},"down":{"texture":"atlas4","uv":[0.0,6.5,2.5,7.0]},"south":{"texture":"atlas4","cullface":"south","uv":[0.0,7.0,2.5,8.0]}}},{"from":[0,1,11],"to":[16,3,15],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,4.5,16.0,5.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,5.5,16.0,6.5]},"up":{"texture":"atlas0","uv":[0.0,14.0,8.0,16.0]},"down":{"texture":"atlas0","uv":[8.0,14.0,16.0,16.0]},"north":{"texture":"atlas0","uv":[8.0,10.0,16.0,11.0]},"south":{"texture":"atlas0","uv":[8.0,11.0,16.0,12.0]}}},{"from":[1,1,5],"to":[15,3,11],"faces":{"east":{"texture":"atlas2","uv":[8.0,1.0,11.0,2.0]},"west":{"texture":"atlas2","uv":[11.0,1.0,14.0,2.0]},"down":{"texture":"atlas3","uv":[8.0,0.0,15.0,3.0]},"north":{"texture":"atlas0","uv":[8.0,5.0,15.0,6.0]},"south":{"texture":"atlas1","uv":[8.0,6.5,15.0,7.5]}}},{"from":[0,1,1],"to":[16,3,5],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,2.5,16.0,3.5]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,3.5,16.0,4.5]},"up":{"texture":"atlas0","uv":[8.0,7.0,16.0,9.0]},"down":{"texture":"atlas0","uv":[8.0,3.0,16.0,5.0]},"north":{"texture":"atlas0","uv":[8.0,12.0,16.0,13.0]},"south":{"texture":"atlas0","uv":[8.0,9.0,16.0,10.0]}}},{"from":[0,1,0],"to":[5,3,1],"faces":{"east":{"texture":"atlas2","uv":[14.0,1.0,14.5,2.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.5,1.0,15.0,2.0]},"up":{"texture":"atlas4","uv":[0.0,8.0,2.5,8.5]},"down":{"texture":"atlas4","uv":[0.0,8.5,2.5,9.0]},"north":{"texture":"atlas4","cullface":"north","uv":[0.0,9.0,2.5,10.0]}}},{"from":[11,1,0],"to":[16,3,1],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,1.0,15.5,2.0]},"west":{"texture":"atlas2","uv":[15.5,1.0,16.0,2.0]},"up":{"texture":"atlas4","uv":[0.0,10.0,2.5,10.5]},"down":{"texture":"atlas4","uv":[0.0,10.5,2.5,11.0]},"north":{"texture":"atlas4","cullface":"north","uv":[0.0,11.0,2.5,12.0]}}},{"from":[0,3,0],"to":[16,6,16],"faces":{"east":{"texture":"atlas0","cullface":"east","uv":[8.0,0.0,16.0,1.5]},"west":{"texture":"atlas0","cullface":"west","uv":[8.0,1.5,16.0,3.0]},"up":{"texture":"atlas1","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas1","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas1","cullface":"north","uv":[8.0,8.0,16.0,9.5]},"south":{"texture":"atlas1","cullface":"south","uv":[8.0,9.5,16.0,11.0]}}},{"from":[0,6,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas2","uv":[15.0,6.5,15.5,8.5]},"west":{"texture":"atlas2","cullface":"west","uv":[15.5,6.5,16.0,8.5]},"up":{"texture":"atlas2","uv":[8.0,2.0,11.0,2.5]},"down":{"texture":"atlas2","uv":[11.0,2.0,14.0,2.5]},"south":{"texture":"atlas3","cullface":"south","uv":[8.0,14.0,11.0,16.0]}}},{"from":[10,6,15],"to":[16,10,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[15.0,9.0,15.5,11.0]},"west":{"texture":"atlas2","uv":[15.5,9.0,16.0,11.0]},"up":{"texture":"atlas2","uv":[11.0,0.5,14.0,1.0]},"down":{"texture":"atlas2","uv":[11.0,0.0,14.0,0.5]},"south":{"texture":"atlas3","cullface":"south","uv":[11.0,14.0,14.0,16.0]}}},{"from":[0,6,10],"to":[16,10,15],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[0.0,12.0,2.5,14.0]},"west":{"texture":"atlas4","cullface":"west","uv":[0.0,14.0,2.5,16.0]},"up":{"texture":"atlas1","uv":[8.0,11.0,16.0,13.5]},"down":{"texture":"atlas1","uv":[8.0,13.5,16.0,16.0]},"north":{"texture":"atlas1","uv":[8.0,0.0,16.0,2.0]},"south":{"texture":"atlas1","uv":[8.0,2.0,16.0,4.0]}}},{"from":[1,6,6],"to":[15,10,10],"faces":{"east":{"texture":"atlas3","uv":[14.0,14.0,16.0,16.0]},"west":{"texture":"atlas3","uv":[14.0,4.0,16.0,6.0]},"up":{"texture":"atlas2","uv":[0.0,14.0,7.0,16.0]},"down":{"texture":"atlas2","uv":[7.0,14.0,14.0,16.0]},"north":{"texture":"atlas2","uv":[8.0,9.0,15.0,11.0]},"south":{"texture":"atlas2","uv":[8.0,6.5,15.0,8.5]}}},{"from":[0,6,1],"to":[16,10,6],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[2.5,14.0,5.0,16.0]},"west":{"texture":"atlas4","cullface":"west","uv":[5.0,14.0,7.5,16.0]},"up":{"texture":"atlas1","uv":[8.0,4.0,16.0,6.5]},"down":{"texture":"atlas2","uv":[0.0,0.0,8.0,2.5]},"north":{"texture":"atlas2","uv":[0.0,2.5,8.0,4.5]},"south":{"texture":"atlas2","uv":[0.0,4.5,8.0,6.5]}}},{"from":[0,6,0],"to":[6,10,1],"faces":{"east":{"texture":"atlas3","uv":[15.0,0.0,15.5,2.0]},"west":{"texture":"atlas3","cullface":"west","uv":[15.5,0.0,16.0,2.0]},"up":{"texture":"atlas3","uv":[8.0,3.0,11.0,3.5]},"down":{"texture":"atlas3","uv":[8.0,3.5,11.0,4.0]},"north":{"texture":"atlas3","cullface":"north","uv":[8.0,4.0,11.0,6.0]}}},{"from":[10,6,0],"to":[16,10,1],"faces":{"east":{"texture":"atlas4","cullface":"east","uv":[3.0,0.0,3.5,2.0]},"west":{"texture":"atlas4","uv":[3.5,0.0,4.0,2.0]},"up":{"texture":"atlas3","uv":[8.0,6.0,11.0,6.5]},"down":{"texture":"atlas3","uv":[8.0,6.5,11.0,7.0]},"north":{"texture":"atlas3","cullface":"north","uv":[11.0,4.0,14.0,6.0]}}},{"from":[0,10,0],"to":[16,15,16],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[0.0,6.5,8.0,9.0]},"west":{"texture":"atlas2","cullface":"west","uv":[0.0,9.0,8.0,11.5]},"up":{"texture":"atlas3","uv":[0.0,0.0,8.0,8.0]},"down":{"texture":"atlas3","uv":[0.0,8.0,8.0,16.0]},"north":{"texture":"atlas2","cullface":"north","uv":[0.0,11.5,8.0,14.0]},"south":{"texture":"atlas2","cullface":"south","uv":[8.0,11.5,16.0,14.0]}}},{"from":[0,15,10],"to":[16,16,16],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[8.0,7.0,11.0,7.5]},"west":{"texture":"atlas3","cullface":"west","uv":[8.0,7.5,11.0,8.0]},"up":{"texture":"atlas3","cullface":"up","uv":[8.0,8.0,16.0,11.0]},"north":{"texture":"atlas0","uv":[8.0,13.5,16.0,14.0]},"south":{"texture":"atlas0","cullface":"south","uv":[8.0,13.0,16.0,13.5]}}},{"from":[0,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas2","uv":[14.0,15.5,16.0,16.0]},"west":{"texture":"atlas2","cullface":"west","uv":[14.0,11.0,16.0,11.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,0.0,3.0,2.0]},"north":{"texture":"atlas3","uv":[11.0,7.5,14.0,8.0]},"south":{"texture":"atlas3","uv":[11.0,7.0,14.0,7.5]}}},{"from":[10,15,6],"to":[16,16,10],"faces":{"east":{"texture":"atlas2","cullface":"east","uv":[14.0,8.5,16.0,9.0]},"west":{"texture":"atlas2","uv":[14.0,2.0,16.0,2.5]},"up":{"texture":"atlas4","cullface":"up","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas3","uv":[11.0,6.5,14.0,7.0]},"south":{"texture":"atlas3","uv":[11.0,6.0,14.0,6.5]}}},{"from":[0,15,0],"to":[16,16,6],"faces":{"east":{"texture":"atlas3","cullface":"east","uv":[11.0,3.5,14.0,4.0]},"west":{"texture":"atlas3","cullface":"west","uv":[11.0,3.0,14.0,3.5]},"up":{"texture":"atlas3","cullface":"up","uv":[8.0,11.0,16.0,14.0]},"north":{"texture":"atlas0","cullface":"north","uv":[8.0,6.5,16.0,7.0]},"south":{"texture":"atlas0","uv":[8.0,6.0,16.0,6.5]}}}]} diff --git a/src/main/resources/assets/oc2/models/block/vxlan_hub.json b/src/main/resources/assets/oc2r/models/block/vxlan_hub.json similarity index 97% rename from src/main/resources/assets/oc2/models/block/vxlan_hub.json rename to src/main/resources/assets/oc2r/models/block/vxlan_hub.json index 622cc9b3..4e4f4562 100644 --- a/src/main/resources/assets/oc2/models/block/vxlan_hub.json +++ b/src/main/resources/assets/oc2r/models/block/vxlan_hub.json @@ -1,11 +1,11 @@ { "parent": "block/block", "textures": { - "particle": "oc2:block/vxlan_hub/vxlan_hub_atlas0", - "atlas0": "oc2:block/vxlan_hub/vxlan_hub_atlas0", - "atlas1": "oc2:block/vxlan_hub/vxlan_hub_atlas1", - "atlas2": "oc2:block/vxlan_hub/vxlan_hub_atlas2", - "atlas3": "oc2:block/vxlan_hub/vxlan_hub_atlas3" + "particle": "oc2r:block/vxlan_hub/vxlan_hub_atlas0", + "atlas0": "oc2r:block/vxlan_hub/vxlan_hub_atlas0", + "atlas1": "oc2r:block/vxlan_hub/vxlan_hub_atlas1", + "atlas2": "oc2r:block/vxlan_hub/vxlan_hub_atlas2", + "atlas3": "oc2r:block/vxlan_hub/vxlan_hub_atlas3" }, "elements": [ { diff --git a/src/main/resources/assets/oc2r/models/item/block_operations_module.json b/src/main/resources/assets/oc2r/models/item/block_operations_module.json new file mode 100644 index 00000000..02a87851 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/block_operations_module.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/block_operations_module" + } +} diff --git a/src/main/resources/assets/oc2/models/item/bus_cable.json b/src/main/resources/assets/oc2r/models/item/bus_cable.json similarity index 95% rename from src/main/resources/assets/oc2/models/item/bus_cable.json rename to src/main/resources/assets/oc2r/models/item/bus_cable.json index e1a97066..7018bef0 100644 --- a/src/main/resources/assets/oc2/models/item/bus_cable.json +++ b/src/main/resources/assets/oc2r/models/item/bus_cable.json @@ -1,5 +1,5 @@ { - "parent": "oc2:block/cable_straight", + "parent": "oc2r:block/cable_straight", "display": { "gui": { "rotation": [ @@ -74,4 +74,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2/models/item/bus_interface.json b/src/main/resources/assets/oc2r/models/item/bus_interface.json similarity index 96% rename from src/main/resources/assets/oc2/models/item/bus_interface.json rename to src/main/resources/assets/oc2r/models/item/bus_interface.json index bef72d69..47b4e160 100644 --- a/src/main/resources/assets/oc2/models/item/bus_interface.json +++ b/src/main/resources/assets/oc2r/models/item/bus_interface.json @@ -1,5 +1,5 @@ { - "parent": "oc2:block/cable_plug", + "parent": "oc2r:block/cable_plug", "display": { "gui": { "rotation": [ @@ -94,4 +94,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2r/models/item/charger.json b/src/main/resources/assets/oc2r/models/item/charger.json new file mode 100644 index 00000000..aef6413a --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/charger.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/charger" +} diff --git a/src/main/resources/assets/oc2r/models/item/circuit_board.json b/src/main/resources/assets/oc2r/models/item/circuit_board.json new file mode 100644 index 00000000..b6e65d4f --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/circuit_board.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/circuit_board" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/computer.json b/src/main/resources/assets/oc2r/models/item/computer.json new file mode 100644 index 00000000..87f9cb40 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/computer.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/computer" +} diff --git a/src/main/resources/assets/oc2/models/item/cpu_tier_1.json b/src/main/resources/assets/oc2r/models/item/cpu_tier_1.json similarity index 63% rename from src/main/resources/assets/oc2/models/item/cpu_tier_1.json rename to src/main/resources/assets/oc2r/models/item/cpu_tier_1.json index 54a9a303..6f651de2 100644 --- a/src/main/resources/assets/oc2/models/item/cpu_tier_1.json +++ b/src/main/resources/assets/oc2r/models/item/cpu_tier_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2:item/cpu_tier_1" + "layer0": "oc2r:item/cpu_tier_1" } } diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_2.json b/src/main/resources/assets/oc2r/models/item/cpu_tier_2.json new file mode 100644 index 00000000..83aa4ab9 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/cpu_tier_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/cpu_tier_2" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_3.json b/src/main/resources/assets/oc2r/models/item/cpu_tier_3.json new file mode 100644 index 00000000..439acbc8 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/cpu_tier_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/cpu_tier_3" + } +} diff --git a/src/main/resources/assets/oc2/models/item/cpu_tier_4.json b/src/main/resources/assets/oc2r/models/item/cpu_tier_4.json similarity index 63% rename from src/main/resources/assets/oc2/models/item/cpu_tier_4.json rename to src/main/resources/assets/oc2r/models/item/cpu_tier_4.json index e38ee80e..2db63cee 100644 --- a/src/main/resources/assets/oc2/models/item/cpu_tier_4.json +++ b/src/main/resources/assets/oc2r/models/item/cpu_tier_4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2:item/cpu_tier_4" + "layer0": "oc2r:item/cpu_tier_4" } } diff --git a/src/main/resources/assets/oc2r/models/item/creative_energy.json b/src/main/resources/assets/oc2r/models/item/creative_energy.json new file mode 100644 index 00000000..6e177018 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/creative_energy.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/creative_energy" +} diff --git a/src/main/resources/assets/oc2r/models/item/disk_drive.json b/src/main/resources/assets/oc2r/models/item/disk_drive.json new file mode 100644 index 00000000..84fae56e --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/disk_drive.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/disk_drive" +} diff --git a/src/main/resources/assets/oc2r/models/item/file_import_export_card.json b/src/main/resources/assets/oc2r/models/item/file_import_export_card.json new file mode 100644 index 00000000..7fcd3c61 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/file_import_export_card.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/file_import_export_card" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/flash_memory.json b/src/main/resources/assets/oc2r/models/item/flash_memory.json new file mode 100644 index 00000000..069e825c --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/flash_memory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/flash_memory" + } +} diff --git a/src/main/resources/assets/oc2/models/item/flash_memory_custom.json b/src/main/resources/assets/oc2r/models/item/flash_memory_custom.json similarity index 62% rename from src/main/resources/assets/oc2/models/item/flash_memory_custom.json rename to src/main/resources/assets/oc2r/models/item/flash_memory_custom.json index a5a68c4d..069e825c 100644 --- a/src/main/resources/assets/oc2/models/item/flash_memory_custom.json +++ b/src/main/resources/assets/oc2r/models/item/flash_memory_custom.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2:item/flash_memory" + "layer0": "oc2r:item/flash_memory" } } diff --git a/src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json b/src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json new file mode 100644 index 00000000..3c4409d0 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/flash_memory_flasher" +} diff --git a/src/main/resources/assets/oc2r/models/item/floppy.json b/src/main/resources/assets/oc2r/models/item/floppy.json new file mode 100644 index 00000000..500d0966 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/floppy.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/floppy_base", + "layer1": "oc2r:item/floppy_tint" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/floppy_modern.json b/src/main/resources/assets/oc2r/models/item/floppy_modern.json new file mode 100644 index 00000000..500d0966 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/floppy_modern.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/floppy_base", + "layer1": "oc2r:item/floppy_tint" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_custom.json b/src/main/resources/assets/oc2r/models/item/hard_drive_custom.json new file mode 100644 index 00000000..ce13c2ff --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_custom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/hard_drive_base", + "layer1": "oc2r:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_extra_large.json b/src/main/resources/assets/oc2r/models/item/hard_drive_extra_large.json new file mode 100644 index 00000000..ce13c2ff --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_extra_large.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/hard_drive_base", + "layer1": "oc2r:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_large.json b/src/main/resources/assets/oc2r/models/item/hard_drive_large.json new file mode 100644 index 00000000..ce13c2ff --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_large.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/hard_drive_base", + "layer1": "oc2r:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_medium.json b/src/main/resources/assets/oc2r/models/item/hard_drive_medium.json new file mode 100644 index 00000000..ce13c2ff --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_medium.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/hard_drive_base", + "layer1": "oc2r:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_small.json b/src/main/resources/assets/oc2r/models/item/hard_drive_small.json new file mode 100644 index 00000000..ce13c2ff --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_small.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/hard_drive_base", + "layer1": "oc2r:item/hard_drive_tint" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/inventory_operations_module.json b/src/main/resources/assets/oc2r/models/item/inventory_operations_module.json new file mode 100644 index 00000000..bd7b2326 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/inventory_operations_module.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/inventory_operations_module" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/keyboard.json b/src/main/resources/assets/oc2r/models/item/keyboard.json new file mode 100644 index 00000000..47e9a219 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/keyboard.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/keyboard" +} diff --git a/src/main/resources/assets/oc2/models/item/cpu_tier_2.json b/src/main/resources/assets/oc2r/models/item/manual.json similarity index 64% rename from src/main/resources/assets/oc2/models/item/cpu_tier_2.json rename to src/main/resources/assets/oc2r/models/item/manual.json index 4c001339..3eecc583 100644 --- a/src/main/resources/assets/oc2/models/item/cpu_tier_2.json +++ b/src/main/resources/assets/oc2r/models/item/manual.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2:item/cpu_tier_2" + "layer0": "oc2r:item/manual" } } diff --git a/src/main/resources/assets/oc2/models/item/memory_extra_large.json b/src/main/resources/assets/oc2r/models/item/memory_extra_large.json similarity index 58% rename from src/main/resources/assets/oc2/models/item/memory_extra_large.json rename to src/main/resources/assets/oc2r/models/item/memory_extra_large.json index f07b7646..9f25a419 100644 --- a/src/main/resources/assets/oc2/models/item/memory_extra_large.json +++ b/src/main/resources/assets/oc2r/models/item/memory_extra_large.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2:item/memory_extra_large" + "layer0": "oc2r:item/memory_extra_large" } } diff --git a/src/main/resources/assets/oc2r/models/item/memory_large.json b/src/main/resources/assets/oc2r/models/item/memory_large.json new file mode 100644 index 00000000..50144c74 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/memory_large.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/memory_large" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/memory_medium.json b/src/main/resources/assets/oc2r/models/item/memory_medium.json new file mode 100644 index 00000000..23fa8a2d --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/memory_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/memory_medium" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/memory_small.json b/src/main/resources/assets/oc2r/models/item/memory_small.json new file mode 100644 index 00000000..96b94bc9 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/memory_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/memory_small" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/monitor.json b/src/main/resources/assets/oc2r/models/item/monitor.json new file mode 100644 index 00000000..87f9cb40 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/monitor.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/computer" +} diff --git a/src/main/resources/assets/oc2r/models/item/network_cable.json b/src/main/resources/assets/oc2r/models/item/network_cable.json new file mode 100644 index 00000000..76123a8d --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/network_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/network_cable" + } +} diff --git a/src/main/resources/assets/oc2/models/item/network_connector.json b/src/main/resources/assets/oc2r/models/item/network_connector.json similarity index 89% rename from src/main/resources/assets/oc2/models/item/network_connector.json rename to src/main/resources/assets/oc2r/models/item/network_connector.json index 6e2dfe6e..138831d6 100644 --- a/src/main/resources/assets/oc2/models/item/network_connector.json +++ b/src/main/resources/assets/oc2r/models/item/network_connector.json @@ -1,5 +1,5 @@ { - "parent": "oc2:block/network_connector", + "parent": "oc2r:block/network_connector", "display": { "gui": { "rotation": [ @@ -31,4 +31,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/oc2r/models/item/network_hub.json b/src/main/resources/assets/oc2r/models/item/network_hub.json new file mode 100644 index 00000000..967fd4bc --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/network_hub.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/network_hub" +} diff --git a/src/main/resources/assets/oc2r/models/item/network_interface_card.json b/src/main/resources/assets/oc2r/models/item/network_interface_card.json new file mode 100644 index 00000000..200ea8df --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/network_interface_card.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/network_interface_card" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/network_switch.json b/src/main/resources/assets/oc2r/models/item/network_switch.json new file mode 100644 index 00000000..9d52f858 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/network_switch.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/network_switch" +} diff --git a/src/main/resources/assets/oc2r/models/item/network_tunnel_card.json b/src/main/resources/assets/oc2r/models/item/network_tunnel_card.json new file mode 100644 index 00000000..84434847 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/network_tunnel_card.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/network_tunnel_card" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/network_tunnel_module.json b/src/main/resources/assets/oc2r/models/item/network_tunnel_module.json new file mode 100644 index 00000000..1339709b --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/network_tunnel_module.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/network_tunnel_module" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/pci_card_cage.json b/src/main/resources/assets/oc2r/models/item/pci_card_cage.json new file mode 100644 index 00000000..7dde9270 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/pci_card_cage.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/pci_card_cage" +} diff --git a/src/main/resources/assets/oc2r/models/item/projector.json b/src/main/resources/assets/oc2r/models/item/projector.json new file mode 100644 index 00000000..a73a8bcb --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/projector.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/projector" +} diff --git a/src/main/resources/assets/oc2r/models/item/redstone_interface.json b/src/main/resources/assets/oc2r/models/item/redstone_interface.json new file mode 100644 index 00000000..4db417fb --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/redstone_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/redstone_interface" +} diff --git a/src/main/resources/assets/oc2r/models/item/redstone_interface_card.json b/src/main/resources/assets/oc2r/models/item/redstone_interface_card.json new file mode 100644 index 00000000..0d14d5c1 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/redstone_interface_card.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/redstone_interface_card" + } +} diff --git a/src/main/resources/assets/oc2/models/item/robot.json b/src/main/resources/assets/oc2r/models/item/robot.json similarity index 100% rename from src/main/resources/assets/oc2/models/item/robot.json rename to src/main/resources/assets/oc2r/models/item/robot.json diff --git a/src/main/resources/assets/oc2r/models/item/sound_card.json b/src/main/resources/assets/oc2r/models/item/sound_card.json new file mode 100644 index 00000000..37ad6d72 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/sound_card.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/sound_card" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/transistor.json b/src/main/resources/assets/oc2r/models/item/transistor.json new file mode 100644 index 00000000..114d0196 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/transistor.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/transistor" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/vxlan_hub.json b/src/main/resources/assets/oc2r/models/item/vxlan_hub.json new file mode 100644 index 00000000..1e8bbe74 --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/vxlan_hub.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2r:block/vxlan_hub" +} diff --git a/src/main/resources/assets/oc2/models/item/cpu_tier_3.json b/src/main/resources/assets/oc2r/models/item/wrench.json similarity index 64% rename from src/main/resources/assets/oc2/models/item/cpu_tier_3.json rename to src/main/resources/assets/oc2r/models/item/wrench.json index 9a311dc9..300714f6 100644 --- a/src/main/resources/assets/oc2/models/item/cpu_tier_3.json +++ b/src/main/resources/assets/oc2r/models/item/wrench.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2:item/cpu_tier_3" + "layer0": "oc2r:item/wrench" } } diff --git a/src/main/resources/assets/oc2/shaders/core/projectors.fsh b/src/main/resources/assets/oc2r/shaders/core/projectors.fsh similarity index 100% rename from src/main/resources/assets/oc2/shaders/core/projectors.fsh rename to src/main/resources/assets/oc2r/shaders/core/projectors.fsh diff --git a/src/main/resources/assets/oc2/shaders/core/projectors.json b/src/main/resources/assets/oc2r/shaders/core/projectors.json similarity index 95% rename from src/main/resources/assets/oc2/shaders/core/projectors.json rename to src/main/resources/assets/oc2r/shaders/core/projectors.json index b26f9a94..bc73658b 100644 --- a/src/main/resources/assets/oc2/shaders/core/projectors.json +++ b/src/main/resources/assets/oc2r/shaders/core/projectors.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "oc2:projectors", - "fragment": "oc2:projectors", + "vertex": "oc2r:projectors", + "fragment": "oc2r:projectors", "attributes": ["Position", "UV0"], "samplers": [ {"name": "MainCameraDepth"}, diff --git a/src/main/resources/assets/oc2/shaders/core/projectors.vsh b/src/main/resources/assets/oc2r/shaders/core/projectors.vsh similarity index 100% rename from src/main/resources/assets/oc2/shaders/core/projectors.vsh rename to src/main/resources/assets/oc2r/shaders/core/projectors.vsh diff --git a/src/main/resources/assets/oc2r/sounds.json b/src/main/resources/assets/oc2r/sounds.json new file mode 100644 index 00000000..d61aecb2 --- /dev/null +++ b/src/main/resources/assets/oc2r/sounds.json @@ -0,0 +1,52 @@ +{ + "computer_running": { + "category": "block", + "subtitle": "subtitles.oc2r.computer", + "sounds": [ + { + "name": "oc2r:computer_running", + "stream": true, + "volume": 0.25 + } + ] + }, + "floppy_access": { + "category": "block", + "subtitle": "subtitles.oc2r.floppy", + "sounds": [ + "oc2r:floppy_access1", + "oc2r:floppy_access2", + "oc2r:floppy_access3", + "oc2r:floppy_access4", + "oc2r:floppy_access5", + "oc2r:floppy_access6" + ] + }, + "floppy_eject": { + "category": "block", + "subtitle": "subtitles.oc2r.floppy_eject", + "sounds": [ + "oc2r:floppy_eject" + ] + }, + "floppy_insert": { + "category": "block", + "subtitle": "subtitles.oc2r.floppy_insert", + "sounds": [ + "oc2r:floppy_insert" + ] + }, + "hdd_access": { + "category": "block", + "subtitle": "subtitles.oc2r.hdd", + "sounds": [ + "oc2r:hdd_access1", + "oc2r:hdd_access2", + "oc2r:hdd_access3", + "oc2r:hdd_access4", + "oc2r:hdd_access5", + "oc2r:hdd_access6", + "oc2r:hdd_access7" + ] + } +} diff --git a/src/main/resources/assets/oc2/sounds/computer_running.ogg b/src/main/resources/assets/oc2r/sounds/computer_running.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/computer_running.ogg rename to src/main/resources/assets/oc2r/sounds/computer_running.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_access1.ogg b/src/main/resources/assets/oc2r/sounds/floppy_access1.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_access1.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_access1.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_access2.ogg b/src/main/resources/assets/oc2r/sounds/floppy_access2.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_access2.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_access2.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_access3.ogg b/src/main/resources/assets/oc2r/sounds/floppy_access3.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_access3.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_access3.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_access4.ogg b/src/main/resources/assets/oc2r/sounds/floppy_access4.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_access4.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_access4.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_access5.ogg b/src/main/resources/assets/oc2r/sounds/floppy_access5.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_access5.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_access5.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_access6.ogg b/src/main/resources/assets/oc2r/sounds/floppy_access6.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_access6.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_access6.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_eject.ogg b/src/main/resources/assets/oc2r/sounds/floppy_eject.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_eject.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_eject.ogg diff --git a/src/main/resources/assets/oc2/sounds/floppy_insert.ogg b/src/main/resources/assets/oc2r/sounds/floppy_insert.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/floppy_insert.ogg rename to src/main/resources/assets/oc2r/sounds/floppy_insert.ogg diff --git a/src/main/resources/assets/oc2/sounds/hdd_access1.ogg b/src/main/resources/assets/oc2r/sounds/hdd_access1.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/hdd_access1.ogg rename to src/main/resources/assets/oc2r/sounds/hdd_access1.ogg diff --git a/src/main/resources/assets/oc2/sounds/hdd_access2.ogg b/src/main/resources/assets/oc2r/sounds/hdd_access2.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/hdd_access2.ogg rename to src/main/resources/assets/oc2r/sounds/hdd_access2.ogg diff --git a/src/main/resources/assets/oc2/sounds/hdd_access3.ogg b/src/main/resources/assets/oc2r/sounds/hdd_access3.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/hdd_access3.ogg rename to src/main/resources/assets/oc2r/sounds/hdd_access3.ogg diff --git a/src/main/resources/assets/oc2/sounds/hdd_access4.ogg b/src/main/resources/assets/oc2r/sounds/hdd_access4.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/hdd_access4.ogg rename to src/main/resources/assets/oc2r/sounds/hdd_access4.ogg diff --git a/src/main/resources/assets/oc2/sounds/hdd_access5.ogg b/src/main/resources/assets/oc2r/sounds/hdd_access5.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/hdd_access5.ogg rename to src/main/resources/assets/oc2r/sounds/hdd_access5.ogg diff --git a/src/main/resources/assets/oc2/sounds/hdd_access6.ogg b/src/main/resources/assets/oc2r/sounds/hdd_access6.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/hdd_access6.ogg rename to src/main/resources/assets/oc2r/sounds/hdd_access6.ogg diff --git a/src/main/resources/assets/oc2/sounds/hdd_access7.ogg b/src/main/resources/assets/oc2r/sounds/hdd_access7.ogg similarity index 100% rename from src/main/resources/assets/oc2/sounds/hdd_access7.ogg rename to src/main/resources/assets/oc2r/sounds/hdd_access7.ogg diff --git a/src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png b/src/main/resources/assets/oc2r/textures/block/cable_base/cable_base_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/cable_base/cable_base_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png b/src/main/resources/assets/oc2r/textures/block/cable_link/cable_link_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/cable_link/cable_link_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png b/src/main/resources/assets/oc2r/textures/block/cable_plug/cable_plug_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/cable_plug/cable_plug_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png b/src/main/resources/assets/oc2r/textures/block/cable_straight/cable_straight_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/cable_straight/cable_straight_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png b/src/main/resources/assets/oc2r/textures/block/cable_support/cable_support_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/cable_support/cable_support_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/charger/charger_atlas0.png b/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/charger/charger_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/charger/charger_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/charger/charger_atlas1.png b/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/charger/charger_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/charger/charger_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/charger/charger_atlas2.png b/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/charger/charger_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/charger/charger_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/charger/charger_atlas3.png b/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/charger/charger_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/charger/charger_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/charger/effect.png b/src/main/resources/assets/oc2r/textures/block/charger/effect.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/charger/effect.png rename to src/main/resources/assets/oc2r/textures/block/charger/effect.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_atlas1.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_atlas2.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_atlas3.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_atlas4.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_atlas4.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_atlas4.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_power.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_power.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_overlay_power.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_power.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_status.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_status.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_overlay_status.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_status.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_terminal.png b/src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_terminal.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/computer/computer_overlay_terminal.png rename to src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_terminal.png diff --git a/src/main/resources/assets/oc2/textures/block/creative_energy.png b/src/main/resources/assets/oc2r/textures/block/creative_energy.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/creative_energy.png rename to src/main/resources/assets/oc2r/textures/block/creative_energy.png diff --git a/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas0.png b/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas1.png b/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas2.png b/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas3.png b/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas0.png b/src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas1.png b/src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/monitor/monitor.png b/src/main/resources/assets/oc2r/textures/block/monitor/monitor.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/monitor/monitor.png rename to src/main/resources/assets/oc2r/textures/block/monitor/monitor.png diff --git a/src/main/resources/assets/oc2/textures/block/monitor/monitor_overlay_power.png b/src/main/resources/assets/oc2r/textures/block/monitor/monitor_overlay_power.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/monitor/monitor_overlay_power.png rename to src/main/resources/assets/oc2r/textures/block/monitor/monitor_overlay_power.png diff --git a/src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png b/src/main/resources/assets/oc2r/textures/block/network_connector/network_connector_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/network_connector/network_connector_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png b/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas1.png b/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas2.png b/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas3.png b/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas0.png b/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas1.png b/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas2.png b/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas3.png b/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas0.png b/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas1.png b/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas2.png b/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas3.png b/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas4.png b/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas4.png rename to src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas4.png diff --git a/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas5.png b/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas5.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas5.png rename to src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas5.png diff --git a/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas6.png b/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas6.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas6.png rename to src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas6.png diff --git a/src/main/resources/assets/oc2/textures/block/projector/projector_atlas0.png b/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/projector/projector_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/projector/projector_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/projector/projector_atlas1.png b/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/projector/projector_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/projector/projector_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/projector/projector_atlas2.png b/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/projector/projector_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/projector/projector_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/projector/projector_atlas3.png b/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/projector/projector_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/projector/projector_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/projector/projector_atlas4.png b/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/projector/projector_atlas4.png rename to src/main/resources/assets/oc2r/textures/block/projector/projector_atlas4.png diff --git a/src/main/resources/assets/oc2/textures/block/projector/projector_atlas5.png b/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas5.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/projector/projector_atlas5.png rename to src/main/resources/assets/oc2r/textures/block/projector/projector_atlas5.png diff --git a/src/main/resources/assets/oc2/textures/block/projector/projector_atlas6.png b/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas6.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/projector/projector_atlas6.png rename to src/main/resources/assets/oc2r/textures/block/projector/projector_atlas6.png diff --git a/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png b/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png b/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png b/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png b/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png b/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png rename to src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas4.png diff --git a/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas0.png b/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas0.png rename to src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas1.png b/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas1.png rename to src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas1.png diff --git a/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas2.png b/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas2.png rename to src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas3.png b/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas3.png rename to src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/entity/robot/robot.png b/src/main/resources/assets/oc2r/textures/entity/robot/robot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/entity/robot/robot.png rename to src/main/resources/assets/oc2r/textures/entity/robot/robot.png diff --git a/src/main/resources/assets/oc2/textures/font/OFL.TXT b/src/main/resources/assets/oc2r/textures/font/OFL.TXT similarity index 100% rename from src/main/resources/assets/oc2/textures/font/OFL.TXT rename to src/main/resources/assets/oc2r/textures/font/OFL.TXT diff --git a/src/main/resources/assets/oc2/textures/font/monospace.png b/src/main/resources/assets/oc2r/textures/font/monospace.png similarity index 100% rename from src/main/resources/assets/oc2/textures/font/monospace.png rename to src/main/resources/assets/oc2r/textures/font/monospace.png diff --git a/src/main/resources/assets/oc2/textures/font/terminus.png b/src/main/resources/assets/oc2r/textures/font/terminus.png similarity index 100% rename from src/main/resources/assets/oc2/textures/font/terminus.png rename to src/main/resources/assets/oc2r/textures/font/terminus.png diff --git a/src/main/resources/assets/oc2/textures/gui/manual/home.png b/src/main/resources/assets/oc2r/textures/gui/manual/home.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/manual/home.png rename to src/main/resources/assets/oc2r/textures/gui/manual/home.png diff --git a/src/main/resources/assets/oc2/textures/gui/manual/manual.png b/src/main/resources/assets/oc2r/textures/gui/manual/manual.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/manual/manual.png rename to src/main/resources/assets/oc2r/textures/gui/manual/manual.png diff --git a/src/main/resources/assets/oc2/textures/gui/manual/scroll_button.png b/src/main/resources/assets/oc2r/textures/gui/manual/scroll_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/manual/scroll_button.png rename to src/main/resources/assets/oc2r/textures/gui/manual/scroll_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/manual/tab_button.png b/src/main/resources/assets/oc2r/textures/gui/manual/tab_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/manual/tab_button.png rename to src/main/resources/assets/oc2r/textures/gui/manual/tab_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/overlay/block_face_disabled.png b/src/main/resources/assets/oc2r/textures/gui/overlay/block_face_disabled.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/overlay/block_face_disabled.png rename to src/main/resources/assets/oc2r/textures/gui/overlay/block_face_disabled.png diff --git a/src/main/resources/assets/oc2/textures/gui/overlay/block_face_enabled.png b/src/main/resources/assets/oc2r/textures/gui/overlay/block_face_enabled.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/overlay/block_face_enabled.png rename to src/main/resources/assets/oc2r/textures/gui/overlay/block_face_enabled.png diff --git a/src/main/resources/assets/oc2/textures/gui/overlay/block_face_focused.png b/src/main/resources/assets/oc2r/textures/gui/overlay/block_face_focused.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/overlay/block_face_focused.png rename to src/main/resources/assets/oc2r/textures/gui/overlay/block_face_focused.png diff --git a/src/main/resources/assets/oc2/textures/gui/overlay/slot_info.png b/src/main/resources/assets/oc2r/textures/gui/overlay/slot_info.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/overlay/slot_info.png rename to src/main/resources/assets/oc2r/textures/gui/overlay/slot_info.png diff --git a/src/main/resources/assets/oc2/textures/gui/overlay/slot_selection.png b/src/main/resources/assets/oc2r/textures/gui/overlay/slot_selection.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/overlay/slot_selection.png rename to src/main/resources/assets/oc2r/textures/gui/overlay/slot_selection.png diff --git a/src/main/resources/assets/oc2/textures/gui/overlay/slot_warn.png b/src/main/resources/assets/oc2r/textures/gui/overlay/slot_warn.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/overlay/slot_warn.png rename to src/main/resources/assets/oc2r/textures/gui/overlay/slot_warn.png diff --git a/src/main/resources/assets/oc2/textures/gui/overlay/terminal_focused.png b/src/main/resources/assets/oc2r/textures/gui/overlay/terminal_focused.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/overlay/terminal_focused.png rename to src/main/resources/assets/oc2r/textures/gui/overlay/terminal_focused.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/bus_interface_screen.png b/src/main/resources/assets/oc2r/textures/gui/widget/bus_interface_screen.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/bus_interface_screen.png rename to src/main/resources/assets/oc2r/textures/gui/widget/bus_interface_screen.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/cancel_button.png b/src/main/resources/assets/oc2r/textures/gui/widget/cancel_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/cancel_button.png rename to src/main/resources/assets/oc2r/textures/gui/widget/cancel_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/computer_container.png b/src/main/resources/assets/oc2r/textures/gui/widget/computer_container.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/computer_container.png rename to src/main/resources/assets/oc2r/textures/gui/widget/computer_container.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/confirm_button.png b/src/main/resources/assets/oc2r/textures/gui/widget/confirm_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/confirm_button.png rename to src/main/resources/assets/oc2r/textures/gui/widget/confirm_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/energy.png b/src/main/resources/assets/oc2r/textures/gui/widget/energy.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/energy.png rename to src/main/resources/assets/oc2r/textures/gui/widget/energy.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/hotbar.png b/src/main/resources/assets/oc2r/textures/gui/widget/hotbar.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/hotbar.png rename to src/main/resources/assets/oc2r/textures/gui/widget/hotbar.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/input_button.png b/src/main/resources/assets/oc2r/textures/gui/widget/input_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/input_button.png rename to src/main/resources/assets/oc2r/textures/gui/widget/input_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/inventory_button.png b/src/main/resources/assets/oc2r/textures/gui/widget/inventory_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/inventory_button.png rename to src/main/resources/assets/oc2r/textures/gui/widget/inventory_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/monitor_screen.png b/src/main/resources/assets/oc2r/textures/gui/widget/monitor_screen.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/monitor_screen.png rename to src/main/resources/assets/oc2r/textures/gui/widget/monitor_screen.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/monitor_sidebar_1.png b/src/main/resources/assets/oc2r/textures/gui/widget/monitor_sidebar_1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/monitor_sidebar_1.png rename to src/main/resources/assets/oc2r/textures/gui/widget/monitor_sidebar_1.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/network_interface_card_screen.png b/src/main/resources/assets/oc2r/textures/gui/widget/network_interface_card_screen.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/network_interface_card_screen.png rename to src/main/resources/assets/oc2r/textures/gui/widget/network_interface_card_screen.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_link_button.png b/src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_link_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_link_button.png rename to src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_link_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_screen.png b/src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_screen.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_screen.png rename to src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_screen.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/power_button.png b/src/main/resources/assets/oc2r/textures/gui/widget/power_button.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/power_button.png rename to src/main/resources/assets/oc2r/textures/gui/widget/power_button.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/robot_container.png b/src/main/resources/assets/oc2r/textures/gui/widget/robot_container.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/robot_container.png rename to src/main/resources/assets/oc2r/textures/gui/widget/robot_container.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/sidebar_2.png b/src/main/resources/assets/oc2r/textures/gui/widget/sidebar_2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/sidebar_2.png rename to src/main/resources/assets/oc2r/textures/gui/widget/sidebar_2.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/sidebar_3.png b/src/main/resources/assets/oc2r/textures/gui/widget/sidebar_3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/sidebar_3.png rename to src/main/resources/assets/oc2r/textures/gui/widget/sidebar_3.png diff --git a/src/main/resources/assets/oc2/textures/gui/widget/terminal_screen.png b/src/main/resources/assets/oc2r/textures/gui/widget/terminal_screen.png similarity index 100% rename from src/main/resources/assets/oc2/textures/gui/widget/terminal_screen.png rename to src/main/resources/assets/oc2r/textures/gui/widget/terminal_screen.png diff --git a/src/main/resources/assets/oc2/textures/item/backlight.png b/src/main/resources/assets/oc2r/textures/item/backlight.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/backlight.png rename to src/main/resources/assets/oc2r/textures/item/backlight.png diff --git a/src/main/resources/assets/oc2/textures/item/block_operations_module.png b/src/main/resources/assets/oc2r/textures/item/block_operations_module.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/block_operations_module.png rename to src/main/resources/assets/oc2r/textures/item/block_operations_module.png diff --git a/src/main/resources/assets/oc2/textures/item/card_slot.png b/src/main/resources/assets/oc2r/textures/item/card_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/card_slot.png rename to src/main/resources/assets/oc2r/textures/item/card_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/circuit_board.png b/src/main/resources/assets/oc2r/textures/item/circuit_board.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/circuit_board.png rename to src/main/resources/assets/oc2r/textures/item/circuit_board.png diff --git a/src/main/resources/assets/oc2/textures/item/cpu_slot.png b/src/main/resources/assets/oc2r/textures/item/cpu_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/cpu_slot.png rename to src/main/resources/assets/oc2r/textures/item/cpu_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/cpu_tier_1.png b/src/main/resources/assets/oc2r/textures/item/cpu_tier_1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/cpu_tier_1.png rename to src/main/resources/assets/oc2r/textures/item/cpu_tier_1.png diff --git a/src/main/resources/assets/oc2/textures/item/cpu_tier_2.png b/src/main/resources/assets/oc2r/textures/item/cpu_tier_2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/cpu_tier_2.png rename to src/main/resources/assets/oc2r/textures/item/cpu_tier_2.png diff --git a/src/main/resources/assets/oc2/textures/item/cpu_tier_3.png b/src/main/resources/assets/oc2r/textures/item/cpu_tier_3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/cpu_tier_3.png rename to src/main/resources/assets/oc2r/textures/item/cpu_tier_3.png diff --git a/src/main/resources/assets/oc2/textures/item/cpu_tier_4.png b/src/main/resources/assets/oc2r/textures/item/cpu_tier_4.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/cpu_tier_4.png rename to src/main/resources/assets/oc2r/textures/item/cpu_tier_4.png diff --git a/src/main/resources/assets/oc2/textures/item/file_import_export_card.png b/src/main/resources/assets/oc2r/textures/item/file_import_export_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/file_import_export_card.png rename to src/main/resources/assets/oc2r/textures/item/file_import_export_card.png diff --git a/src/main/resources/assets/oc2/textures/item/file_import_export_card.png.mcmeta b/src/main/resources/assets/oc2r/textures/item/file_import_export_card.png.mcmeta similarity index 100% rename from src/main/resources/assets/oc2/textures/item/file_import_export_card.png.mcmeta rename to src/main/resources/assets/oc2r/textures/item/file_import_export_card.png.mcmeta diff --git a/src/main/resources/assets/oc2/textures/item/flash_memory.png b/src/main/resources/assets/oc2r/textures/item/flash_memory.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/flash_memory.png rename to src/main/resources/assets/oc2r/textures/item/flash_memory.png diff --git a/src/main/resources/assets/oc2/textures/item/flash_memory_slot.png b/src/main/resources/assets/oc2r/textures/item/flash_memory_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/flash_memory_slot.png rename to src/main/resources/assets/oc2r/textures/item/flash_memory_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/floppy_base.png b/src/main/resources/assets/oc2r/textures/item/floppy_base.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/floppy_base.png rename to src/main/resources/assets/oc2r/textures/item/floppy_base.png diff --git a/src/main/resources/assets/oc2/textures/item/floppy_slot.png b/src/main/resources/assets/oc2r/textures/item/floppy_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/floppy_slot.png rename to src/main/resources/assets/oc2r/textures/item/floppy_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/floppy_tint.png b/src/main/resources/assets/oc2r/textures/item/floppy_tint.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/floppy_tint.png rename to src/main/resources/assets/oc2r/textures/item/floppy_tint.png diff --git a/src/main/resources/assets/oc2/textures/item/front_display_glass.png b/src/main/resources/assets/oc2r/textures/item/front_display_glass.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/front_display_glass.png rename to src/main/resources/assets/oc2r/textures/item/front_display_glass.png diff --git a/src/main/resources/assets/oc2/textures/item/hard_disk_platter.png b/src/main/resources/assets/oc2r/textures/item/hard_disk_platter.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/hard_disk_platter.png rename to src/main/resources/assets/oc2r/textures/item/hard_disk_platter.png diff --git a/src/main/resources/assets/oc2/textures/item/hard_drive_base.png b/src/main/resources/assets/oc2r/textures/item/hard_drive_base.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/hard_drive_base.png rename to src/main/resources/assets/oc2r/textures/item/hard_drive_base.png diff --git a/src/main/resources/assets/oc2/textures/item/hard_drive_slot.png b/src/main/resources/assets/oc2r/textures/item/hard_drive_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/hard_drive_slot.png rename to src/main/resources/assets/oc2r/textures/item/hard_drive_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/hard_drive_tint.png b/src/main/resources/assets/oc2r/textures/item/hard_drive_tint.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/hard_drive_tint.png rename to src/main/resources/assets/oc2r/textures/item/hard_drive_tint.png diff --git a/src/main/resources/assets/oc2/textures/item/inventory_operations_module.png b/src/main/resources/assets/oc2r/textures/item/inventory_operations_module.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/inventory_operations_module.png rename to src/main/resources/assets/oc2r/textures/item/inventory_operations_module.png diff --git a/src/main/resources/assets/oc2/textures/item/lcd_display.png b/src/main/resources/assets/oc2r/textures/item/lcd_display.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/lcd_display.png rename to src/main/resources/assets/oc2r/textures/item/lcd_display.png diff --git a/src/main/resources/assets/oc2/textures/item/liquid_crystal_layers.png b/src/main/resources/assets/oc2r/textures/item/liquid_crystal_layers.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/liquid_crystal_layers.png rename to src/main/resources/assets/oc2r/textures/item/liquid_crystal_layers.png diff --git a/src/main/resources/assets/oc2/textures/item/manual.png b/src/main/resources/assets/oc2r/textures/item/manual.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/manual.png rename to src/main/resources/assets/oc2r/textures/item/manual.png diff --git a/src/main/resources/assets/oc2/textures/item/memory_extra_large.png b/src/main/resources/assets/oc2r/textures/item/memory_extra_large.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/memory_extra_large.png rename to src/main/resources/assets/oc2r/textures/item/memory_extra_large.png diff --git a/src/main/resources/assets/oc2/textures/item/memory_large.png b/src/main/resources/assets/oc2r/textures/item/memory_large.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/memory_large.png rename to src/main/resources/assets/oc2r/textures/item/memory_large.png diff --git a/src/main/resources/assets/oc2/textures/item/memory_medium.png b/src/main/resources/assets/oc2r/textures/item/memory_medium.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/memory_medium.png rename to src/main/resources/assets/oc2r/textures/item/memory_medium.png diff --git a/src/main/resources/assets/oc2/textures/item/memory_slot.png b/src/main/resources/assets/oc2r/textures/item/memory_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/memory_slot.png rename to src/main/resources/assets/oc2r/textures/item/memory_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/memory_small.png b/src/main/resources/assets/oc2r/textures/item/memory_small.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/memory_small.png rename to src/main/resources/assets/oc2r/textures/item/memory_small.png diff --git a/src/main/resources/assets/oc2/textures/item/motor.png b/src/main/resources/assets/oc2r/textures/item/motor.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/motor.png rename to src/main/resources/assets/oc2r/textures/item/motor.png diff --git a/src/main/resources/assets/oc2/textures/item/network_cable.png b/src/main/resources/assets/oc2r/textures/item/network_cable.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/network_cable.png rename to src/main/resources/assets/oc2r/textures/item/network_cable.png diff --git a/src/main/resources/assets/oc2/textures/item/network_interface_card.png b/src/main/resources/assets/oc2r/textures/item/network_interface_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/network_interface_card.png rename to src/main/resources/assets/oc2r/textures/item/network_interface_card.png diff --git a/src/main/resources/assets/oc2/textures/item/network_tunnel_card.png b/src/main/resources/assets/oc2r/textures/item/network_tunnel_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/network_tunnel_card.png rename to src/main/resources/assets/oc2r/textures/item/network_tunnel_card.png diff --git a/src/main/resources/assets/oc2/textures/item/network_tunnel_module.png b/src/main/resources/assets/oc2r/textures/item/network_tunnel_module.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/network_tunnel_module.png rename to src/main/resources/assets/oc2r/textures/item/network_tunnel_module.png diff --git a/src/main/resources/assets/oc2/textures/item/network_tunnel_slot.png b/src/main/resources/assets/oc2r/textures/item/network_tunnel_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/network_tunnel_slot.png rename to src/main/resources/assets/oc2r/textures/item/network_tunnel_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/polarization_filter.png b/src/main/resources/assets/oc2r/textures/item/polarization_filter.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/polarization_filter.png rename to src/main/resources/assets/oc2r/textures/item/polarization_filter.png diff --git a/src/main/resources/assets/oc2/textures/item/redstone_interface_card.png b/src/main/resources/assets/oc2r/textures/item/redstone_interface_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/redstone_interface_card.png rename to src/main/resources/assets/oc2r/textures/item/redstone_interface_card.png diff --git a/src/main/resources/assets/oc2/textures/item/robot_module_slot.png b/src/main/resources/assets/oc2r/textures/item/robot_module_slot.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/robot_module_slot.png rename to src/main/resources/assets/oc2r/textures/item/robot_module_slot.png diff --git a/src/main/resources/assets/oc2/textures/item/sound_card.png b/src/main/resources/assets/oc2r/textures/item/sound_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/sound_card.png rename to src/main/resources/assets/oc2r/textures/item/sound_card.png diff --git a/src/main/resources/assets/oc2/textures/item/transistor.png b/src/main/resources/assets/oc2r/textures/item/transistor.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/transistor.png rename to src/main/resources/assets/oc2r/textures/item/transistor.png diff --git a/src/main/resources/assets/oc2/textures/item/wrench.png b/src/main/resources/assets/oc2r/textures/item/wrench.png similarity index 100% rename from src/main/resources/assets/oc2/textures/item/wrench.png rename to src/main/resources/assets/oc2r/textures/item/wrench.png diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_large.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_large.json deleted file mode 100644 index ad74a73f..00000000 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_large.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "oc2:hard_drive_large" - ] - }, - "criteria": { - "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "oc2:computer" - ] - } - ] - } - }, - "has_robot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "oc2:robot" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "oc2:hard_drive_large" - } - } - }, - "requirements": [ - [ - "has_computer", - "has_robot", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/file_systems/scripts.json b/src/main/resources/data/oc2/file_systems/scripts.json deleted file mode 100644 index fad587c8..00000000 --- a/src/main/resources/data/oc2/file_systems/scripts.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "layer", - "order": 0, - "location": "oc2:file_systems/scripts.zip" -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/item_tag_filters/oc2/hard_drive.json b/src/main/resources/data/oc2/item_tag_filters/oc2/hard_drive.json deleted file mode 100644 index 47f8b9f4..00000000 --- a/src/main/resources/data/oc2/item_tag_filters/oc2/hard_drive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "item": "oc2:hard_drive", - "tags": [ - "tag.oc2.size" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/item_tag_filters/oc2/memory.json b/src/main/resources/data/oc2/item_tag_filters/oc2/memory.json deleted file mode 100644 index 9e6a99c8..00000000 --- a/src/main/resources/data/oc2/item_tag_filters/oc2/memory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "item": "oc2:memory", - "tags": [ - "tag.oc2.size" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/recipes/flash_memory_custom.json b/src/main/resources/data/oc2/recipes/flash_memory_custom.json deleted file mode 100644 index a3c33379..00000000 --- a/src/main/resources/data/oc2/recipes/flash_memory_custom.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "oc2:wrench", - "ingredients": [ - { - "item": "oc2:wrench" - }, - { - "item": "oc2:flash_memory" - } - ], - "result": { - "item": "oc2:flash_memory_custom" - } -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/recipes/hard_drive_custom.json b/src/main/resources/data/oc2/recipes/hard_drive_custom.json deleted file mode 100644 index b25f7e6c..00000000 --- a/src/main/resources/data/oc2/recipes/hard_drive_custom.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "oc2:wrench", - "ingredients": [ - { - "item": "oc2:wrench" - }, - { - "item": "oc2:hard_drive_large" - } - ], - "result": { - "item": "oc2:hard_drive_custom" - } -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/blocks/devices.json b/src/main/resources/data/oc2/tags/blocks/devices.json deleted file mode 100644 index 12616a2a..00000000 --- a/src/main/resources/data/oc2/tags/blocks/devices.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:computer", - "oc2:redstone_interface", - "oc2:disk_drive", - "oc2:projector" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/blocks/wrench_breakable.json b/src/main/resources/data/oc2/tags/blocks/wrench_breakable.json deleted file mode 100644 index ad74f182..00000000 --- a/src/main/resources/data/oc2/tags/blocks/wrench_breakable.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:computer", - "oc2:bus_cable", - "oc2:network_connector", - "oc2:network_hub", - "oc2:redstone_interface", - "oc2:disk_drive", - "oc2:charger", - "oc2:projector" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json deleted file mode 100644 index 50ec87fa..00000000 --- a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:disk_drive", - "oc2:flash_memory", - "oc2:flash_memory_custom", - "oc2:hard_drive_small", - "oc2:hard_drive_medium", - "oc2:hard_drive_large", - "oc2:hard_drive_extra_large", - "oc2:hard_drive_custom", - "oc2:keyboard", - "oc2:memory_small", - "oc2:memory_medium", - "oc2:memory_large", - "oc2:memory_extra_large", - "oc2:network_interface_card", - "oc2:network_tunnel_card", - "oc2:network_tunnel_module", - "oc2:projector", - "oc2:cpu_tier_1", - "oc2:cpu_tier_2", - "oc2:cpu_tier_3", - "oc2:cpu_tier_4" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices.json b/src/main/resources/data/oc2/tags/items/devices.json deleted file mode 100644 index bc44270c..00000000 --- a/src/main/resources/data/oc2/tags/items/devices.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:computer", - "oc2:redstone_interface", - "oc2:disk_drive", - "oc2:projector", - "#oc2:devices/memory", - "#oc2:devices/hard_drive", - "#oc2:devices/flash_memory", - "#oc2:devices/card", - "#oc2:devices/robot_module", - "#oc2:devices/floppy", - "#oc2:devices/cpu" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/card.json b/src/main/resources/data/oc2/tags/items/devices/card.json deleted file mode 100644 index 69e8c465..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/card.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:redstone_interface_card", - "oc2:network_interface_card", - "oc2:file_import_export_card", - "oc2:sound_card", - "oc2:network_tunnel_card" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/items/devices/cpu.json b/src/main/resources/data/oc2/tags/items/devices/cpu.json deleted file mode 100644 index 0abfb014..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/cpu.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:cpu_tier_1", - "oc2:cpu_tier_2", - "oc2:cpu_tier_3", - "oc2:cpu_tier_4" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/flash_memory.json b/src/main/resources/data/oc2/tags/items/devices/flash_memory.json deleted file mode 100644 index da08945c..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/flash_memory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:flash_memory", - "oc2:flash_memory_custom" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/items/devices/floppy.json b/src/main/resources/data/oc2/tags/items/devices/floppy.json deleted file mode 100644 index f1fd7e1f..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/floppy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:floppy", - "oc2:floppy_modern" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2/tags/items/devices/hard_drive.json deleted file mode 100644 index 30764a13..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/hard_drive.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:hard_drive_small", - "oc2:hard_drive_medium", - "oc2:hard_drive_large", - "oc2:hard_drive_extra_large", - "oc2:hard_drive_custom" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/memory.json b/src/main/resources/data/oc2/tags/items/devices/memory.json deleted file mode 100644 index c2ed3079..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/memory.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:memory_small", - "oc2:memory_medium", - "oc2:memory_large", - "oc2:memory_extra_large" - ] -} diff --git a/src/main/resources/data/oc2/tags/items/devices/network_tunnel.json b/src/main/resources/data/oc2/tags/items/devices/network_tunnel.json deleted file mode 100644 index 67baf038..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/network_tunnel.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:network_tunnel_card", - "oc2:network_tunnel_module" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/items/devices/robot_module.json b/src/main/resources/data/oc2/tags/items/devices/robot_module.json deleted file mode 100644 index 7a652ab2..00000000 --- a/src/main/resources/data/oc2/tags/items/devices/robot_module.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "oc2:inventory_operations_module", - "oc2:block_operations_module", - "oc2:network_tunnel_module" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/items/tool_materials.json b/src/main/resources/data/oc2/tags/items/tool_materials.json deleted file mode 100644 index 866e21fb..00000000 --- a/src/main/resources/data/oc2/tags/items/tool_materials.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#oc2:tool_materials/wood", - "#oc2:tool_materials/stone", - "#oc2:tool_materials/iron", - "#oc2:tool_materials/gold", - "#oc2:tool_materials/diamond", - "#oc2:tool_materials/netherite" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/block_operations_module.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/block_operations_module.json similarity index 80% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/block_operations_module.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/block_operations_module.json index e63950cf..bb282af4 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/block_operations_module.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/block_operations_module.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:block_operations_module" + "oc2r:block_operations_module" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:block_operations_module" + "recipe": "oc2r:block_operations_module" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_cable.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_cable.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_cable.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_cable.json index ffe7f160..839490ad 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_cable.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_cable.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:bus_cable" + "oc2r:bus_cable" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:bus_cable" + "recipe": "oc2r:bus_cable" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_interface.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_interface.json similarity index 83% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_interface.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_interface.json index 70acb554..d7832faf 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_interface.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_interface.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:bus_interface" + "oc2r:bus_interface" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:bus_cable" + "oc2r:bus_cable" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:bus_interface" + "recipe": "oc2r:bus_interface" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/charger.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/charger.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/charger.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/charger.json index 2b2d13b2..ff52545a 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/charger.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/charger.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:charger" + "oc2r:charger" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:charger" + "recipe": "oc2r:charger" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/circuit_board.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/circuit_board.json similarity index 83% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/circuit_board.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/circuit_board.json index 5cede701..9c379c7f 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/circuit_board.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/circuit_board.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:circuit_board" + "oc2r:circuit_board" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:circuit_board" + "recipe": "oc2r:circuit_board" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/computer.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/computer.json similarity index 85% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/computer.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/computer.json index 360d1b2f..75b91793 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/computer.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/computer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:computer" + "oc2r:computer" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:circuit_board" + "oc2r:circuit_board" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:computer" + "recipe": "oc2r:computer" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/disk_drive.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/disk_drive.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/disk_drive.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/disk_drive.json index 0c0b7f3c..268c4330 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/disk_drive.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/disk_drive.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:disk_drive" + "oc2r:disk_drive" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:disk_drive" + "recipe": "oc2r:disk_drive" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/file_import_export_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/file_import_export_card.json similarity index 80% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/file_import_export_card.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/file_import_export_card.json index f3efa15c..f67d0400 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/file_import_export_card.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/file_import_export_card.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:file_import_export_card" + "oc2r:file_import_export_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:file_import_export_card" + "recipe": "oc2r:file_import_export_card" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory.json similarity index 85% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory.json index 1a2f8e53..e884723b 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:flash_memory" + "oc2r:flash_memory" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:flash_memory" + "recipe": "oc2r:flash_memory" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_extra_large.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json similarity index 83% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_extra_large.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json index cb3f2ab8..68eb78c2 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_extra_large.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:hard_drive_extra_large" + "oc2r:flash_memory_custom" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:hard_drive_extra_large" + "recipe": "oc2r:flash_memory_custom" } } }, diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy.json similarity index 85% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy.json index 5070c733..baa314a3 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:floppy" + "oc2r:floppy" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:disk_drive" + "oc2r:disk_drive" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:floppy" + "recipe": "oc2r:floppy" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy_modern.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy_modern.json similarity index 83% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy_modern.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy_modern.json index 9a4e61c1..28c0542c 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy_modern.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy_modern.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:floppy_modern" + "oc2r:floppy_modern" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:disk_drive" + "oc2r:disk_drive" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:floppy_modern" + "recipe": "oc2r:floppy_modern" } } }, diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_custom.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_custom.json index 1b162c0f..7eaca159 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_custom.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:hard_drive_custom" + "oc2r:hard_drive_custom" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:hard_drive_custom" + "recipe": "oc2r:hard_drive_custom" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_extra_large.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_extra_large.json new file mode 100644 index 00000000..40a1eaf7 --- /dev/null +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_extra_large.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "oc2r:hard_drive_extra_large" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "oc2r:computer" + ] + } + ] + } + }, + "has_robot": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "oc2r:robot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "oc2r:hard_drive_extra_large" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_robot", + "has_the_recipe" + ] + ] +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_extra_large.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_large.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_extra_large.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_large.json index a118ae62..fc89cdf5 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_extra_large.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_large.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:memory_extra_large" + "oc2r:hard_drive_large" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:memory_extra_large" + "recipe": "oc2r:hard_drive_large" } } }, diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_medium.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_medium.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_medium.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_medium.json index 8baafbd2..c665a227 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_medium.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_medium.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:hard_drive_medium" + "oc2r:hard_drive_medium" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:hard_drive_medium" + "recipe": "oc2r:hard_drive_medium" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_small.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_small.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_small.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_small.json index d661a25e..3218fe44 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_small.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_small.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:hard_drive_small" + "oc2r:hard_drive_small" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:hard_drive_small" + "recipe": "oc2r:hard_drive_small" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/inventory_operations_module.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/inventory_operations_module.json similarity index 79% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/inventory_operations_module.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/inventory_operations_module.json index 0111894b..59fdb479 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/inventory_operations_module.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/inventory_operations_module.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:inventory_operations_module" + "oc2r:inventory_operations_module" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:inventory_operations_module" + "recipe": "oc2r:inventory_operations_module" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/keyboard.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/keyboard.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/keyboard.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/keyboard.json index 04ea48be..acfb0b38 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/keyboard.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/keyboard.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:keyboard" + "oc2r:keyboard" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:keyboard" + "recipe": "oc2r:keyboard" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/manual.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/manual.json similarity index 89% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/manual.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/manual.json index 6fcce862..e0f34b34 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/manual.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/manual.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:manual" + "oc2r:manual" ] }, "criteria": { @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:wrench" + "oc2r:wrench" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:manual" + "recipe": "oc2r:manual" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.json similarity index 83% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.json index 831325af..e93a97f1 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:flash_memory_custom" + "oc2r:memory_extra_large" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:flash_memory_custom" + "recipe": "oc2r:memory_extra_large" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_large.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_large.json similarity index 85% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_large.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_large.json index 24eb4737..bb2fa505 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_large.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_large.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:memory_large" + "oc2r:memory_large" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:memory_large" + "recipe": "oc2r:memory_large" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_medium.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_medium.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_medium.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_medium.json index e0fbaae6..b3c521c5 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_medium.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_medium.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:memory_medium" + "oc2r:memory_medium" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:memory_medium" + "recipe": "oc2r:memory_medium" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_small.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_small.json similarity index 85% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_small.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_small.json index 39abb003..097ba94e 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_small.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_small.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:memory_small" + "oc2r:memory_small" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:memory_small" + "recipe": "oc2r:memory_small" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_cable.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_cable.json similarity index 82% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/network_cable.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_cable.json index 137e7b0f..45be0b8c 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_cable.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_cable.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:network_cable" + "oc2r:network_cable" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:network_connector" + "oc2r:network_connector" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:network_cable" + "recipe": "oc2r:network_cable" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_connector.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_connector.json similarity index 82% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/network_connector.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_connector.json index deb723af..11a17ab9 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_connector.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_connector.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:network_connector" + "oc2r:network_connector" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:network_connector" + "recipe": "oc2r:network_connector" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_hub.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_hub.json similarity index 83% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/network_hub.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_hub.json index 2e8e82ea..ca4d0142 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_hub.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_hub.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:network_hub" + "oc2r:network_hub" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:network_connector" + "oc2r:network_connector" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:network_hub" + "recipe": "oc2r:network_hub" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_interface_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_interface_card.json similarity index 80% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/network_interface_card.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_interface_card.json index fd23163e..d98e37fd 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_interface_card.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_interface_card.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:network_interface_card" + "oc2r:network_interface_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:network_interface_card" + "recipe": "oc2r:network_interface_card" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_card.json similarity index 81% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_card.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_card.json index 56708def..b7326705 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_card.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_card.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:network_tunnel_card" + "oc2r:network_tunnel_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:network_tunnel_card" + "recipe": "oc2r:network_tunnel_card" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_module.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_module.json similarity index 81% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_module.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_module.json index 5a57ec61..28a991df 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_module.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_module.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:network_tunnel_module" + "oc2r:network_tunnel_module" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:robot" + "oc2r:robot" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:network_tunnel_module" + "recipe": "oc2r:network_tunnel_module" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/projector.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/projector.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/projector.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/projector.json index 672fd3e7..57126887 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/projector.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/projector.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:projector" + "oc2r:projector" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:projector" + "recipe": "oc2r:projector" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface.json similarity index 81% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface.json index 0f52e975..15bbd455 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:redstone_interface" + "oc2r:redstone_interface" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:redstone_interface" + "recipe": "oc2r:redstone_interface" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface_card.json similarity index 80% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface_card.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface_card.json index 3cbac503..62adf5f0 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface_card.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface_card.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:redstone_interface_card" + "oc2r:redstone_interface_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:redstone_interface_card" + "recipe": "oc2r:redstone_interface_card" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/robot.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/robot.json similarity index 85% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/robot.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/robot.json index 87e96c28..ffda9650 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/robot.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/robot.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:robot" + "oc2r:robot" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2:circuit_board" + "oc2r:circuit_board" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:robot" + "recipe": "oc2r:robot" } } }, @@ -44,4 +44,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/sound_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/sound_card.json similarity index 84% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/sound_card.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/sound_card.json index 91037ce9..110a0649 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/sound_card.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/sound_card.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:sound_card" + "oc2r:sound_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:computer" + "oc2r:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:sound_card" + "recipe": "oc2r:sound_card" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/transistor.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/transistor.json similarity index 89% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/transistor.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/transistor.json index 9d9cb3ee..e63816b9 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/transistor.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/transistor.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:transistor" + "oc2r:transistor" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:transistor" + "recipe": "oc2r:transistor" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/wrench.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/wrench.json similarity index 85% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/wrench.json rename to src/main/resources/data/oc2r/advancements/recipes/oc2r.common/wrench.json index d2742f16..f85de253 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/wrench.json +++ b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/wrench.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:wrench" + "oc2r:wrench" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2:transistor" + "oc2r:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:wrench" + "recipe": "oc2r:wrench" } } }, @@ -31,4 +31,4 @@ "has_the_recipe" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/file_systems/README.md b/src/main/resources/data/oc2r/file_systems/README.md similarity index 93% rename from src/main/resources/data/oc2/file_systems/README.md rename to src/main/resources/data/oc2r/file_systems/README.md index c174f59a..a7e642f4 100644 --- a/src/main/resources/data/oc2/file_systems/README.md +++ b/src/main/resources/data/oc2r/file_systems/README.md @@ -25,7 +25,7 @@ The directory structure for this, when not using zipped datapacks, would then lo - my_data_pack/ - pack.mcmeta - data/ - - oc2/ + - oc2r/ - file_systems/ - my_block_descriptor.json - my_block.ext2 @@ -46,7 +46,7 @@ Example: ```json { "type": "layer", - "location": "oc2:file_systems/my_layer.zip" + "location": "oc2r:file_systems/my_layer.zip" } ``` @@ -64,6 +64,6 @@ Example: { "type": "block", "name": "My Disk Image", - "location": "oc2:file_systems/my_block.ext2" + "location": "oc2r:file_systems/my_block.ext2" } ``` diff --git a/src/main/resources/data/oc2r/file_systems/scripts.json b/src/main/resources/data/oc2r/file_systems/scripts.json new file mode 100644 index 00000000..20a86de9 --- /dev/null +++ b/src/main/resources/data/oc2r/file_systems/scripts.json @@ -0,0 +1,5 @@ +{ + "type": "layer", + "order": 0, + "location": "oc2r:file_systems/scripts.zip" +} diff --git a/src/main/resources/data/oc2/item_tag_filters/minecraft/common.json b/src/main/resources/data/oc2r/item_tag_filters/minecraft/common.json similarity index 100% rename from src/main/resources/data/oc2/item_tag_filters/minecraft/common.json rename to src/main/resources/data/oc2r/item_tag_filters/minecraft/common.json diff --git a/src/main/resources/data/oc2r/item_tag_filters/oc2r/hard_drive.json b/src/main/resources/data/oc2r/item_tag_filters/oc2r/hard_drive.json new file mode 100644 index 00000000..925610ed --- /dev/null +++ b/src/main/resources/data/oc2r/item_tag_filters/oc2r/hard_drive.json @@ -0,0 +1,6 @@ +{ + "item": "oc2r:hard_drive", + "tags": [ + "tag.oc2r.size" + ] +} diff --git a/src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json b/src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json new file mode 100644 index 00000000..09b08a11 --- /dev/null +++ b/src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json @@ -0,0 +1,6 @@ +{ + "item": "oc2r:memory", + "tags": [ + "tag.oc2r.size" + ] +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/charger.json b/src/main/resources/data/oc2r/loot_tables/blocks/charger.json similarity index 89% rename from src/main/resources/data/oc2/loot_tables/blocks/charger.json rename to src/main/resources/data/oc2r/loot_tables/blocks/charger.json index 2c95cbcf..c64fd5c0 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/charger.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/charger.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "oc2:charger" + "name": "oc2r:charger" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/computer.json b/src/main/resources/data/oc2r/loot_tables/blocks/computer.json similarity index 95% rename from src/main/resources/data/oc2/loot_tables/blocks/computer.json rename to src/main/resources/data/oc2r/loot_tables/blocks/computer.json index 68a04f8b..38575b60 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/computer.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/computer.json @@ -25,7 +25,7 @@ ] } ], - "name": "oc2:computer" + "name": "oc2r:computer" } ], "conditions": [ @@ -35,4 +35,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/disk_drive.json b/src/main/resources/data/oc2r/loot_tables/blocks/disk_drive.json similarity index 88% rename from src/main/resources/data/oc2/loot_tables/blocks/disk_drive.json rename to src/main/resources/data/oc2r/loot_tables/blocks/disk_drive.json index 6ed66bf2..8c638451 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/disk_drive.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/disk_drive.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "oc2:disk_drive" + "name": "oc2r:disk_drive" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/keyboard.json b/src/main/resources/data/oc2r/loot_tables/blocks/keyboard.json similarity index 89% rename from src/main/resources/data/oc2/loot_tables/blocks/keyboard.json rename to src/main/resources/data/oc2r/loot_tables/blocks/keyboard.json index facf93f4..2466a709 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/keyboard.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/keyboard.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "oc2:keyboard" + "name": "oc2r:keyboard" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/network_connector.json b/src/main/resources/data/oc2r/loot_tables/blocks/network_connector.json similarity index 86% rename from src/main/resources/data/oc2/loot_tables/blocks/network_connector.json rename to src/main/resources/data/oc2r/loot_tables/blocks/network_connector.json index df67d29e..0a4ad429 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/network_connector.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/network_connector.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "oc2:network_connector" + "name": "oc2r:network_connector" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/network_hub.json b/src/main/resources/data/oc2r/loot_tables/blocks/network_hub.json similarity index 88% rename from src/main/resources/data/oc2/loot_tables/blocks/network_hub.json rename to src/main/resources/data/oc2r/loot_tables/blocks/network_hub.json index 18b01be6..4c95e834 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/network_hub.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/network_hub.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "oc2:network_hub" + "name": "oc2r:network_hub" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/projector.json b/src/main/resources/data/oc2r/loot_tables/blocks/projector.json similarity index 88% rename from src/main/resources/data/oc2/loot_tables/blocks/projector.json rename to src/main/resources/data/oc2r/loot_tables/blocks/projector.json index 8d17d357..bfd38da4 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/projector.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/projector.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "oc2:projector" + "name": "oc2r:projector" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/loot_tables/blocks/redstone_interface.json b/src/main/resources/data/oc2r/loot_tables/blocks/redstone_interface.json similarity index 86% rename from src/main/resources/data/oc2/loot_tables/blocks/redstone_interface.json rename to src/main/resources/data/oc2r/loot_tables/blocks/redstone_interface.json index 3c397c85..f97aabc2 100644 --- a/src/main/resources/data/oc2/loot_tables/blocks/redstone_interface.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/redstone_interface.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "oc2:redstone_interface" + "name": "oc2r:redstone_interface" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/block_operations_module.json b/src/main/resources/data/oc2r/recipes/block_operations_module.json similarity index 70% rename from src/main/resources/data/oc2/recipes/block_operations_module.json rename to src/main/resources/data/oc2r/recipes/block_operations_module.json index 0f6f008d..5ce54ecb 100644 --- a/src/main/resources/data/oc2/recipes/block_operations_module.json +++ b/src/main/resources/data/oc2r/recipes/block_operations_module.json @@ -6,7 +6,7 @@ ], "key": { "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "P": { "item": "minecraft:diamond_pickaxe" @@ -15,10 +15,10 @@ "tag": "forge:ingots/gold" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:block_operations_module" + "item": "oc2r:block_operations_module" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/bus_cable.json b/src/main/resources/data/oc2r/recipes/bus_cable.json similarity index 80% rename from src/main/resources/data/oc2/recipes/bus_cable.json rename to src/main/resources/data/oc2r/recipes/bus_cable.json index 20b93005..0ec0a6f7 100644 --- a/src/main/resources/data/oc2/recipes/bus_cable.json +++ b/src/main/resources/data/oc2r/recipes/bus_cable.json @@ -13,11 +13,11 @@ "tag": "forge:ingots/gold" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" } }, "result": { - "item": "oc2:bus_cable", + "item": "oc2r:bus_cable", "count": 16 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/bus_interface.json b/src/main/resources/data/oc2r/recipes/bus_interface.json similarity index 53% rename from src/main/resources/data/oc2/recipes/bus_interface.json rename to src/main/resources/data/oc2r/recipes/bus_interface.json index 42b76523..f9516f36 100644 --- a/src/main/resources/data/oc2/recipes/bus_interface.json +++ b/src/main/resources/data/oc2r/recipes/bus_interface.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, { - "item": "oc2:bus_cable" + "item": "oc2r:bus_cable" } ], "result": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/charger.json b/src/main/resources/data/oc2r/recipes/charger.json similarity index 78% rename from src/main/resources/data/oc2/recipes/charger.json rename to src/main/resources/data/oc2r/recipes/charger.json index 4edc9706..4665cd53 100644 --- a/src/main/resources/data/oc2/recipes/charger.json +++ b/src/main/resources/data/oc2r/recipes/charger.json @@ -13,16 +13,16 @@ "item": "minecraft:light_weighted_pressure_plate" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "R": { "tag": "forge:storage_blocks/redstone" } }, "result": { - "item": "oc2:charger" + "item": "oc2r:charger" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/circuit_board.json b/src/main/resources/data/oc2r/recipes/circuit_board.json similarity index 75% rename from src/main/resources/data/oc2/recipes/circuit_board.json rename to src/main/resources/data/oc2r/recipes/circuit_board.json index 28bd16fa..2833e2a7 100644 --- a/src/main/resources/data/oc2/recipes/circuit_board.json +++ b/src/main/resources/data/oc2r/recipes/circuit_board.json @@ -8,11 +8,11 @@ "item": "minecraft:clay_ball" }, { - "item": "oc2:transistor" + "item": "oc2r:transistor" } ], "result": { - "item": "oc2:circuit_board", + "item": "oc2r:circuit_board", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/computer.json b/src/main/resources/data/oc2r/recipes/computer.json similarity index 67% rename from src/main/resources/data/oc2/recipes/computer.json rename to src/main/resources/data/oc2r/recipes/computer.json index a3637e62..a3b96a9b 100644 --- a/src/main/resources/data/oc2/recipes/computer.json +++ b/src/main/resources/data/oc2r/recipes/computer.json @@ -13,26 +13,26 @@ "tag": "forge:chests/wooden" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:computer", + "item": "oc2r:computer", "nbt": { "BlockEntityTag": { "items": { - "translation{key='gui.oc2.device_type.flash_memory', args=[]}": { + "translation{key='gui.oc2r.device_type.flash_memory', args=[]}": { "Items": [ { "Slot": 0, "Count": 1, - "id": "oc2:flash_memory_custom" + "id": "oc2r:flash_memory_custom" } ], "Size": 1 diff --git a/src/main/resources/data/oc2/recipes/disk_drive.json b/src/main/resources/data/oc2r/recipes/disk_drive.json similarity index 71% rename from src/main/resources/data/oc2/recipes/disk_drive.json rename to src/main/resources/data/oc2r/recipes/disk_drive.json index d9549442..09b18b33 100644 --- a/src/main/resources/data/oc2/recipes/disk_drive.json +++ b/src/main/resources/data/oc2r/recipes/disk_drive.json @@ -13,19 +13,19 @@ "tag": "minecraft:buttons" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "D": { "item": "minecraft:dispenser" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:disk_drive" + "item": "oc2r:disk_drive" } } diff --git a/src/main/resources/data/oc2/recipes/file_import_export_card.json b/src/main/resources/data/oc2r/recipes/file_import_export_card.json similarity index 69% rename from src/main/resources/data/oc2/recipes/file_import_export_card.json rename to src/main/resources/data/oc2r/recipes/file_import_export_card.json index fb36242d..c1b140fe 100644 --- a/src/main/resources/data/oc2/recipes/file_import_export_card.json +++ b/src/main/resources/data/oc2r/recipes/file_import_export_card.json @@ -12,13 +12,13 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:file_import_export_card" + "item": "oc2r:file_import_export_card" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/flash_memory.json b/src/main/resources/data/oc2r/recipes/flash_memory.json similarity index 71% rename from src/main/resources/data/oc2/recipes/flash_memory.json rename to src/main/resources/data/oc2r/recipes/flash_memory.json index 15597dc6..0d894848 100644 --- a/src/main/resources/data/oc2/recipes/flash_memory.json +++ b/src/main/resources/data/oc2r/recipes/flash_memory.json @@ -9,16 +9,16 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "R": { "tag": "forge:dusts/redstone" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:flash_memory" + "item": "oc2r:flash_memory" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2r/recipes/flash_memory_custom.json b/src/main/resources/data/oc2r/recipes/flash_memory_custom.json new file mode 100644 index 00000000..9b34456c --- /dev/null +++ b/src/main/resources/data/oc2r/recipes/flash_memory_custom.json @@ -0,0 +1,14 @@ +{ + "type": "oc2r:wrench", + "ingredients": [ + { + "item": "oc2r:wrench" + }, + { + "item": "oc2r:flash_memory" + } + ], + "result": { + "item": "oc2r:flash_memory_custom" + } +} diff --git a/src/main/resources/data/oc2/recipes/flash_memory_flasher.json b/src/main/resources/data/oc2r/recipes/flash_memory_flasher.json similarity index 70% rename from src/main/resources/data/oc2/recipes/flash_memory_flasher.json rename to src/main/resources/data/oc2r/recipes/flash_memory_flasher.json index 896d065e..c1898d41 100644 --- a/src/main/resources/data/oc2/recipes/flash_memory_flasher.json +++ b/src/main/resources/data/oc2r/recipes/flash_memory_flasher.json @@ -13,19 +13,19 @@ "tag": "minecraft:buttons" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "D": { "item": "minecraft:dropper" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:flash_memory_flasher" + "item": "oc2r:flash_memory_flasher" } } diff --git a/src/main/resources/data/oc2/recipes/floppy.json b/src/main/resources/data/oc2r/recipes/floppy.json similarity index 72% rename from src/main/resources/data/oc2/recipes/floppy.json rename to src/main/resources/data/oc2r/recipes/floppy.json index 2cedb8ef..d1a3e384 100644 --- a/src/main/resources/data/oc2/recipes/floppy.json +++ b/src/main/resources/data/oc2r/recipes/floppy.json @@ -9,16 +9,16 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "Q": { "tag": "forge:gems/quartz" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:floppy" + "item": "oc2r:floppy" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/floppy_modern.json b/src/main/resources/data/oc2r/recipes/floppy_modern.json similarity index 72% rename from src/main/resources/data/oc2/recipes/floppy_modern.json rename to src/main/resources/data/oc2r/recipes/floppy_modern.json index 65343e20..715bc81b 100644 --- a/src/main/resources/data/oc2/recipes/floppy_modern.json +++ b/src/main/resources/data/oc2r/recipes/floppy_modern.json @@ -10,16 +10,16 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "Q": { "tag": "forge:gems/quartz" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:floppy_modern" + "item": "oc2r:floppy_modern" } } diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_custom.json b/src/main/resources/data/oc2r/recipes/hard_drive_custom.json new file mode 100644 index 00000000..77bca18b --- /dev/null +++ b/src/main/resources/data/oc2r/recipes/hard_drive_custom.json @@ -0,0 +1,14 @@ +{ + "type": "oc2r:wrench", + "ingredients": [ + { + "item": "oc2r:wrench" + }, + { + "item": "oc2r:hard_drive_large" + } + ], + "result": { + "item": "oc2r:hard_drive_custom" + } +} diff --git a/src/main/resources/data/oc2/recipes/hard_drive_extra_large.json b/src/main/resources/data/oc2r/recipes/hard_drive_extra_large.json similarity index 71% rename from src/main/resources/data/oc2/recipes/hard_drive_extra_large.json rename to src/main/resources/data/oc2r/recipes/hard_drive_extra_large.json index 4b37f468..a881a42a 100644 --- a/src/main/resources/data/oc2/recipes/hard_drive_extra_large.json +++ b/src/main/resources/data/oc2r/recipes/hard_drive_extra_large.json @@ -10,16 +10,16 @@ "tag": "forge:gems/diamond" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2:hard_drive_extra_large" + "item": "oc2r:hard_drive_extra_large" } } diff --git a/src/main/resources/data/oc2/recipes/hard_drive_large.json b/src/main/resources/data/oc2r/recipes/hard_drive_large.json similarity index 70% rename from src/main/resources/data/oc2/recipes/hard_drive_large.json rename to src/main/resources/data/oc2r/recipes/hard_drive_large.json index 9a96e43e..42025d78 100644 --- a/src/main/resources/data/oc2/recipes/hard_drive_large.json +++ b/src/main/resources/data/oc2r/recipes/hard_drive_large.json @@ -9,16 +9,16 @@ "tag": "forge:gems/diamond" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2:hard_drive_large" + "item": "oc2r:hard_drive_large" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/hard_drive_medium.json b/src/main/resources/data/oc2r/recipes/hard_drive_medium.json similarity index 70% rename from src/main/resources/data/oc2/recipes/hard_drive_medium.json rename to src/main/resources/data/oc2r/recipes/hard_drive_medium.json index 4fb2ea3d..77977c79 100644 --- a/src/main/resources/data/oc2/recipes/hard_drive_medium.json +++ b/src/main/resources/data/oc2r/recipes/hard_drive_medium.json @@ -9,16 +9,16 @@ "tag": "forge:ingots/gold" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2:hard_drive_medium" + "item": "oc2r:hard_drive_medium" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/hard_drive_small.json b/src/main/resources/data/oc2r/recipes/hard_drive_small.json similarity index 70% rename from src/main/resources/data/oc2/recipes/hard_drive_small.json rename to src/main/resources/data/oc2r/recipes/hard_drive_small.json index 32707d4e..6cebe302 100644 --- a/src/main/resources/data/oc2/recipes/hard_drive_small.json +++ b/src/main/resources/data/oc2r/recipes/hard_drive_small.json @@ -9,16 +9,16 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2:hard_drive_small" + "item": "oc2r:hard_drive_small" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/inventory_operations_module.json b/src/main/resources/data/oc2r/recipes/inventory_operations_module.json similarity index 68% rename from src/main/resources/data/oc2/recipes/inventory_operations_module.json rename to src/main/resources/data/oc2r/recipes/inventory_operations_module.json index a6d77b50..642eed34 100644 --- a/src/main/resources/data/oc2/recipes/inventory_operations_module.json +++ b/src/main/resources/data/oc2r/recipes/inventory_operations_module.json @@ -6,7 +6,7 @@ ], "key": { "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "C": { "tag": "forge:chests/wooden" @@ -15,10 +15,10 @@ "tag": "forge:ingots/gold" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:inventory_operations_module" + "item": "oc2r:inventory_operations_module" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/keyboard.json b/src/main/resources/data/oc2r/recipes/keyboard.json similarity index 68% rename from src/main/resources/data/oc2/recipes/keyboard.json rename to src/main/resources/data/oc2r/recipes/keyboard.json index 15727e17..290fdbf9 100644 --- a/src/main/resources/data/oc2/recipes/keyboard.json +++ b/src/main/resources/data/oc2r/recipes/keyboard.json @@ -13,16 +13,16 @@ "tag": "minecraft:buttons" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:keyboard" + "item": "oc2r:keyboard" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/manual.json b/src/main/resources/data/oc2r/recipes/manual.json similarity index 55% rename from src/main/resources/data/oc2/recipes/manual.json rename to src/main/resources/data/oc2r/recipes/manual.json index 26008edb..e5bca1f0 100644 --- a/src/main/resources/data/oc2/recipes/manual.json +++ b/src/main/resources/data/oc2r/recipes/manual.json @@ -1,14 +1,14 @@ { - "type": "oc2:wrench", + "type": "oc2r:wrench", "ingredients": [ { - "item": "oc2:wrench" + "item": "oc2r:wrench" }, { "item": "minecraft:book" } ], "result": { - "item": "oc2:manual" + "item": "oc2r:manual" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/memory_extra_large.json b/src/main/resources/data/oc2r/recipes/memory_extra_large.json similarity index 72% rename from src/main/resources/data/oc2/recipes/memory_extra_large.json rename to src/main/resources/data/oc2r/recipes/memory_extra_large.json index d1dbd6ec..00ed5000 100644 --- a/src/main/resources/data/oc2/recipes/memory_extra_large.json +++ b/src/main/resources/data/oc2r/recipes/memory_extra_large.json @@ -10,17 +10,17 @@ "tag": "forge:gems/diamond" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2:memory_extra_large", + "item": "oc2r:memory_extra_large", "count": 2 } } diff --git a/src/main/resources/data/oc2/recipes/memory_large.json b/src/main/resources/data/oc2r/recipes/memory_large.json similarity index 68% rename from src/main/resources/data/oc2/recipes/memory_large.json rename to src/main/resources/data/oc2r/recipes/memory_large.json index ce9f7a5c..77861f46 100644 --- a/src/main/resources/data/oc2/recipes/memory_large.json +++ b/src/main/resources/data/oc2r/recipes/memory_large.json @@ -9,14 +9,14 @@ "tag": "forge:gems/diamond" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:memory_large", + "item": "oc2r:memory_large", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/memory_medium.json b/src/main/resources/data/oc2r/recipes/memory_medium.json similarity index 67% rename from src/main/resources/data/oc2/recipes/memory_medium.json rename to src/main/resources/data/oc2r/recipes/memory_medium.json index ffdce01a..f90b62ca 100644 --- a/src/main/resources/data/oc2/recipes/memory_medium.json +++ b/src/main/resources/data/oc2r/recipes/memory_medium.json @@ -9,14 +9,14 @@ "tag": "forge:ingots/gold" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:memory_medium", + "item": "oc2r:memory_medium", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/memory_small.json b/src/main/resources/data/oc2r/recipes/memory_small.json similarity index 68% rename from src/main/resources/data/oc2/recipes/memory_small.json rename to src/main/resources/data/oc2r/recipes/memory_small.json index a61bfe2c..f24196da 100644 --- a/src/main/resources/data/oc2/recipes/memory_small.json +++ b/src/main/resources/data/oc2r/recipes/memory_small.json @@ -9,14 +9,14 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:memory_small", + "item": "oc2r:memory_small", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/network_cable.json b/src/main/resources/data/oc2r/recipes/network_cable.json similarity index 78% rename from src/main/resources/data/oc2/recipes/network_cable.json rename to src/main/resources/data/oc2r/recipes/network_cable.json index 0e055728..f4ec5641 100644 --- a/src/main/resources/data/oc2/recipes/network_cable.json +++ b/src/main/resources/data/oc2r/recipes/network_cable.json @@ -13,11 +13,11 @@ "tag": "forge:glass" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" } }, "result": { - "item": "oc2:network_cable", + "item": "oc2r:network_cable", "count": 8 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/network_connector.json b/src/main/resources/data/oc2r/recipes/network_connector.json similarity index 77% rename from src/main/resources/data/oc2/recipes/network_connector.json rename to src/main/resources/data/oc2r/recipes/network_connector.json index ca133d31..13d8b8c8 100644 --- a/src/main/resources/data/oc2/recipes/network_connector.json +++ b/src/main/resources/data/oc2r/recipes/network_connector.json @@ -12,11 +12,11 @@ "tag": "forge:glass" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" } }, "result": { - "item": "oc2:network_connector", + "item": "oc2r:network_connector", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/network_hub.json b/src/main/resources/data/oc2r/recipes/network_hub.json similarity index 58% rename from src/main/resources/data/oc2/recipes/network_hub.json rename to src/main/resources/data/oc2r/recipes/network_hub.json index 28ba8547..209eeff2 100644 --- a/src/main/resources/data/oc2/recipes/network_hub.json +++ b/src/main/resources/data/oc2r/recipes/network_hub.json @@ -10,19 +10,19 @@ "tag": "forge:ingots/iron" }, "C": { - "item": "oc2:network_connector" + "item": "oc2r:network_connector" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:network_hub" + "item": "oc2r:network_hub" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/network_interface_card.json b/src/main/resources/data/oc2r/recipes/network_interface_card.json similarity index 68% rename from src/main/resources/data/oc2/recipes/network_interface_card.json rename to src/main/resources/data/oc2r/recipes/network_interface_card.json index 637656d4..241cda90 100644 --- a/src/main/resources/data/oc2/recipes/network_interface_card.json +++ b/src/main/resources/data/oc2r/recipes/network_interface_card.json @@ -12,13 +12,13 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:network_interface_card" + "item": "oc2r:network_interface_card" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/network_tunnel_card.json b/src/main/resources/data/oc2r/recipes/network_tunnel_card.json similarity index 70% rename from src/main/resources/data/oc2/recipes/network_tunnel_card.json rename to src/main/resources/data/oc2r/recipes/network_tunnel_card.json index 5b2e06bb..d31c8170 100644 --- a/src/main/resources/data/oc2/recipes/network_tunnel_card.json +++ b/src/main/resources/data/oc2r/recipes/network_tunnel_card.json @@ -12,13 +12,13 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:network_tunnel_card" + "item": "oc2r:network_tunnel_card" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/network_tunnel_module.json b/src/main/resources/data/oc2r/recipes/network_tunnel_module.json similarity index 69% rename from src/main/resources/data/oc2/recipes/network_tunnel_module.json rename to src/main/resources/data/oc2r/recipes/network_tunnel_module.json index 000cd142..13e6a819 100644 --- a/src/main/resources/data/oc2/recipes/network_tunnel_module.json +++ b/src/main/resources/data/oc2r/recipes/network_tunnel_module.json @@ -6,7 +6,7 @@ ], "key": { "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "E": { "tag": "forge:ender_pearls" @@ -15,10 +15,10 @@ "tag": "forge:ingots/gold" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:network_tunnel_module" + "item": "oc2r:network_tunnel_module" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/projector.json b/src/main/resources/data/oc2r/recipes/projector.json similarity index 71% rename from src/main/resources/data/oc2/recipes/projector.json rename to src/main/resources/data/oc2r/recipes/projector.json index 7a38f15a..64c05169 100644 --- a/src/main/resources/data/oc2/recipes/projector.json +++ b/src/main/resources/data/oc2r/recipes/projector.json @@ -16,16 +16,16 @@ "tag": "forge:gems/diamond" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:projector" + "item": "oc2r:projector" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/redstone_interface.json b/src/main/resources/data/oc2r/recipes/redstone_interface.json similarity index 66% rename from src/main/resources/data/oc2/recipes/redstone_interface.json rename to src/main/resources/data/oc2r/recipes/redstone_interface.json index b26e0ae3..1f205f7a 100644 --- a/src/main/resources/data/oc2/recipes/redstone_interface.json +++ b/src/main/resources/data/oc2r/recipes/redstone_interface.json @@ -13,16 +13,16 @@ "item": "minecraft:comparator" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "X": { - "item": "oc2:bus_interface" + "item": "oc2r:bus_interface" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:redstone_interface" + "item": "oc2r:redstone_interface" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/redstone_interface_card.json b/src/main/resources/data/oc2r/recipes/redstone_interface_card.json similarity index 69% rename from src/main/resources/data/oc2/recipes/redstone_interface_card.json rename to src/main/resources/data/oc2r/recipes/redstone_interface_card.json index a3aa5ad5..dcfb4b77 100644 --- a/src/main/resources/data/oc2/recipes/redstone_interface_card.json +++ b/src/main/resources/data/oc2r/recipes/redstone_interface_card.json @@ -12,13 +12,13 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:redstone_interface_card" + "item": "oc2r:redstone_interface_card" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/robot.json b/src/main/resources/data/oc2r/recipes/robot.json similarity index 69% rename from src/main/resources/data/oc2/recipes/robot.json rename to src/main/resources/data/oc2r/recipes/robot.json index f36e68a9..9ebc91ec 100644 --- a/src/main/resources/data/oc2/recipes/robot.json +++ b/src/main/resources/data/oc2r/recipes/robot.json @@ -16,23 +16,23 @@ "item": "minecraft:piston" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:robot", + "item": "oc2r:robot", "nbt": { - "oc2": { + "oc2r": { "items": { - "translation{key='gui.oc2.device_type.flash_memory', args=[]}": { + "translation{key='gui.oc2r.device_type.flash_memory', args=[]}": { "Items": [ { "Slot": 0, "Count": 1, - "id": "oc2:flash_memory_custom" + "id": "oc2r:flash_memory_custom" } ], "Size": 1 diff --git a/src/main/resources/data/oc2/recipes/sound_card.json b/src/main/resources/data/oc2r/recipes/sound_card.json similarity index 72% rename from src/main/resources/data/oc2/recipes/sound_card.json rename to src/main/resources/data/oc2r/recipes/sound_card.json index 6c632122..e2b7dce4 100644 --- a/src/main/resources/data/oc2/recipes/sound_card.json +++ b/src/main/resources/data/oc2r/recipes/sound_card.json @@ -12,13 +12,13 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" }, "B": { - "item": "oc2:circuit_board" + "item": "oc2r:circuit_board" } }, "result": { - "item": "oc2:sound_card" + "item": "oc2r:sound_card" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/transistor.json b/src/main/resources/data/oc2r/recipes/transistor.json similarity index 89% rename from src/main/resources/data/oc2/recipes/transistor.json rename to src/main/resources/data/oc2r/recipes/transistor.json index 5c2718e4..2ce9a859 100644 --- a/src/main/resources/data/oc2/recipes/transistor.json +++ b/src/main/resources/data/oc2r/recipes/transistor.json @@ -16,7 +16,7 @@ } }, "result": { - "item": "oc2:transistor", + "item": "oc2r:transistor", "count": 12 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/recipes/unflash.json b/src/main/resources/data/oc2r/recipes/unflash.json similarity index 57% rename from src/main/resources/data/oc2/recipes/unflash.json rename to src/main/resources/data/oc2r/recipes/unflash.json index 5c721a71..b6242eaa 100644 --- a/src/main/resources/data/oc2/recipes/unflash.json +++ b/src/main/resources/data/oc2r/recipes/unflash.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "oc2:flash_memory_custom" + "item": "oc2r:flash_memory_custom" } ], "result": { - "item": "oc2:flash_memory" + "item": "oc2r:flash_memory" } } diff --git a/src/main/resources/data/oc2/recipes/wrench.json b/src/main/resources/data/oc2r/recipes/wrench.json similarity index 76% rename from src/main/resources/data/oc2/recipes/wrench.json rename to src/main/resources/data/oc2r/recipes/wrench.json index 6aaae7c9..4f560be4 100644 --- a/src/main/resources/data/oc2/recipes/wrench.json +++ b/src/main/resources/data/oc2r/recipes/wrench.json @@ -10,10 +10,10 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2:transistor" + "item": "oc2r:transistor" } }, "result": { - "item": "oc2:wrench" + "item": "oc2r:wrench" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2/tags/blocks/cables.json b/src/main/resources/data/oc2r/tags/blocks/cables.json similarity index 63% rename from src/main/resources/data/oc2/tags/blocks/cables.json rename to src/main/resources/data/oc2r/tags/blocks/cables.json index cfd226b6..c2fda5e5 100644 --- a/src/main/resources/data/oc2/tags/blocks/cables.json +++ b/src/main/resources/data/oc2r/tags/blocks/cables.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "oc2:bus_cable" + "oc2r:bus_cable" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2r/tags/blocks/devices.json b/src/main/resources/data/oc2r/tags/blocks/devices.json new file mode 100644 index 00000000..fa8dbb43 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/blocks/devices.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "oc2r:computer", + "oc2r:redstone_interface", + "oc2r:disk_drive", + "oc2r:projector" + ] +} diff --git a/src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json b/src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json new file mode 100644 index 00000000..3df66895 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "oc2r:computer", + "oc2r:bus_cable", + "oc2r:network_connector", + "oc2r:network_hub", + "oc2r:redstone_interface", + "oc2r:disk_drive", + "oc2r:charger", + "oc2r:projector" + ] +} diff --git a/src/main/resources/data/oc2/tags/items/cables.json b/src/main/resources/data/oc2r/tags/items/cables.json similarity index 63% rename from src/main/resources/data/oc2/tags/items/cables.json rename to src/main/resources/data/oc2r/tags/items/cables.json index cfd226b6..c2fda5e5 100644 --- a/src/main/resources/data/oc2/tags/items/cables.json +++ b/src/main/resources/data/oc2r/tags/items/cables.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "oc2:bus_cable" + "oc2r:bus_cable" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json new file mode 100644 index 00000000..45c4bad5 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "oc2r:disk_drive", + "oc2r:flash_memory", + "oc2r:flash_memory_custom", + "oc2r:hard_drive_small", + "oc2r:hard_drive_medium", + "oc2r:hard_drive_large", + "oc2r:hard_drive_extra_large", + "oc2r:hard_drive_custom", + "oc2r:keyboard", + "oc2r:memory_small", + "oc2r:memory_medium", + "oc2r:memory_large", + "oc2r:memory_extra_large", + "oc2r:network_interface_card", + "oc2r:network_tunnel_card", + "oc2r:network_tunnel_module", + "oc2r:projector", + "oc2r:cpu_tier_1", + "oc2r:cpu_tier_2", + "oc2r:cpu_tier_3", + "oc2r:cpu_tier_4" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices.json b/src/main/resources/data/oc2r/tags/items/devices.json new file mode 100644 index 00000000..70b89ba1 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "oc2r:computer", + "oc2r:redstone_interface", + "oc2r:disk_drive", + "oc2r:projector", + "#oc2r:devices/memory", + "#oc2r:devices/hard_drive", + "#oc2r:devices/flash_memory", + "#oc2r:devices/card", + "#oc2r:devices/robot_module", + "#oc2r:devices/floppy", + "#oc2r:devices/cpu" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/card.json b/src/main/resources/data/oc2r/tags/items/devices/card.json new file mode 100644 index 00000000..6109ce21 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/card.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "oc2r:redstone_interface_card", + "oc2r:network_interface_card", + "oc2r:file_import_export_card", + "oc2r:sound_card", + "oc2r:network_tunnel_card" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/cpu.json b/src/main/resources/data/oc2r/tags/items/devices/cpu.json new file mode 100644 index 00000000..5282a5fc --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/cpu.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "oc2r:cpu_tier_1", + "oc2r:cpu_tier_2", + "oc2r:cpu_tier_3", + "oc2r:cpu_tier_4" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/flash_memory.json b/src/main/resources/data/oc2r/tags/items/devices/flash_memory.json new file mode 100644 index 00000000..4c672487 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/flash_memory.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "oc2r:flash_memory", + "oc2r:flash_memory_custom" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/floppy.json b/src/main/resources/data/oc2r/tags/items/devices/floppy.json new file mode 100644 index 00000000..efa9ca65 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/floppy.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "oc2r:floppy", + "oc2r:floppy_modern" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json new file mode 100644 index 00000000..b57141c5 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "oc2r:hard_drive_small", + "oc2r:hard_drive_medium", + "oc2r:hard_drive_large", + "oc2r:hard_drive_extra_large", + "oc2r:hard_drive_custom" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/memory.json b/src/main/resources/data/oc2r/tags/items/devices/memory.json new file mode 100644 index 00000000..928bd07b --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/memory.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "oc2r:memory_small", + "oc2r:memory_medium", + "oc2r:memory_large", + "oc2r:memory_extra_large" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json b/src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json new file mode 100644 index 00000000..ef155361 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "oc2r:network_tunnel_card", + "oc2r:network_tunnel_module" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/devices/robot_module.json b/src/main/resources/data/oc2r/tags/items/devices/robot_module.json new file mode 100644 index 00000000..0b184616 --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/devices/robot_module.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "oc2r:inventory_operations_module", + "oc2r:block_operations_module", + "oc2r:network_tunnel_module" + ] +} diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials.json b/src/main/resources/data/oc2r/tags/items/tool_materials.json new file mode 100644 index 00000000..7a9493ff --- /dev/null +++ b/src/main/resources/data/oc2r/tags/items/tool_materials.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#oc2r:tool_materials/wood", + "#oc2r:tool_materials/stone", + "#oc2r:tool_materials/iron", + "#oc2r:tool_materials/gold", + "#oc2r:tool_materials/diamond", + "#oc2r:tool_materials/netherite" + ] +} diff --git a/src/main/resources/data/oc2/tags/items/tool_materials/diamond.json b/src/main/resources/data/oc2r/tags/items/tool_materials/diamond.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/tool_materials/diamond.json rename to src/main/resources/data/oc2r/tags/items/tool_materials/diamond.json diff --git a/src/main/resources/data/oc2/tags/items/tool_materials/gold.json b/src/main/resources/data/oc2r/tags/items/tool_materials/gold.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/tool_materials/gold.json rename to src/main/resources/data/oc2r/tags/items/tool_materials/gold.json diff --git a/src/main/resources/data/oc2/tags/items/tool_materials/iron.json b/src/main/resources/data/oc2r/tags/items/tool_materials/iron.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/tool_materials/iron.json rename to src/main/resources/data/oc2r/tags/items/tool_materials/iron.json diff --git a/src/main/resources/data/oc2/tags/items/tool_materials/netherite.json b/src/main/resources/data/oc2r/tags/items/tool_materials/netherite.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/tool_materials/netherite.json rename to src/main/resources/data/oc2r/tags/items/tool_materials/netherite.json diff --git a/src/main/resources/data/oc2/tags/items/tool_materials/stone.json b/src/main/resources/data/oc2r/tags/items/tool_materials/stone.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/tool_materials/stone.json rename to src/main/resources/data/oc2r/tags/items/tool_materials/stone.json diff --git a/src/main/resources/data/oc2/tags/items/tool_materials/wood.json b/src/main/resources/data/oc2r/tags/items/tool_materials/wood.json similarity index 100% rename from src/main/resources/data/oc2/tags/items/tool_materials/wood.json rename to src/main/resources/data/oc2r/tags/items/tool_materials/wood.json diff --git a/src/main/resources/data/oc2/tags/items/wrenches.json b/src/main/resources/data/oc2r/tags/items/wrenches.json similarity index 66% rename from src/main/resources/data/oc2/tags/items/wrenches.json rename to src/main/resources/data/oc2r/tags/items/wrenches.json index 77b03008..d66e16de 100644 --- a/src/main/resources/data/oc2/tags/items/wrenches.json +++ b/src/main/resources/data/oc2r/tags/items/wrenches.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "oc2:wrench" + "oc2r:wrench" ] -} \ No newline at end of file +} diff --git a/src/main/resources/mixins.oc2.json b/src/main/resources/mixins.oc2r.json similarity index 76% rename from src/main/resources/mixins.oc2.json rename to src/main/resources/mixins.oc2r.json index 3e9d9541..4f3e97c2 100644 --- a/src/main/resources/mixins.oc2.json +++ b/src/main/resources/mixins.oc2r.json @@ -2,8 +2,8 @@ "minVersion": "0.8.5", "compatibilityLevel": "JAVA_17", "required": true, - "package": "li.cil.oc2.common.mixin", - "refmap": "mixins.oc2.refmap.json", + "package": "li.cil.oc2r.common.mixin", + "refmap": "mixins.oc2r.refmap.json", "mixins": [ "ServerChunkCacheMixin" ],