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

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

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

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

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

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

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

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

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

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

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

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

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

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

    *
  • * RPC devices are a high-level system for providing VMs with means of @@ -42,7 +42,7 @@ */ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus; +package li.cil.oc2.api.bus; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/capabilities/NetworkInterface.java b/src/main/java/li/cil/oc2r/api/capabilities/NetworkInterface.java index 6ad5dba1..a228ed95 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.capabilities; +package li.cil.oc2.api.capabilities; -import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2.api.bus.device.ItemDevice; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/api/capabilities/RedstoneEmitter.java b/src/main/java/li/cil/oc2r/api/capabilities/RedstoneEmitter.java index 51293231..1d50a2ac 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.capabilities; +package li.cil.oc2.api.capabilities; /** * This interface may be provided as a capability by item components to signal diff --git a/src/main/java/li/cil/oc2r/api/capabilities/Robot.java b/src/main/java/li/cil/oc2r/api/capabilities/Robot.java index 671af64b..248c443a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.capabilities; +package li.cil.oc2.api.capabilities; import net.minecraftforge.items.ItemStackHandler; diff --git a/src/main/java/li/cil/oc2r/api/capabilities/TerminalUserProvider.java b/src/main/java/li/cil/oc2r/api/capabilities/TerminalUserProvider.java index b6b3afa4..1e4ed50e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.capabilities; +package li.cil.oc2.api.capabilities; -import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.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/oc2r/api/capabilities/package-info.java b/src/main/java/li/cil/oc2r/api/capabilities/package-info.java index 4575d615..e6daf2d8 100644 --- a/src/main/java/li/cil/oc2r/api/capabilities/package-info.java +++ b/src/main/java/li/cil/oc2r/api/capabilities/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.capabilities; +package li.cil.oc2.api.capabilities; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/imc/RPCMethodParameterTypeAdapter.java b/src/main/java/li/cil/oc2r/api/imc/RPCMethodParameterTypeAdapter.java index d1344f7a..7af1d69d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.imc; +package li.cil.oc2.api.imc; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2r/api/imc/package-info.java b/src/main/java/li/cil/oc2r/api/imc/package-info.java index 20c0c7ba..b08fdc78 100644 --- a/src/main/java/li/cil/oc2r/api/imc/package-info.java +++ b/src/main/java/li/cil/oc2r/api/imc/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.imc; +package li.cil.oc2.api.imc; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/package-info.java b/src/main/java/li/cil/oc2r/api/package-info.java index eabd85b5..cd72a3a6 100644 --- a/src/main/java/li/cil/oc2r/api/package-info.java +++ b/src/main/java/li/cil/oc2r/api/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api; +package li.cil.oc2.api; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/util/Invalidatable.java b/src/main/java/li/cil/oc2r/api/util/Invalidatable.java index 8e3de7c5..83fe4cc1 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.util; +package li.cil.oc2.api.util; -import li.cil.oc2r.common.util.RunnableUtils; +import li.cil.oc2.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.oc2r.api.bus.device.Device}s. + * Wrapper for objects which may become invalid, such as {@link li.cil.oc2.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/oc2r/api/util/Registries.java b/src/main/java/li/cil/oc2r/api/util/Registries.java index d9e6faa9..3d01cdb0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.util; +package li.cil.oc2.api.util; -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 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 net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2r/api/util/RobotOperationSide.java b/src/main/java/li/cil/oc2r/api/util/RobotOperationSide.java index 5665a57b..b3a9694e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.util; +package li.cil.oc2.api.util; import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2r/api/util/Side.java b/src/main/java/li/cil/oc2r/api/util/Side.java index 04e3df09..baded973 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.api.util; +package li.cil.oc2.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.oc2r.api.bus.device.rpc.RPCDevice} APIs, + * It is intended to be used by {@link li.cil.oc2.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 index 6df16f55..2ee5b311 100644 --- a/src/main/java/li/cil/oc2r/api/util/package-info.java +++ b/src/main/java/li/cil/oc2r/api/util/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.util; +package li.cil.oc2.api.util; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/ClientSetup.java b/src/main/java/li/cil/oc2r/client/ClientSetup.java index 32808c13..d704d3c2 100644 --- a/src/main/java/li/cil/oc2r/client/ClientSetup.java +++ b/src/main/java/li/cil/oc2r/client/ClientSetup.java @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.client; +package li.cil.oc2.client; -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 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 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("oc2r:", ""), new BusCableModelLoader()); + event.register(Blocks.BUS_CABLE.getId().toString().replace("oc2:", ""), new BusCableModelLoader()); } @SubscribeEvent diff --git a/src/main/java/li/cil/oc2r/client/audio/LoopingBlockEntitySound.java b/src/main/java/li/cil/oc2r/client/audio/LoopingBlockEntitySound.java index 16d5f1e9..8cf84f4e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.audio; +package li.cil.oc2.client.audio; -import li.cil.oc2r.common.util.TickUtils; +import li.cil.oc2.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/oc2r/client/audio/LoopingSoundManager.java b/src/main/java/li/cil/oc2r/client/audio/LoopingSoundManager.java index dc57818c..d7e26f39 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.audio; +package li.cil.oc2.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 index 4f94272c..a58b4026 100644 --- a/src/main/java/li/cil/oc2r/client/audio/package-info.java +++ b/src/main/java/li/cil/oc2r/client/audio/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.audio; +package li.cil.oc2.client.audio; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractMachineInventoryScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractMachineInventoryScreen.java index 914ad6c7..e8814e5c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -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 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 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.oc2r.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2.common.util.TextFormatUtils.withFormat; @OnlyIn(Dist.CLIENT) public abstract class AbstractMachineInventoryScreen extends AbstractModContainerScreen { diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractMachineTerminalScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractMachineTerminalScreen.java index bf3c328d..e0a34b75 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.platform.InputConstants; -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 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 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.oc2r.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2.common.util.TextFormatUtils.withFormat; @OnlyIn(Dist.CLIENT) public abstract class AbstractMachineTerminalScreen extends AbstractModContainerScreen { diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractModContainerScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractModContainerScreen.java index e116abcd..a1763056 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractMonitorDisplayScreen.java b/src/main/java/li/cil/oc2r/client/gui/AbstractMonitorDisplayScreen.java index 6098671c..fa3ec14c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.platform.InputConstants; -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 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 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.oc2r.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2.common.util.TextFormatUtils.withFormat; @OnlyIn(Dist.CLIENT) public abstract class AbstractMonitorDisplayScreen extends AbstractModContainerScreen { diff --git a/src/main/java/li/cil/oc2r/client/gui/BusInterfaceScreen.java b/src/main/java/li/cil/oc2r/client/gui/BusInterfaceScreen.java index 14aff918..bc573753 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -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 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 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.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.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/oc2r/client/gui/ComputerContainerScreen.java b/src/main/java/li/cil/oc2r/client/gui/ComputerContainerScreen.java index faeff012..3fd92cad 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; -import li.cil.oc2r.common.container.ComputerInventoryContainer; +import li.cil.oc2.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/oc2r/client/gui/ComputerTerminalScreen.java b/src/main/java/li/cil/oc2r/client/gui/ComputerTerminalScreen.java index f77150e9..674cd1fc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; -import li.cil.oc2r.common.container.ComputerTerminalContainer; +import li.cil.oc2.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/oc2r/client/gui/FileChooserScreen.java b/src/main/java/li/cil/oc2r/client/gui/FileChooserScreen.java index 0b84ed32..fdef3221 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.vertex.Tesselator; import net.minecraft.ChatFormatting; @@ -25,7 +25,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Supplier; -import static li.cil.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.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/oc2r/client/gui/KeyCodeMapping.java b/src/main/java/li/cil/oc2r/client/gui/KeyCodeMapping.java index 8c41a1c9..ea820e9d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import it.unimi.dsi.fastutil.ints.Int2IntArrayMap; import li.cil.sedna.evdev.EvdevKeys; diff --git a/src/main/java/li/cil/oc2r/client/gui/KeyboardScreen.java b/src/main/java/li/cil/oc2r/client/gui/KeyboardScreen.java index a3ace960..a6a31fc0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; -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 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 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.oc2r.keyboard.close_info"); + private static final MutableComponent CLOSE_INFO = Component.translatable("gui.oc2.keyboard.close_info"); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2r/client/gui/MachineTerminalWidget.java b/src/main/java/li/cil/oc2r/client/gui/MachineTerminalWidget.java index cba87519..acba38f3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.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.oc2r.client.gui.terminal.TerminalInput; -import li.cil.oc2r.common.container.AbstractMachineTerminalContainer; -import li.cil.oc2r.common.vm.Terminal; +import li.cil.oc2.client.gui.terminal.TerminalInput; +import li.cil.oc2.common.container.AbstractMachineTerminalContainer; +import li.cil.oc2.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/oc2r/client/gui/MonitorDisplayScreen.java b/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayScreen.java index 466ea3ac..6a0c184b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; -import li.cil.oc2r.common.container.MonitorDisplayContainer; +import li.cil.oc2.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/oc2r/client/gui/MonitorDisplayWidget.java b/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayWidget.java index 824b01cc..8f9a785d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; -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 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 net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/li/cil/oc2r/client/gui/NetworkInterfaceCardScreen.java b/src/main/java/li/cil/oc2r/client/gui/NetworkInterfaceCardScreen.java index 40d22357..f13e7bad 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.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.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 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 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.oc2r.common.util.TranslationUtils.key; -import static li.cil.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.common.util.TranslationUtils.key; +import static li.cil.oc2.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/oc2r/client/gui/NetworkTunnelScreen.java b/src/main/java/li/cil/oc2r/client/gui/NetworkTunnelScreen.java index 39cd407e..999c5e45 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -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 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 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.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.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/oc2r/client/gui/RobotContainerScreen.java b/src/main/java/li/cil/oc2r/client/gui/RobotContainerScreen.java index 627074df..d795ef89 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import li.cil.oc2r.common.container.RobotInventoryContainer; +import li.cil.oc2.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/oc2r/client/gui/RobotTerminalScreen.java b/src/main/java/li/cil/oc2r/client/gui/RobotTerminalScreen.java index 81929784..1b83b7e7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; -import li.cil.oc2r.common.container.RobotTerminalContainer; +import li.cil.oc2.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/oc2r/client/gui/Sprites.java b/src/main/java/li/cil/oc2r/client/gui/Sprites.java index 9146b8f0..0e27f8f2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; -import li.cil.oc2r.client.gui.widget.Sprite; +import li.cil.oc2.client.gui.widget.Sprite; -import static li.cil.oc2r.client.gui.Textures.*; +import static li.cil.oc2.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/oc2r/client/gui/Textures.java b/src/main/java/li/cil/oc2r/client/gui/Textures.java index 74aa1af0..37629866 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui; +package li.cil.oc2.client.gui; -import li.cil.oc2r.client.gui.widget.Texture; +import li.cil.oc2.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 index 6b1a3df4..ec9bf592 100644 --- a/src/main/java/li/cil/oc2r/client/gui/package-info.java +++ b/src/main/java/li/cil/oc2r/client/gui/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.gui; +package li.cil.oc2.client.gui; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/gui/terminal/TerminalInput.java b/src/main/java/li/cil/oc2r/client/gui/terminal/TerminalInput.java index 3a114986..d3bf4797 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui.terminal; +package li.cil.oc2.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 index fbd8104e..6dc108fe 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.gui.terminal; +package li.cil.oc2.client.gui.terminal; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/gui/util/GuiUtils.java b/src/main/java/li/cil/oc2r/client/gui/util/GuiUtils.java index 7bedc876..b390f0f9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui.util; +package li.cil.oc2.client.gui.util; -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 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 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.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.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/oc2r/client/gui/util/package-info.java b/src/main/java/li/cil/oc2r/client/gui/util/package-info.java index a89452b5..811d7482 100644 --- a/src/main/java/li/cil/oc2r/client/gui/util/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.oc2r.client.gui.util; +package li.cil.oc2.client.gui.util; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/ImageButton.java b/src/main/java/li/cil/oc2r/client/gui/widget/ImageButton.java index 8d9a6437..5ab921f7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui.widget; +package li.cil.oc2.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.oc2r.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2.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/oc2r/client/gui/widget/Sprite.java b/src/main/java/li/cil/oc2r/client/gui/widget/Sprite.java index 093c0ea3..d0a5be6b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui.widget; +package li.cil.oc2.client.gui.widget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.util.Mth; diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/Texture.java b/src/main/java/li/cil/oc2r/client/gui/widget/Texture.java index fbe072b8..62bdb6b5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui.widget; +package li.cil.oc2.client.gui.widget; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.resources.ResourceLocation; public final class Texture { diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/ToggleImageButton.java b/src/main/java/li/cil/oc2r/client/gui/widget/ToggleImageButton.java index e9199cb7..67aa72b2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.gui.widget; +package li.cil.oc2.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 index 887b018f..6f146b0c 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.gui.widget; +package li.cil.oc2.client.gui.widget; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/item/CustomItemColors.java b/src/main/java/li/cil/oc2r/client/item/CustomItemColors.java index d1c4aa1e..6178db40 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.item; +package li.cil.oc2.client.item; -import li.cil.oc2r.common.item.Items; +import li.cil.oc2.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/oc2r/client/item/CustomItemModelProperties.java b/src/main/java/li/cil/oc2r/client/item/CustomItemModelProperties.java index c4f7fe29..db49879b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.item; +package li.cil.oc2.client.item; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.item.Items; +import li.cil.oc2.api.API; +import li.cil.oc2.common.item.Items; import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2r/client/item/package-info.java b/src/main/java/li/cil/oc2r/client/item/package-info.java index 9a562fbf..248854e6 100644 --- a/src/main/java/li/cil/oc2r/client/item/package-info.java +++ b/src/main/java/li/cil/oc2r/client/item/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.item; +package li.cil.oc2.client.item; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/manual/Manuals.java b/src/main/java/li/cil/oc2r/client/manual/Manuals.java index ee77e31e..b5f5c3da 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.manual; +package li.cil.oc2.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.oc2r.api.API; -import li.cil.oc2r.common.block.Blocks; -import li.cil.oc2r.common.item.Items; +import li.cil.oc2.api.API; +import li.cil.oc2.common.block.Blocks; +import li.cil.oc2.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/oc2r/client/manual/ModManualScreenStyle.java b/src/main/java/li/cil/oc2r/client/manual/ModManualScreenStyle.java index 4fbd9a6a..9d76f805 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.manual; +package li.cil.oc2.client.manual; import li.cil.manual.api.ManualScreenStyle; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/client/manual/ModManualStyle.java b/src/main/java/li/cil/oc2r/client/manual/ModManualStyle.java index 762837be..bee9ee3a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.manual; +package li.cil.oc2.client.manual; import li.cil.manual.api.ManualStyle; import li.cil.manual.api.render.FontRenderer; -import li.cil.oc2r.client.renderer.font.MonospaceFontRenderer; +import li.cil.oc2.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/oc2r/client/manual/package-info.java b/src/main/java/li/cil/oc2r/client/manual/package-info.java index 30ef96b3..bd104786 100644 --- a/src/main/java/li/cil/oc2r/client/manual/package-info.java +++ b/src/main/java/li/cil/oc2r/client/manual/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.manual; +package li.cil.oc2.client.manual; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/model/BusCableBakedModel.java b/src/main/java/li/cil/oc2r/client/model/BusCableBakedModel.java index 29c81604..099114cd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.model; +package li.cil.oc2.client.model; -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 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 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/oc2r/client/model/BusCableModel.java b/src/main/java/li/cil/oc2r/client/model/BusCableModel.java index 6cc2513d..d2f82a28 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.model; +package li.cil.oc2.client.model; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/client/model/BusCableModelLoader.java b/src/main/java/li/cil/oc2r/client/model/BusCableModelLoader.java index ef54cc47..6d5ce6e7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.model; +package li.cil.oc2.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 index 35c7fcea..4ab66041 100644 --- a/src/main/java/li/cil/oc2r/client/model/package-info.java +++ b/src/main/java/li/cil/oc2r/client/model/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.model; +package li.cil.oc2.client.model; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/package-info.java b/src/main/java/li/cil/oc2r/client/package-info.java index 4dee9b24..e90acf4d 100644 --- a/src/main/java/li/cil/oc2r/client/package-info.java +++ b/src/main/java/li/cil/oc2r/client/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client; +package li.cil.oc2.client; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/renderer/BusInterfaceNameRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/BusInterfaceNameRenderer.java index 1acbab6c..718613f9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer; +package li.cil.oc2.client.renderer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import org.joml.Matrix4f; -import li.cil.oc2r.common.block.BusCableBlock; -import li.cil.oc2r.common.blockentity.BusCableBlockEntity; -import li.cil.oc2r.common.integration.Wrenches; +import li.cil.oc2.common.block.BusCableBlock; +import li.cil.oc2.common.blockentity.BusCableBlockEntity; +import li.cil.oc2.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/oc2r/client/renderer/ModRenderType.java b/src/main/java/li/cil/oc2r/client/renderer/ModRenderType.java index 9b419bf9..2d1a86a2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer; +package li.cil.oc2.client.renderer; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/client/renderer/ModShaders.java b/src/main/java/li/cil/oc2r/client/renderer/ModShaders.java index e81a548a..bca42421 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer; +package li.cil.oc2.client.renderer; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import org.joml.Matrix4f; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/client/renderer/MonitorGUIRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java index bf58fca0..56ea2868 100644 --- a/src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java +++ b/src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java @@ -1,4 +1,4 @@ -package li.cil.oc2r.client.renderer; +package li.cil.oc2.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.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 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 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/oc2r/client/renderer/NetworkCableRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/NetworkCableRenderer.java index 651abb45..94f0f72e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer; +package li.cil.oc2.client.renderer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import li.cil.oc2r.common.util.Vec3Utils; +import li.cil.oc2.common.util.Vec3Utils; import org.joml.Matrix4f; import org.joml.Vector3f; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/client/renderer/ProjectorDepthRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/ProjectorDepthRenderer.java index ec308a98..59653d23 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer; +package li.cil.oc2.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.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 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 net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/ChargerRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ChargerRenderer.java index a285e9fe..ce58305d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.blockentity; +package li.cil.oc2.client.renderer.blockentity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import org.joml.Matrix4f; -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 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 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/ComputerRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ComputerRenderer.java index 169378fd..ed3f5a25 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.blockentity; +package li.cil.oc2.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.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 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 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/oc2r/client/renderer/blockentity/DiskDriveRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/DiskDriveRenderer.java index 278e8c08..9f92c0b8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.blockentity; +package li.cil.oc2.client.renderer.blockentity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.world.item.ItemDisplayContext; -import li.cil.oc2r.common.block.DiskDriveBlock; -import li.cil.oc2r.common.blockentity.DiskDriveBlockEntity; +import li.cil.oc2.common.block.DiskDriveBlock; +import li.cil.oc2.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/oc2r/client/renderer/blockentity/MonitorRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/MonitorRenderer.java index 21735342..930130c6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.blockentity; +package li.cil.oc2.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.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 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 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/oc2r/client/renderer/blockentity/ProjectorRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/blockentity/ProjectorRenderer.java index 63d335a4..ba702bd2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.blockentity; +package li.cil.oc2.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.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 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 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 index 01208e2e..f6447fba 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.renderer.blockentity; +package li.cil.oc2.client.renderer.blockentity; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/renderer/color/BusCableBlockColor.java b/src/main/java/li/cil/oc2r/client/renderer/color/BusCableBlockColor.java index c8911e1a..6744b96c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.color; +package li.cil.oc2.client.renderer.color; -import li.cil.oc2r.common.blockentity.BusCableBlockEntity; -import li.cil.oc2r.common.util.ItemStackUtils; +import li.cil.oc2.common.blockentity.BusCableBlockEntity; +import li.cil.oc2.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 index a973df53..b08b3562 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.renderer.color; +package li.cil.oc2.client.renderer.color; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/RobotRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/entity/RobotRenderer.java index b81b25f1..0fe9d41e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.entity; +package li.cil.oc2.client.renderer.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; -import li.cil.oc2r.client.renderer.entity.model.RobotModel; -import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2.client.renderer.entity.model.RobotModel; +import li.cil.oc2.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/oc2r/client/renderer/entity/RobotWithoutLevelRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/entity/RobotWithoutLevelRenderer.java index 1afd6cd8..a23e7a9c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.entity; +package li.cil.oc2.client.renderer.entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import li.cil.oc2r.client.renderer.entity.model.RobotModel; +import li.cil.oc2.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/oc2r/client/renderer/entity/model/RobotModel.java b/src/main/java/li/cil/oc2r/client/renderer/entity/model/RobotModel.java index 9def9ee1..20606be5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.entity.model; +package li.cil.oc2.client.renderer.entity.model; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2.api.API; +import li.cil.oc2.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 index de77c76b..a5c06b5e 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.renderer.entity.model; +package li.cil.oc2.client.renderer.entity.model; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/entity/package-info.java index ef080e9c..b313dc7f 100644 --- a/src/main/java/li/cil/oc2r/client/renderer/entity/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.oc2r.client.renderer.entity; +package li.cil.oc2.client.renderer.entity; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/client/renderer/font/MonospaceFontRenderer.java b/src/main/java/li/cil/oc2r/client/renderer/font/MonospaceFontRenderer.java index 1e5fc6a0..cd24a499 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.client.renderer.font; +package li.cil.oc2.client.renderer.font; import li.cil.manual.api.prefab.renderer.BitmapFontRenderer; import li.cil.manual.api.render.FontRenderer; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.resources.ResourceLocation; public final class MonospaceFontRenderer extends BitmapFontRenderer { diff --git a/src/main/java/li/cil/oc2r/client/renderer/font/package-info.java b/src/main/java/li/cil/oc2r/client/renderer/font/package-info.java index a80ad457..dd9ccdf3 100644 --- a/src/main/java/li/cil/oc2r/client/renderer/font/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.oc2r.client.renderer.font; +package li.cil.oc2.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 index 23fa4d53..b523eaeb 100644 --- a/src/main/java/li/cil/oc2r/client/renderer/package-info.java +++ b/src/main/java/li/cil/oc2r/client/renderer/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.client.renderer; +package li.cil.oc2.client.renderer; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/CommonSetup.java b/src/main/java/li/cil/oc2r/common/CommonSetup.java index 85d65e35..c59ab991 100644 --- a/src/main/java/li/cil/oc2r/common/CommonSetup.java +++ b/src/main/java/li/cil/oc2r/common/CommonSetup.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common; +package li.cil.oc2.common; -import li.cil.oc2r.common.bus.device.rpc.RPCMethodParameterTypeAdapters; -import li.cil.oc2r.common.integration.IMC; -import li.cil.oc2r.common.integration.Integrations; -import li.cil.oc2r.common.network.Network; -import li.cil.oc2r.common.util.ServerScheduler; -import li.cil.oc2r.common.vxlan.TunnelManager; +import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; +import li.cil.oc2.common.integration.IMC; +import li.cil.oc2.common.integration.Integrations; +import li.cil.oc2.common.network.Network; +import li.cil.oc2.common.util.ServerScheduler; +import li.cil.oc2.common.vxlan.TunnelManager; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; diff --git a/src/main/java/li/cil/oc2r/common/Config.java b/src/main/java/li/cil/oc2r/common/Config.java index aaeb8936..44f78ca3 100644 --- a/src/main/java/li/cil/oc2r/common/Config.java +++ b/src/main/java/li/cil/oc2r/common/Config.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common; +package li.cil.oc2.common; -import li.cil.oc2r.common.ConfigManager.Path; +import li.cil.oc2.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/oc2r/common/ConfigManager.java b/src/main/java/li/cil/oc2r/common/ConfigManager.java index 68361c90..8c31a184 100644 --- a/src/main/java/li/cil/oc2r/common/ConfigManager.java +++ b/src/main/java/li/cil/oc2r/common/ConfigManager.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common; +package li.cil.oc2.common; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/Constants.java b/src/main/java/li/cil/oc2r/common/Constants.java index c0adf980..b4fcdeec 100644 --- a/src/main/java/li/cil/oc2r/common/Constants.java +++ b/src/main/java/li/cil/oc2r/common/Constants.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common; +package li.cil.oc2.common; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.core.Direction; -import static li.cil.oc2r.common.util.TranslationUtils.key; +import static li.cil.oc2.common.util.TranslationUtils.key; public final class Constants { public static final int KILOBYTE = 1024; diff --git a/src/main/java/li/cil/oc2r/common/Main.java b/src/main/java/li/cil/oc2r/common/Main.java index 8c40f603..b2358e63 100644 --- a/src/main/java/li/cil/oc2r/common/Main.java +++ b/src/main/java/li/cil/oc2r/common/Main.java @@ -1,29 +1,29 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common; +package li.cil.oc2.common; import dev.architectury.platform.forge.EventBuses; import li.cil.ceres.Ceres; -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.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.sedna.Sedna; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; diff --git a/src/main/java/li/cil/oc2r/common/block/Blocks.java b/src/main/java/li/cil/oc2r/common/block/Blocks.java index 02911df1..c721ec16 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2r/common/block/BusCableBlock.java index 9dc15e2d..da66b5fe 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; import com.google.common.collect.Maps; -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 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 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.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.common.util.TranslationUtils.text; public final class BusCableBlock extends BaseEntityBlock { public enum ConnectionType implements StringRepresentable { diff --git a/src/main/java/li/cil/oc2r/common/block/ChargerBlock.java b/src/main/java/li/cil/oc2r/common/block/ChargerBlock.java index a961949f..a0c34bd0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.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/oc2r/common/block/ComputerBlock.java b/src/main/java/li/cil/oc2r/common/block/ComputerBlock.java index 7e8dd706..6b72374d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -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 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 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.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; +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; 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/oc2r/common/block/CreativeEnergyBlock.java b/src/main/java/li/cil/oc2r/common/block/CreativeEnergyBlock.java index c02a250b..e3b12da7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.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/oc2r/common/block/DiskDriveBlock.java b/src/main/java/li/cil/oc2r/common/block/DiskDriveBlock.java index 9217eb7d..dd184f87 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.DiskDriveBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.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/oc2r/common/block/EnergyConsumingBlock.java b/src/main/java/li/cil/oc2r/common/block/EnergyConsumingBlock.java index e995187e..5580826f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; public interface EnergyConsumingBlock { int getEnergyConsumption(); diff --git a/src/main/java/li/cil/oc2r/common/block/FlashMemoryFlasherBlock.java b/src/main/java/li/cil/oc2r/common/block/FlashMemoryFlasherBlock.java index cad1735f..0475ad83 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.FlashMemoryFlasherBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.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/oc2r/common/block/ImmutableHorizontalBlock.java b/src/main/java/li/cil/oc2r/common/block/ImmutableHorizontalBlock.java index 837931b2..a845818b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.Mirror; diff --git a/src/main/java/li/cil/oc2r/common/block/KeyboardBlock.java b/src/main/java/li/cil/oc2r/common/block/KeyboardBlock.java index 82570fc1..7c6675e7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -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 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 net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2r/common/block/MonitorBlock.java b/src/main/java/li/cil/oc2r/common/block/MonitorBlock.java index beeb7827..7e7953de 100644 --- a/src/main/java/li/cil/oc2r/common/block/MonitorBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/MonitorBlock.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common.block; +package li.cil.oc2.common.block; -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.VoxelShapeUtils; +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.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/oc2r/common/block/NetworkConnectorBlock.java b/src/main/java/li/cil/oc2r/common/block/NetworkConnectorBlock.java index 7f8443fb..d8df4ca3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity; -import li.cil.oc2r.common.blockentity.TickableBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; +import li.cil.oc2.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/oc2r/common/block/NetworkHubBlock.java b/src/main/java/li/cil/oc2r/common/block/NetworkHubBlock.java index 4e3a23d8..3f82a34e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.NetworkHubBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.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/oc2r/common/block/NetworkSwitchBlock.java b/src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java index 7b8b79a2..079159d4 100644 --- a/src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java @@ -1,7 +1,7 @@ -package li.cil.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.NetworkHubBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.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/oc2r/common/block/PciCardCageBlock.java b/src/main/java/li/cil/oc2r/common/block/PciCardCageBlock.java index f17f324d..ea0c6670 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -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 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 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/ProjectorBlock.java b/src/main/java/li/cil/oc2r/common/block/ProjectorBlock.java index 0fb32272..adc1d1ee 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -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 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 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/RedstoneInterfaceBlock.java b/src/main/java/li/cil/oc2r/common/block/RedstoneInterfaceBlock.java index b8de56da..41b0fd1f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.RedstoneInterfaceBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.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/oc2r/common/block/VxlanBlock.java b/src/main/java/li/cil/oc2r/common/block/VxlanBlock.java index 45123faf..d8854498 100644 --- a/src/main/java/li/cil/oc2r/common/block/VxlanBlock.java +++ b/src/main/java/li/cil/oc2r/common/block/VxlanBlock.java @@ -1,8 +1,8 @@ -package li.cil.oc2r.common.block; +package li.cil.oc2.common.block; -import li.cil.oc2r.common.blockentity.BlockEntities; -import li.cil.oc2r.common.blockentity.TickableBlockEntity; -import li.cil.oc2r.common.blockentity.VxlanBlockEntity; +import li.cil.oc2.common.blockentity.BlockEntities; +import li.cil.oc2.common.blockentity.TickableBlockEntity; +import li.cil.oc2.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 index 6df364fa..b2e6d494 100644 --- a/src/main/java/li/cil/oc2r/common/block/package-info.java +++ b/src/main/java/li/cil/oc2r/common/block/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.block; +package li.cil.oc2.common.block; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/blockentity/BlockEntities.java b/src/main/java/li/cil/oc2r/common/blockentity/BlockEntities.java index ac617828..9f187177 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/blockentity/BusCableBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/BusCableBlockEntity.java index 8a569907..03112f73 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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.oc2r.client.model.BusCableBakedModel.*; +import static li.cil.oc2.client.model.BusCableBakedModel.*; public final class BusCableBlockEntity extends ModBlockEntity { public enum FacadeType { diff --git a/src/main/java/li/cil/oc2r/common/blockentity/ChargerBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ChargerBlockEntity.java index 3c974705..2f583e72 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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/ComputerBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ComputerBlockEntity.java index ec1effeb..8de996f6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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.oc2r.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; -import static li.cil.oc2r.common.Constants.ITEMS_TAG_NAME; +import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; +import static li.cil.oc2.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/oc2r/common/blockentity/CreativeEnergyBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/CreativeEnergyBlockEntity.java index a8774ce8..f3a54e15 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2.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/oc2r/common/blockentity/DiskDriveBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java index b2eb63e0..bfe4418f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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/FlashMemoryFlasherBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/FlashMemoryFlasherBlockEntity.java index e6556170..5e8cdfa0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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/KeyboardBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/KeyboardBlockEntity.java index 4cf2004b..3bdebe25 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -import li.cil.oc2r.common.bus.device.vm.block.KeyboardDevice; -import li.cil.oc2r.common.capabilities.Capabilities; +import li.cil.oc2.common.bus.device.vm.block.KeyboardDevice; +import li.cil.oc2.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/oc2r/common/blockentity/ModBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ModBlockEntity.java index ad1a44d4..a9f20045 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -import li.cil.oc2r.common.util.LazyOptionalUtils; -import li.cil.oc2r.common.util.ServerScheduler; +import li.cil.oc2.common.util.LazyOptionalUtils; +import li.cil.oc2.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/oc2r/common/blockentity/MonitorBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/MonitorBlockEntity.java index 35497064..9982eb1c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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.oc2r.common.bus.device.vm.block.MonitorDevice.HEIGHT; -import static li.cil.oc2r.common.bus.device.vm.block.MonitorDevice.WIDTH; +import static li.cil.oc2.common.bus.device.vm.block.MonitorDevice.HEIGHT; +import static li.cil.oc2.common.bus.device.vm.block.MonitorDevice.WIDTH; public final class MonitorBlockEntity extends ModBlockEntity implements TickableBlockEntity { @FunctionalInterface diff --git a/src/main/java/li/cil/oc2r/common/blockentity/NetworkConnectorBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/NetworkConnectorBlockEntity.java index d7f43c66..93ba7c98 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2r/common/blockentity/NetworkHubBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/NetworkHubBlockEntity.java index 3676f800..4e3f1e2a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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.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 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/oc2r/common/blockentity/NetworkSwitchBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java index 24b081a8..4e3e2175 100644 --- a/src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java @@ -1,18 +1,18 @@ -package li.cil.oc2r.common.blockentity; +package li.cil.oc2.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.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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.*; diff --git a/src/main/java/li/cil/oc2r/common/blockentity/PciCardCageBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/PciCardCageBlockEntity.java index 59494a46..3d9d8dbf 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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/ProjectorBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/ProjectorBlockEntity.java index 35a1d334..25c0ef9e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.SectionPos; diff --git a/src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java index 55140e75..45656392 100644 --- a/src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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.integration.util.BundledRedstone; -import li.cil.oc2r.common.util.HorizontalBlockUtils; +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.integration.util.BundledRedstone; +import li.cil.oc2.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/oc2r/common/blockentity/TickableBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/TickableBlockEntity.java index 21141d89..3841b0f3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -import li.cil.oc2r.common.util.BlockEntityUtils; +import li.cil.oc2.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/oc2r/common/blockentity/VxlanBlockEntity.java b/src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java index 8422e88e..bef7aac5 100644 --- a/src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java @@ -1,12 +1,12 @@ -package li.cil.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; -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 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 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 index 5fafa638..b2284550 100644 --- a/src/main/java/li/cil/oc2r/common/blockentity/package-info.java +++ b/src/main/java/li/cil/oc2r/common/blockentity/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.blockentity; +package li.cil.oc2.common.blockentity; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractBlockDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractBlockDeviceBusElement.java index cae6cab2..8a1b26ec 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus; +package li.cil.oc2.common.bus; -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 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 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.oc2r.common.util.RegistryUtils.optionalKey; +import static li.cil.oc2.common.util.RegistryUtils.optionalKey; public abstract class AbstractBlockDeviceBusElement extends AbstractGroupingDeviceBusElement implements BlockDeviceBusElement { public AbstractBlockDeviceBusElement() { diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractDeviceBusElement.java index b219d18e..7681d016 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus; +package li.cil.oc2.common.bus; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; -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.oc2.api.bus.DeviceBusController; +import li.cil.oc2.api.bus.DeviceBusElement; +import li.cil.oc2.api.bus.device.Device; import net.minecraftforge.common.util.LazyOptional; import java.util.*; diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractGroupingDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractGroupingDeviceBusElement.java index 1b77afa1..86be7a21 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus; +package li.cil.oc2.common.bus; -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.common.util.NBTTagIds; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractItemDeviceBusElement.java b/src/main/java/li/cil/oc2r/common/bus/AbstractItemDeviceBusElement.java index c500149d..5229b628 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus; +package li.cil.oc2.common.bus; -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 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 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.oc2r.common.util.RegistryUtils.optionalKey; +import static li.cil.oc2.common.util.RegistryUtils.optionalKey; public abstract class AbstractItemDeviceBusElement extends AbstractGroupingDeviceBusElement { public AbstractItemDeviceBusElement(final int groupCount) { diff --git a/src/main/java/li/cil/oc2r/common/bus/BlockDeviceBusController.java b/src/main/java/li/cil/oc2r/common/bus/BlockDeviceBusController.java index a13cdf83..9a6bfad4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus; +package li.cil.oc2.common.bus; -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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2r/common/bus/CommonDeviceBusController.java b/src/main/java/li/cil/oc2r/common/bus/CommonDeviceBusController.java index 006941c2..f1590fd3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus; +package li.cil.oc2.common.bus; -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 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 net.minecraftforge.common.util.LazyOptional; import java.time.Duration; diff --git a/src/main/java/li/cil/oc2r/common/bus/RPCDeviceBusAdapter.java b/src/main/java/li/cil/oc2r/common/bus/RPCDeviceBusAdapter.java index 880885ad..1ac8b717 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus; +package li.cil.oc2.common.bus; import com.google.gson.Gson; import com.google.gson.JsonArray; import li.cil.ceres.api.Serialized; -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.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.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 index 101ebc44..9d18d60e 100644 --- a/src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java @@ -1,6 +1,6 @@ -package li.cil.oc2r.common.bus.device; +package li.cil.oc2.common.bus.device; -import li.cil.oc2r.common.bus.AbstractDeviceBusElement; +import li.cil.oc2.common.bus.AbstractDeviceBusElement; public class BlockDeviceBusElement extends AbstractDeviceBusElement { diff --git a/src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java b/src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java index 57faa113..c985153c 100644 --- a/src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java @@ -1,7 +1,7 @@ -package li.cil.oc2r.common.bus.device; +package li.cil.oc2.common.bus.device; -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.common.bus.device.util.IdentityProxy; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.common.bus.device.util.IdentityProxy; import net.minecraft.world.level.block.entity.BlockEntity; import java.util.*; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2r/common/bus/device/DeviceTypes.java index a2c569a0..62985505 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device; +package li.cil.oc2.common.bus.device; -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 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 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.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.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/oc2r/common/bus/device/data/BlockDeviceDataRegistry.java b/src/main/java/li/cil/oc2r/common/bus/device/data/BlockDeviceDataRegistry.java index 1a02ab63..e1fecdc0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.data; +package li.cil.oc2.common.bus.device.data; -import li.cil.oc2r.api.API; -import li.cil.oc2r.api.bus.device.data.BlockDeviceData; -import li.cil.oc2r.api.util.Registries; +import li.cil.oc2.api.API; +import li.cil.oc2.api.bus.device.data.BlockDeviceData; +import li.cil.oc2.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/oc2r/common/bus/device/data/BuildrootBlockDeviceData.java b/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootBlockDeviceData.java index ee438465..1efbff26 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.data; +package li.cil.oc2.common.bus.device.data; -import li.cil.oc2r.api.bus.device.data.BlockDeviceData; +import li.cil.oc2.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/oc2r/common/bus/device/data/BuildrootFirmware.java b/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootFirmware.java index f4d9cff5..143e4553 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.data; +package li.cil.oc2.common.bus.device.data; -import li.cil.oc2r.api.bus.device.data.Firmware; +import li.cil.oc2.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/oc2r/common/bus/device/data/FileSystems.java b/src/main/java/li/cil/oc2r/common/bus/device/data/FileSystems.java index 9cb6f06a..fc05b9ee 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.data; +package li.cil.oc2.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.oc2r.api.API; -import li.cil.oc2r.api.bus.device.data.BlockDeviceData; -import li.cil.oc2r.common.vm.fs.LayeredFileSystem; +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.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.oc2r.common.util.TextFormatUtils.formatSize; +import static li.cil.oc2.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/oc2r/common/bus/device/data/FirmwareRegistry.java b/src/main/java/li/cil/oc2r/common/bus/device/data/FirmwareRegistry.java index 15f78665..893f3626 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.data; +package li.cil.oc2.common.bus.device.data; -import li.cil.oc2r.api.API; -import li.cil.oc2r.api.bus.device.data.Firmware; -import li.cil.oc2r.api.util.Registries; +import li.cil.oc2.api.API; +import li.cil.oc2.api.bus.device.data.Firmware; +import li.cil.oc2.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/oc2r/common/bus/device/data/ResourceBlockDeviceData.java b/src/main/java/li/cil/oc2r/common/bus/device/data/ResourceBlockDeviceData.java index f177b787..a84526e6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.data; +package li.cil.oc2.common.bus.device.data; -import li.cil.oc2r.api.bus.device.data.BlockDeviceData; +import li.cil.oc2.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 index ab514c86..14b9d74a 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.data; +package li.cil.oc2.common.bus.device.data; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 84a8a6e7..c6a315b1 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device; +package li.cil.oc2.common.bus.device; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/ProviderRegistry.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/ProviderRegistry.java index 16041138..547227f9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider; +package li.cil.oc2.common.bus.device.provider; -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 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 net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/Providers.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/Providers.java index 8c23b5e8..f253d68a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider; +package li.cil.oc2.common.bus.device.provider; -import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; -import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; import net.minecraftforge.registries.IForgeRegistry; import java.util.function.BiConsumer; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java index b433c5e2..a88254b4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.block; +package li.cil.oc2.common.bus.device.provider.block; -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 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 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 index aeb017c1..8a13946f 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.provider.block; +package li.cil.oc2.common.bus.device.provider.block; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java index 2f30949a..51451426 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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.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 net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java index d3d4c9f1..79c4a9a8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java index de96bea6..fbb1f766 100644 --- a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java @@ -1,13 +1,13 @@ -package li.cil.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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.rpc.item.CPUItemDevice; -import li.cil.oc2r.common.item.CPUItem; -import li.cil.oc2r.common.item.MemoryItem; +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.rpc.item.CPUItemDevice; +import li.cil.oc2.common.item.CPUItem; +import li.cil.oc2.common.item.MemoryItem; import net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java index 40d1843f..4c412dfe 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraftforge.energy.IEnergyStorage; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java index c98beee2..04018c5a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraftforge.common.util.LazyOptional; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java index 07a75b3b..1818b7c2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java index d073757c..583b6446 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java index 10d12f34..68700bdc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraftforge.fluids.capability.IFluidHandler; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveItemDeviceProvider.java index 7e842b9d..0d4dfad4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java index 281ff82f..c82919b4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java index 0799e74b..dad09f1b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java index 3707dc0d..32e72a48 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraftforge.items.IItemHandler; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java index 7ae76b4e..84c4981e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/MemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/MemoryItemDeviceProvider.java index 9e162980..9c1ac114 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 net.minecraft.world.item.ItemStack; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java index aa962d03..f89ef106 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java index 03ae94b3..381c0a01 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java index ad7319ce..49a770d6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java index eff3d9fa..c1d6811e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/SoundCardItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/item/SoundCardItemDeviceProvider.java index f6508bc8..aa079fed 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; -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 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 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 index 9b960759..093cd2f9 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.provider.item; +package li.cil.oc2.common.bus.device.provider.item; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 51ebc486..c16cf596 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.provider; +package li.cil.oc2.common.bus.device.provider; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockDeviceProvider.java index 61372eb9..442fbaef 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.util; +package li.cil.oc2.common.bus.device.provider.util; -import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; public abstract class AbstractBlockDeviceProvider implements BlockDeviceProvider { } diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java index 1fbc55e8..aadd6685 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.util; +package li.cil.oc2.common.bus.device.provider.util; -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 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 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/oc2r/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java index ce140895..92ab734e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.util; +package li.cil.oc2.common.bus.device.provider.util; -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.oc2.api.bus.device.Device; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.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/oc2r/common/bus/device/provider/util/AbstractItemDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractItemDeviceProvider.java index 4e1092b3..eadb2932 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.provider.util; +package li.cil.oc2.common.bus.device.provider.util; -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.oc2.api.bus.device.ItemDevice; +import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2.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 index 7eff3003..7bea9b40 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.provider.util; +package li.cil.oc2.common.bus.device.provider.util; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/EnergyStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/EnergyStorageDevice.java index c263df6e..b1c57ab8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; -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 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 net.minecraftforge.energy.IEnergyStorage; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/FluidHandlerDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/FluidHandlerDevice.java index 51e6384b..1c62f902 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; -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 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 net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/ItemHandlerDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/ItemHandlerDevice.java index 3fdbeb4a..5b2979e4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; -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 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 net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCDeviceList.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCDeviceList.java index da7ec89c..deb283f7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; -import li.cil.oc2r.api.bus.device.rpc.RPCMethodGroup; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup; import net.minecraft.nbt.CompoundTag; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilter.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilter.java index f648ca14..0543c662 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; -import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2.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/oc2r/common/bus/device/rpc/RPCItemStackTagFilters.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilters.java index 41e758fa..890becae 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java index bd178441..f3fbfe8d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; import com.google.gson.GsonBuilder; -import li.cil.oc2r.api.imc.RPCMethodParameterTypeAdapter; -import li.cil.oc2r.common.serialization.gson.DirectionJsonSerializer; -import li.cil.oc2r.common.serialization.gson.ItemStackJsonSerializer; +import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; +import li.cil.oc2.common.serialization.gson.DirectionJsonSerializer; +import li.cil.oc2.common.serialization.gson.ItemStackJsonSerializer; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/TypeNameRPCDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/TypeNameRPCDevice.java index b0b0a987..891e43f0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; -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 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 java.util.List; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java index c7aa858d..599690b7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.block; +package li.cil.oc2.common.bus.device.rpc.block; -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 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 net.minecraft.world.level.block.entity.BlockEntity; public final class BlockEntityObjectDeviceProvider extends AbstractBlockEntityDeviceProvider { diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java index 52752411..cbfc658d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.block; +package li.cil.oc2.common.bus.device.rpc.block; -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 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 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/oc2r/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java index ecace198..5b68a060 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.block; +package li.cil.oc2.common.bus.device.rpc.block; -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 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 net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.energy.IEnergyStorage; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java index 42f06bd3..a98de15d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.block; +package li.cil.oc2.common.bus.device.rpc.block; -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 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 net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java index dfc15d97..037b9b63 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.block; +package li.cil.oc2.common.bus.device.rpc.block; -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 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 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 index 740e932b..ab99897f 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.rpc.block; +package li.cil.oc2.common.bus.device.rpc.block; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/AbstractItemRPCDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/AbstractItemRPCDevice.java index f30dbbe3..967013bc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; -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 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 net.minecraft.world.item.ItemStack; import java.util.List; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/BlockOperationsModuleDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/BlockOperationsModuleDevice.java index 6430b8e4..d00cb565 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; -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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/CPUItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/CPUItemDevice.java index b63c7973..865acd26 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; -import li.cil.oc2r.api.bus.device.object.Callback; -import li.cil.oc2r.common.item.CPUItem; +import li.cil.oc2.api.bus.device.object.Callback; +import li.cil.oc2.common.item.CPUItem; import net.minecraft.world.item.ItemStack; public class CPUItemDevice extends AbstractItemRPCDevice { diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/FileImportExportCardItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/FileImportExportCardItemDevice.java index 0b5e2e1c..deba9c40 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; -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 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 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/oc2r/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java index 91209b14..28929a9f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; -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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java index 3164e7dd..b5b04648 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; -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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java index c32e1ded..43fe006d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; -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 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 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 index 943da86c..48db9acd 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.rpc.item; +package li.cil.oc2.common.bus.device.rpc.item; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 3a355392..799d6786 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.rpc; +package li.cil.oc2.common.bus.device.rpc; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/AbstractDeviceInfo.java b/src/main/java/li/cil/oc2r/common/bus/device/util/AbstractDeviceInfo.java index 8dc52217..1c3e9fcb 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; -import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2.api.bus.device.Device; import javax.annotation.Nullable; import java.util.Objects; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/BlockDeviceInfo.java b/src/main/java/li/cil/oc2r/common/bus/device/util/BlockDeviceInfo.java index fc20e26c..862b8984 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/DeviceTypeImpl.java b/src/main/java/li/cil/oc2r/common/bus/device/util/DeviceTypeImpl.java index e7d9108f..f314dad4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; -import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2.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/oc2r/common/bus/device/util/Devices.java b/src/main/java/li/cil/oc2r/common/bus/device/util/Devices.java index c03d7ff4..69ed68f6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; -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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/IdentityProxy.java b/src/main/java/li/cil/oc2r/common/bus/device/util/IdentityProxy.java index 7574bfde..74f0de4e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; import javax.annotation.Nullable; import java.util.Objects; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/ItemDeviceInfo.java b/src/main/java/li/cil/oc2r/common/bus/device/util/ItemDeviceInfo.java index e08b87e3..f35e0156 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; -import li.cil.oc2r.api.bus.device.ItemDevice; -import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2.api.bus.device.ItemDevice; +import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalAddress.java b/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalAddress.java index 8ff8bd5b..e2d56680 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; -import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2.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/oc2r/common/bus/device/util/OptionalInterrupt.java b/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalInterrupt.java index 5bc10ef1..2cd709ad 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; -import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2.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 index a5c4d2b7..1d3a4176 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.util; +package li.cil.oc2.common.bus.device.util; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveContainer.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveContainer.java index 5e4bc848..924fbdc8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveDevice.java index 64d7ac12..a8bfbf27 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; -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.oc2.common.bus.device.vm.item.AbstractBlockStorageDevice; +import li.cil.oc2.common.item.FloppyItem; +import li.cil.oc2.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/oc2r/common/bus/device/vm/block/FlashMemoryFlasherContainer.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherContainer.java index a9e82c1f..57243cc9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherDevice.java index 5bc38c4d..07e30b8f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; -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.oc2.common.bus.device.vm.item.AbstractBlockStorageDevice; +import li.cil.oc2.common.item.FlashMemoryItem; +import li.cil.oc2.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/oc2r/common/bus/device/vm/block/KeyboardDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/KeyboardDevice.java index 68d535ee..416ab8a4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; -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.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.sedna.device.virtio.VirtIOKeyboardDevice; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/MonitorDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/MonitorDevice.java index 79de3970..da75c96e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; -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 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 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/PciCardCageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/PciCardCageDevice.java index 4b0f3bad..2bfb8050 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; -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 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 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/ProjectorDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/block/ProjectorDevice.java index 939f5a83..09379400 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; -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 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 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 index 857d6367..299a373f 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.vm.block; +package li.cil.oc2.common.bus.device.vm.block; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractBlockStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractBlockStorageDevice.java index 93af0716..cf295d71 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; import com.google.common.eventbus.Subscribe; -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.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.sedna.api.device.BlockDevice; import li.cil.sedna.device.virtio.VirtIOBlockDevice; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java index bb50bb39..97ffe50f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; -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.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.sedna.device.virtio.VirtIONetworkDevice; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java index 087b0518..72dab850 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; import com.google.common.eventbus.Subscribe; -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.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.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/oc2r/common/bus/device/vm/item/FirmwareFlashStorageDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/FirmwareFlashStorageDevice.java index 22422806..05b670ef 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; import com.google.common.eventbus.Subscribe; -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.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.sedna.api.memory.MemoryMap; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDevice.java index a786eb3c..9fabae4f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; -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.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.sedna.device.block.ByteBufferBlockDevice; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java index b4428638..4c405b6b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; import com.google.common.io.ByteStreams; -import li.cil.oc2r.common.util.BlockLocation; +import li.cil.oc2.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/oc2r/common/bus/device/vm/item/MemoryDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/MemoryDevice.java index efac476f..5ed766ef 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; -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.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.sedna.api.device.PhysicalMemory; import li.cil.sedna.device.memory.ByteBufferMemory; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java index 1b656b06..30d80ba6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; -import li.cil.oc2r.common.item.NetworkInterfaceCardItem; +import li.cil.oc2.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/oc2r/common/bus/device/vm/item/NetworkTunnelDevice.java b/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkTunnelDevice.java index d86d0d8d..d75af425 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -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 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 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 index f0a39ac7..802bfe1e 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.vm.item; +package li.cil.oc2.common.bus.device.vm.item; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 853d5311..d78998d9 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus.device.vm; +package li.cil.oc2.common.bus.device.vm; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 34166f44..5c01aa7e 100644 --- a/src/main/java/li/cil/oc2r/common/bus/package-info.java +++ b/src/main/java/li/cil/oc2r/common/bus/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.bus; +package li.cil.oc2.common.bus; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/capabilities/Capabilities.java b/src/main/java/li/cil/oc2r/common/capabilities/Capabilities.java index d02fa511..f285b50b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.capabilities; +package li.cil.oc2.common.capabilities; -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 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 net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/li/cil/oc2r/common/capabilities/CapabilityRegistry.java b/src/main/java/li/cil/oc2r/common/capabilities/CapabilityRegistry.java index 7e7ca0e2..8c1067e8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.capabilities; +package li.cil.oc2.common.capabilities; -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 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 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 index a8c6a191..1083fb2c 100644 --- a/src/main/java/li/cil/oc2r/common/capabilities/package-info.java +++ b/src/main/java/li/cil/oc2r/common/capabilities/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.capabilities; +package li.cil.oc2.common.capabilities; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractComputerContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractComputerContainer.java index a725675b..8446379c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -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 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 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/oc2r/common/container/AbstractContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractContainer.java index edc853cf..82c205da 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractDeviceItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/AbstractDeviceItemStackHandler.java index 299ac7b0..e3d3015f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.common.bus.AbstractItemDeviceBusElement; +import li.cil.oc2.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/oc2r/common/container/AbstractMachineContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractMachineContainer.java index 9959087e..4ecd7003 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.common.vm.VirtualMachine; +import li.cil.oc2.common.vm.VirtualMachine; import net.minecraft.world.inventory.MenuType; public abstract class AbstractMachineContainer extends AbstractContainer { diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractMachineTerminalContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractMachineTerminalContainer.java index e6f0f78d..3c96f5fd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.common.vm.Terminal; +import li.cil.oc2.common.vm.Terminal; import net.minecraft.world.inventory.MenuType; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractMonitorContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractMonitorContainer.java index 914e294d..7cdf219b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -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 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 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/oc2r/common/container/AbstractRobotContainer.java b/src/main/java/li/cil/oc2r/common/container/AbstractRobotContainer.java index 046c5fc9..267d61fb 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -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 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 net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractTypedDeviceItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/AbstractTypedDeviceItemStackHandler.java index 0ebfce69..012a462d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2.api.bus.device.DeviceType; import net.minecraft.world.item.ItemStack; public abstract class AbstractTypedDeviceItemStackHandler extends AbstractDeviceItemStackHandler { diff --git a/src/main/java/li/cil/oc2r/common/container/ComputerInventoryContainer.java b/src/main/java/li/cil/oc2r/common/container/ComputerInventoryContainer.java index 72b3e91b..2e8b99ed 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -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 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 net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/common/container/ComputerTerminalContainer.java b/src/main/java/li/cil/oc2r/common/container/ComputerTerminalContainer.java index 3b09985b..b96a3207 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.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/oc2r/common/container/Containers.java b/src/main/java/li/cil/oc2r/common/container/Containers.java index 7156b1a7..a25eaeab 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/container/DeviceTypeSlot.java b/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlot.java index 5eedc3db..7adc1a2b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; import com.mojang.datafixers.util.Pair; -import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2.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/oc2r/common/container/DeviceTypeSlotItemHandler.java b/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlotItemHandler.java index ea3c018e..a98116b1 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; import com.mojang.datafixers.util.Pair; -import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2.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/oc2r/common/container/FixedSizeItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/FixedSizeItemStackHandler.java index f9f592a1..e6171b2c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2.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/oc2r/common/container/IntPrecisionContainerData.java b/src/main/java/li/cil/oc2r/common/container/IntPrecisionContainerData.java index 23da0140..0bc99a3e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; import net.minecraft.world.inventory.ContainerData; import net.minecraft.world.inventory.SimpleContainerData; diff --git a/src/main/java/li/cil/oc2r/common/container/LockedSlot.java b/src/main/java/li/cil/oc2r/common/container/LockedSlot.java index 6da31ea3..94963092 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/li/cil/oc2r/common/container/MonitorDisplayContainer.java b/src/main/java/li/cil/oc2r/common/container/MonitorDisplayContainer.java index 2ca6c3e5..db172181 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.common.blockentity.MonitorBlockEntity; +import li.cil.oc2.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/oc2r/common/container/NetworkTunnelContainer.java b/src/main/java/li/cil/oc2r/common/container/NetworkTunnelContainer.java index d67454de..c24db235 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -import li.cil.oc2r.api.bus.device.DeviceTypes; -import li.cil.oc2r.common.item.NetworkTunnelItem; -import li.cil.oc2r.common.tags.ItemTags; +import li.cil.oc2.api.bus.device.DeviceTypes; +import li.cil.oc2.common.item.NetworkTunnelItem; +import li.cil.oc2.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/oc2r/common/container/RobotInventoryContainer.java b/src/main/java/li/cil/oc2r/common/container/RobotInventoryContainer.java index 71009f59..43ad00c2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -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 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 net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/li/cil/oc2r/common/container/RobotSlot.java b/src/main/java/li/cil/oc2r/common/container/RobotSlot.java index b32c8c68..360c55fe 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/li/cil/oc2r/common/container/RobotTerminalContainer.java b/src/main/java/li/cil/oc2r/common/container/RobotTerminalContainer.java index 01ddf325..31f80e76 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.common.container; -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 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 net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/li/cil/oc2r/common/container/TypedItemStackHandler.java b/src/main/java/li/cil/oc2r/common/container/TypedItemStackHandler.java index 5a2ffb38..c5a0b33d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.container; +package li.cil.oc2.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 index b1769d13..9a3c9402 100644 --- a/src/main/java/li/cil/oc2r/common/container/package-info.java +++ b/src/main/java/li/cil/oc2r/common/container/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.container; +package li.cil.oc2.common.container; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/energy/EnergyStorageItemStack.java b/src/main/java/li/cil/oc2r/common/energy/EnergyStorageItemStack.java index 5b91bcd2..c3a902ff 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.energy; +package li.cil.oc2.common.energy; -import li.cil.oc2r.common.capabilities.Capabilities; -import li.cil.oc2r.common.util.NBTUtils; +import li.cil.oc2.common.capabilities.Capabilities; +import li.cil.oc2.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/oc2r/common/energy/FixedEnergyStorage.java b/src/main/java/li/cil/oc2r/common/energy/FixedEnergyStorage.java index 0a11c7f9..652d95f7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.energy; +package li.cil.oc2.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 index b5f60ef4..d26d50ce 100644 --- a/src/main/java/li/cil/oc2r/common/energy/package-info.java +++ b/src/main/java/li/cil/oc2r/common/energy/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.energy; +package li.cil.oc2.common.energy; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/entity/Entities.java b/src/main/java/li/cil/oc2r/common/entity/Entities.java index 999d0e03..4bcb392c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity; +package li.cil.oc2.common.entity; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/entity/Robot.java b/src/main/java/li/cil/oc2r/common/entity/Robot.java index a69428a3..584f24da 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity; +package li.cil.oc2.common.entity; -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 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 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.oc2r.common.Constants.*; +import static li.cil.oc2.common.Constants.*; -public final class Robot extends Entity implements li.cil.oc2r.api.capabilities.Robot, TerminalUserProvider { +public final class Robot extends Entity implements li.cil.oc2.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 index d9e1f464..92a5fd21 100644 --- a/src/main/java/li/cil/oc2r/common/entity/package-info.java +++ b/src/main/java/li/cil/oc2r/common/entity/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.entity; +package li.cil.oc2.common.entity; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotAction.java b/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotAction.java index 734c58a4..0095e424 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; -import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2.common.entity.Robot; import net.minecraft.nbt.CompoundTag; public abstract class AbstractRobotAction { diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotActionType.java b/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotActionType.java index cc60a7d2..23d3a736 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; -import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2.common.entity.Robot; import net.minecraft.nbt.CompoundTag; public abstract class AbstractRobotActionType { diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/MovementDirection.java b/src/main/java/li/cil/oc2r/common/entity/robot/MovementDirection.java index e95f04a2..a928f395 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotActionResult.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotActionResult.java index 467213ac..9218ff55 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; public enum RobotActionResult { INCOMPLETE, diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotActions.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotActions.java index cde76a34..44a5e8aa 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; -import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2.common.entity.Robot; import net.minecraft.nbt.CompoundTag; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementAction.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementAction.java index 8fd01aaf..c7240c33 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; -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 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 net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementActionType.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementActionType.java index 0b6430d5..10048178 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; -import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2.common.entity.Robot; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationAction.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationAction.java index b7b2bdbc..4be8dc6a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; -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 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 net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationActionType.java b/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationActionType.java index 99d75aed..29ab37d8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; -import li.cil.oc2r.common.entity.Robot; +import li.cil.oc2.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/oc2r/common/entity/robot/RotationDirection.java b/src/main/java/li/cil/oc2r/common/entity/robot/RotationDirection.java index 140d52a5..c4c39a24 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.entity.robot; +package li.cil.oc2.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 index b24c25c7..4c4d8f26 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.entity.robot; +package li.cil.oc2.common.entity.robot; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/ext/MinecraftExt.java b/src/main/java/li/cil/oc2r/common/ext/MinecraftExt.java index 4acbfa83..6234a57f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.ext; +package li.cil.oc2.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 index 946e1fdb..e7fc99ec 100644 --- a/src/main/java/li/cil/oc2r/common/ext/package-info.java +++ b/src/main/java/li/cil/oc2r/common/ext/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.ext; +package li.cil.oc2.common.ext; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/integration/IMC.java b/src/main/java/li/cil/oc2r/common/integration/IMC.java index 06d9dc4a..142fad22 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.integration; +package li.cil.oc2.common.integration; -import li.cil.oc2r.api.API; -import li.cil.oc2r.api.imc.RPCMethodParameterTypeAdapter; -import li.cil.oc2r.common.bus.device.rpc.RPCMethodParameterTypeAdapters; +import li.cil.oc2.api.API; +import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; +import li.cil.oc2.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/oc2r/common/integration/Integrations.java b/src/main/java/li/cil/oc2r/common/integration/Integrations.java index 4422b018..047d09a5 100644 --- a/src/main/java/li/cil/oc2r/common/integration/Integrations.java +++ b/src/main/java/li/cil/oc2r/common/integration/Integrations.java @@ -1,6 +1,6 @@ -package li.cil.oc2r.common.integration; +package li.cil.oc2.common.integration; -import li.cil.oc2r.common.integration.projectred.BundledCableHandler; +import li.cil.oc2.common.integration.projectred.BundledCableHandler; import net.minecraftforge.fml.ModList; public class Integrations { diff --git a/src/main/java/li/cil/oc2r/common/integration/Wrenches.java b/src/main/java/li/cil/oc2r/common/integration/Wrenches.java index 190ffa61..e7743f10 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.integration; +package li.cil.oc2.common.integration; -import li.cil.oc2r.common.tags.ItemTags; +import li.cil.oc2.common.tags.ItemTags; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/integration/jei/ExtraGuiAreasJEIPlugin.java b/src/main/java/li/cil/oc2r/common/integration/jei/ExtraGuiAreasJEIPlugin.java index 06a9efe5..b633e9a1 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.integration.jei; +package li.cil.oc2.common.integration.jei; -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 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 mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaTypes; diff --git a/src/main/java/li/cil/oc2r/common/integration/jei/ExtraItemsJEIPlugin.java b/src/main/java/li/cil/oc2r/common/integration/jei/ExtraItemsJEIPlugin.java index 14b4b34a..b202b6d2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.integration.jei; +package li.cil.oc2.common.integration.jei; import com.google.common.base.Strings; -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 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 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.oc2r.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; -import static li.cil.oc2r.common.Constants.ITEMS_TAG_NAME; +import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM; +import static li.cil.oc2.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 index 0593ab8f..fdd08fd5 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.integration.jei; +package li.cil.oc2.common.integration.jei; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 477c4867..a9b0fdf9 100644 --- a/src/main/java/li/cil/oc2r/common/integration/package-info.java +++ b/src/main/java/li/cil/oc2r/common/integration/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.integration; +package li.cil.oc2.common.integration; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/integration/projectred/BundledCableHandler.java b/src/main/java/li/cil/oc2r/common/integration/projectred/BundledCableHandler.java index becfe941..2136701b 100644 --- a/src/main/java/li/cil/oc2r/common/integration/projectred/BundledCableHandler.java +++ b/src/main/java/li/cil/oc2r/common/integration/projectred/BundledCableHandler.java @@ -1,7 +1,7 @@ -package li.cil.oc2r.common.integration.projectred; +package li.cil.oc2.common.integration.projectred; -import li.cil.oc2r.common.blockentity.RedstoneInterfaceBlockEntity; -import li.cil.oc2r.common.integration.util.BundledRedstone; +import li.cil.oc2.common.blockentity.RedstoneInterfaceBlockEntity; +import li.cil.oc2.common.integration.util.BundledRedstone; import mrtjp.projectred.api.IBundledTileInteraction; import mrtjp.projectred.api.ITransmissionAPI; import mrtjp.projectred.api.ProjectRedAPI; diff --git a/src/main/java/li/cil/oc2r/common/integration/util/BundledRedstone.java b/src/main/java/li/cil/oc2r/common/integration/util/BundledRedstone.java index c0e076ad..a20b7c9b 100644 --- a/src/main/java/li/cil/oc2r/common/integration/util/BundledRedstone.java +++ b/src/main/java/li/cil/oc2r/common/integration/util/BundledRedstone.java @@ -1,6 +1,6 @@ -package li.cil.oc2r.common.integration.util; +package li.cil.oc2.common.integration.util; -import li.cil.oc2r.common.integration.projectred.BundledCableHandler; +import li.cil.oc2.common.integration.projectred.BundledCableHandler; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; diff --git a/src/main/java/li/cil/oc2r/common/item/AbstractBlockDeviceItem.java b/src/main/java/li/cil/oc2r/common/item/AbstractBlockDeviceItem.java index 65fe2cd6..8b7b7354 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 net.minecraft.ResourceLocationException; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2r/common/item/AbstractStorageItem.java b/src/main/java/li/cil/oc2r/common/item/AbstractStorageItem.java index 9caa2839..a5007b3b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.common.util.ItemStackUtils; -import li.cil.oc2r.common.util.NBTTagIds; -import li.cil.oc2r.common.util.TextFormatUtils; +import li.cil.oc2.common.util.ItemStackUtils; +import li.cil.oc2.common.util.NBTTagIds; +import li.cil.oc2.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/oc2r/common/item/BlockOperationsModule.java b/src/main/java/li/cil/oc2r/common/item/BlockOperationsModule.java index 7612bae7..14983655 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; public final class BlockOperationsModule extends ModItem { public static final int DURABILITY = 2500; diff --git a/src/main/java/li/cil/oc2r/common/item/BusCableItem.java b/src/main/java/li/cil/oc2r/common/item/BusCableItem.java index 835c6a4b..a4ba73b7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/common/item/BusInterfaceItem.java b/src/main/java/li/cil/oc2r/common/item/BusInterfaceItem.java index 2877f6ff..53fc1ac7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2r/common/item/CPUItem.java b/src/main/java/li/cil/oc2r/common/item/CPUItem.java index 3b2f8978..3d9d1b94 100644 --- a/src/main/java/li/cil/oc2r/common/item/CPUItem.java +++ b/src/main/java/li/cil/oc2r/common/item/CPUItem.java @@ -1,4 +1,4 @@ -package li.cil.oc2r.common.item; +package li.cil.oc2.common.item; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/item/ChargerItem.java b/src/main/java/li/cil/oc2r/common/item/ChargerItem.java index aaa2b4e4..644da7e6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/li/cil/oc2r/common/item/FlashMemoryItem.java b/src/main/java/li/cil/oc2r/common/item/FlashMemoryItem.java index 1d8744b5..54992ae2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.bus.device.vm.item.ByteBufferFlashStorageDevice; -import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2.api.API; +import li.cil.oc2.common.bus.device.vm.item.ByteBufferFlashStorageDevice; +import li.cil.oc2.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/oc2r/common/item/FlashMemoryWithExternalDataItem.java b/src/main/java/li/cil/oc2r/common/item/FlashMemoryWithExternalDataItem.java index 4fe2d005..d1c3a10b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 net.minecraft.ResourceLocationException; import net.minecraft.Util; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/common/item/FloppyItem.java b/src/main/java/li/cil/oc2r/common/item/FloppyItem.java index 79a6f9b2..3b5cd72c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; import net.minecraft.world.item.DyeableLeatherItem; diff --git a/src/main/java/li/cil/oc2r/common/item/HardDriveItem.java b/src/main/java/li/cil/oc2r/common/item/HardDriveItem.java index b109a57c..aacff7da 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.util.ColorUtils; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/item/HardDriveWithExternalDataItem.java b/src/main/java/li/cil/oc2r/common/item/HardDriveWithExternalDataItem.java index 93d8ae84..2cf91160 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.util.ColorUtils; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/item/ItemGroup.java b/src/main/java/li/cil/oc2r/common/item/ItemGroup.java index e8aac524..82d077bd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.block.ComputerBlock; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/item/ItemRenameHandler.java b/src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java index d091b25d..2f26df71 100644 --- a/src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java +++ b/src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java @@ -1,6 +1,6 @@ -package li.cil.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.Util; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2r/common/item/Items.java b/src/main/java/li/cil/oc2r/common/item/Items.java index bb800c87..487c81fa 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 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/oc2r/common/item/ManualItem.java b/src/main/java/li/cil/oc2r/common/item/ManualItem.java index bac9b155..33bc0a82 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.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.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 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 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/oc2r/common/item/MemoryItem.java b/src/main/java/li/cil/oc2r/common/item/MemoryItem.java index 07eaad58..a8aee5bc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.Util; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2r/common/item/ModBlockItem.java b/src/main/java/li/cil/oc2r/common/item/ModBlockItem.java index 5d244bc1..356565a7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.common.util.TooltipUtils; +import li.cil.oc2.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/oc2r/common/item/ModItem.java b/src/main/java/li/cil/oc2r/common/item/ModItem.java index 1895d37f..393e9e45 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.common.util.TooltipUtils; +import li.cil.oc2.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/oc2r/common/item/NetworkCableItem.java b/src/main/java/li/cil/oc2r/common/item/NetworkCableItem.java index 8d9200d4..20be21b8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; diff --git a/src/main/java/li/cil/oc2r/common/item/NetworkInterfaceCardItem.java b/src/main/java/li/cil/oc2r/common/item/NetworkInterfaceCardItem.java index 62893fb9..8e11ff3c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 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.oc2r.common.util.TextFormatUtils.withFormat; -import static li.cil.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2.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/oc2r/common/item/NetworkTunnelItem.java b/src/main/java/li/cil/oc2r/common/item/NetworkTunnelItem.java index 65af1eec..813cf97e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.common.container.NetworkTunnelContainer; -import li.cil.oc2r.common.util.ItemStackUtils; -import li.cil.oc2r.common.util.TextFormatUtils; +import li.cil.oc2.common.container.NetworkTunnelContainer; +import li.cil.oc2.common.util.ItemStackUtils; +import li.cil.oc2.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.oc2r.common.util.TranslationUtils.key; +import static li.cil.oc2.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/oc2r/common/item/RobotItem.java b/src/main/java/li/cil/oc2r/common/item/RobotItem.java index 42059e1b..d4c74a29 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -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 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 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.oc2r.common.Constants.*; -import static li.cil.oc2r.common.util.NBTUtils.makeInventoryTag; -import static li.cil.oc2r.common.util.RegistryUtils.key; +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; public final class RobotItem extends ModItem { @Override diff --git a/src/main/java/li/cil/oc2r/common/item/WrenchItem.java b/src/main/java/li/cil/oc2r/common/item/WrenchItem.java index 2b3901af..71f9a9b3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item; +package li.cil.oc2.common.item; -import li.cil.oc2r.common.tags.BlockTags; +import li.cil.oc2.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/oc2r/common/item/crafting/RecipeSerializers.java b/src/main/java/li/cil/oc2r/common/item/crafting/RecipeSerializers.java index 7887be3d..d0e70608 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item.crafting; +package li.cil.oc2.common.item.crafting; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/item/crafting/WrenchRecipe.java b/src/main/java/li/cil/oc2r/common/item/crafting/WrenchRecipe.java index 25e129e6..8c4339ad 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.item.crafting; +package li.cil.oc2.common.item.crafting; import com.google.gson.JsonObject; -import li.cil.oc2r.common.integration.Wrenches; +import li.cil.oc2.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 index f7e8dd3d..b5f62d13 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.item.crafting; +package li.cil.oc2.common.item.crafting; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 79a62f6a..63a35021 100644 --- a/src/main/java/li/cil/oc2r/common/item/package-info.java +++ b/src/main/java/li/cil/oc2r/common/item/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.item; +package li.cil.oc2.common.item; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/mixin/FrustumMixin.java b/src/main/java/li/cil/oc2r/common/mixin/FrustumMixin.java index 0201a067..8e51ebd0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.mixin; +package li.cil.oc2.common.mixin; -import li.cil.oc2r.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2.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/oc2r/common/mixin/LevelRendererMixin.java b/src/main/java/li/cil/oc2r/common/mixin/LevelRendererMixin.java index 4c84d638..9a32b200 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.mixin; +package li.cil.oc2.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.oc2r.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2.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/oc2r/common/mixin/MinecraftMixin.java b/src/main/java/li/cil/oc2r/common/mixin/MinecraftMixin.java index 132312c8..bd60a451 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.mixin; +package li.cil.oc2.common.mixin; import com.mojang.blaze3d.pipeline.RenderTarget; -import li.cil.oc2r.client.renderer.ProjectorDepthRenderer; -import li.cil.oc2r.common.ext.MinecraftExt; +import li.cil.oc2.client.renderer.ProjectorDepthRenderer; +import li.cil.oc2.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/oc2r/common/mixin/ServerChunkCacheMixin.java b/src/main/java/li/cil/oc2r/common/mixin/ServerChunkCacheMixin.java index 460113c5..a2aec04f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.mixin; +package li.cil.oc2.common.mixin; -import li.cil.oc2r.common.util.ChunkUtils; +import li.cil.oc2.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 index 74d1e9fc..1811d92a 100644 --- a/src/main/java/li/cil/oc2r/common/mixin/package-info.java +++ b/src/main/java/li/cil/oc2r/common/mixin/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.mixin; +package li.cil.oc2.common.mixin; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/network/MessageUtils.java b/src/main/java/li/cil/oc2r/common/network/MessageUtils.java index 02b3750a..14247c7b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network; +package li.cil.oc2.common.network; -import li.cil.oc2r.common.util.LevelUtils; +import li.cil.oc2.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/oc2r/common/network/MonitorLoadBalancer.java b/src/main/java/li/cil/oc2r/common/network/MonitorLoadBalancer.java index 2e29d5a1..5bcf6b4d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network; +package li.cil.oc2.common.network; -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 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 net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2r/common/network/Network.java b/src/main/java/li/cil/oc2r/common/network/Network.java index 984841a3..d49e3db0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network; +package li.cil.oc2.common.network; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.network.message.*; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/network/ProjectorLoadBalancer.java b/src/main/java/li/cil/oc2r/common/network/ProjectorLoadBalancer.java index b338a7c7..ec0076d5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network; +package li.cil.oc2.common.network; -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 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 net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2r/common/network/message/AbstractMessage.java b/src/main/java/li/cil/oc2r/common/network/message/AbstractMessage.java index e7d7a0fb..88b06ce5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.network.Network; +import li.cil.oc2.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/oc2r/common/network/message/AbstractTerminalBlockMessage.java b/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalBlockMessage.java index fba54677..8525452c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalEntityMessage.java b/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalEntityMessage.java index 1e8594cf..3515b72c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2r/common/network/message/BusCableFacadeMessage.java b/src/main/java/li/cil/oc2r/common/network/message/BusCableFacadeMessage.java index 0098082b..b1568242 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.BusCableBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.BusCableBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/BusInterfaceNameMessage.java b/src/main/java/li/cil/oc2r/common/network/message/BusInterfaceNameMessage.java index 67164c45..782ee58d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.BusCableBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.BusCableBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/ClientCanceledImportFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ClientCanceledImportFileMessage.java index d4d0fc40..5f662e9d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2.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/ComputerBootErrorMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerBootErrorMessage.java index 759ebec9..5840e07e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/ComputerBusStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerBusStateMessage.java index 8cfce9ba..2f3cb569 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.bus.CommonDeviceBusController; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.bus.CommonDeviceBusController; +import li.cil.oc2.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/oc2r/common/network/message/ComputerPowerMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerPowerMessage.java index 0b127812..6a8bf3e7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/ComputerRunStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerRunStateMessage.java index 3e217649..aeb821e2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; -import li.cil.oc2r.common.vm.VMRunState; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2.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/oc2r/common/network/message/ComputerTerminalInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalInputMessage.java index 0254c72e..773e2fcd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalOutputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalOutputMessage.java index d0103f62..c596e4ce 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/DiskDriveFloppyMessage.java b/src/main/java/li/cil/oc2r/common/network/message/DiskDriveFloppyMessage.java index 6a5df7c1..b84df1a9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.DiskDriveBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.DiskDriveBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/ExportedFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ExportedFileMessage.java index 1f03629e..c0b755bb 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.client.gui.FileChooserScreen; +import li.cil.oc2.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/oc2r/common/network/message/FirmwareFlasherMessage.java b/src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java index ca3dece1..7679ff33 100644 --- a/src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java +++ b/src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.FlashMemoryFlasherBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.FlashMemoryFlasherBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/ImportedFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ImportedFileMessage.java index 4f444fe9..6c463250 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2.common.bus.device.rpc.item.FileImportExportCardItemDevice; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/KeyboardInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/KeyboardInputMessage.java index be43d948..14f044bd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.KeyboardBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.KeyboardBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/MonitorFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorFramebufferMessage.java index 8bd99d97..721413c7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.MonitorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.MonitorBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/MonitorInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorInputMessage.java index e4d336be..817e6764 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.MonitorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.MonitorBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/MonitorPowerMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessage.java index 21997784..f4c26d5d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.MonitorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; -import li.cil.oc2r.common.network.Network; +import li.cil.oc2.common.blockentity.MonitorBlockEntity; +import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2.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/oc2r/common/network/message/MonitorPowerMessageForwarded.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessageForwarded.java index b67af8ee..afcf9445 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.MonitorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.MonitorBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/MonitorRequestFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorRequestFramebufferMessage.java index 00e56345..a7f72ccc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.MonitorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; -import li.cil.oc2r.common.network.MonitorLoadBalancer; +import li.cil.oc2.common.blockentity.MonitorBlockEntity; +import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2.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/oc2r/common/network/message/MonitorStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MonitorStateMessage.java index 3b67a328..bbdb3acf 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.MonitorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.MonitorBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/MultipartMessage.java b/src/main/java/li/cil/oc2r/common/network/message/MultipartMessage.java index db5aeb06..f32be822 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.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.oc2r.common.Constants; -import li.cil.oc2r.common.network.Network; +import li.cil.oc2.common.Constants; +import li.cil.oc2.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/oc2r/common/network/message/NetworkConnectorConnectionsMessage.java b/src/main/java/li/cil/oc2r/common/network/message/NetworkConnectorConnectionsMessage.java index ce27d87f..83fc70aa 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.NetworkConnectorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/NetworkInterfaceCardConfigurationMessage.java b/src/main/java/li/cil/oc2r/common/network/message/NetworkInterfaceCardConfigurationMessage.java index e0d257ba..d858d3c7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.item.Items; -import li.cil.oc2r.common.item.NetworkInterfaceCardItem; +import li.cil.oc2.common.item.Items; +import li.cil.oc2.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/oc2r/common/network/message/NetworkTunnelLinkMessage.java b/src/main/java/li/cil/oc2r/common/network/message/NetworkTunnelLinkMessage.java index 59db128c..a8df2b4e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.container.NetworkTunnelContainer; +import li.cil.oc2.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/oc2r/common/network/message/OpenComputerInventoryMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenComputerInventoryMessage.java index 351bb60d..04b3aa08 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/OpenComputerTerminalMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenComputerTerminalMessage.java index 54fe452d..d16f165a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ComputerBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ComputerBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/OpenRobotInventoryMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenRobotInventoryMessage.java index 8b38538a..b2bd15d4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.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/oc2r/common/network/message/OpenRobotTerminalMessage.java b/src/main/java/li/cil/oc2r/common/network/message/OpenRobotTerminalMessage.java index eecf0f9b..f1411ffd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.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/oc2r/common/network/message/ProjectorFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ProjectorFramebufferMessage.java index 605cb3bf..c1b9463c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/ProjectorRequestFramebufferMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ProjectorRequestFramebufferMessage.java index da1ac171..1ac3445e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; -import li.cil.oc2r.common.network.ProjectorLoadBalancer; +import li.cil.oc2.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2.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/oc2r/common/network/message/ProjectorStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ProjectorStateMessage.java index a9e3c2a8..20a4c797 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.blockentity.ProjectorBlockEntity; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.blockentity.ProjectorBlockEntity; +import li.cil.oc2.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/oc2r/common/network/message/RequestImportedFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RequestImportedFileMessage.java index 577195dc..2b03b5e5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -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 li.cil.oc2.client.gui.FileChooserScreen; +import li.cil.oc2.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2.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.oc2r.common.util.TranslationUtils.text; +import static li.cil.oc2.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/oc2r/common/network/message/RobotBootErrorMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotBootErrorMessage.java index 22619172..a3957c0f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.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/oc2r/common/network/message/RobotBusStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotBusStateMessage.java index fafa8f51..880f4ce7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.bus.CommonDeviceBusController; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.bus.CommonDeviceBusController; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationMessage.java index f9180cb2..8704b329 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -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 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 net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationRequestMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationRequestMessage.java index f2df82d5..45b337e9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotPowerMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotPowerMessage.java index 6fb45264..92d18945 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotRunStateMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotRunStateMessage.java index fca9d5c5..9846b74c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; -import li.cil.oc2r.common.vm.VMRunState; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.common.network.MessageUtils; +import li.cil.oc2.common.vm.VMRunState; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalInputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalInputMessage.java index d6a08abf..35765d98 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalOutputMessage.java b/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalOutputMessage.java index 3f652085..152f57ae 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.entity.Robot; -import li.cil.oc2r.common.network.MessageUtils; +import li.cil.oc2.common.entity.Robot; +import li.cil.oc2.common.network.MessageUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/li/cil/oc2r/common/network/message/ServerCanceledImportFileMessage.java b/src/main/java/li/cil/oc2r/common/network/message/ServerCanceledImportFileMessage.java index c5559458..6b8b19ca 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.network.message; +package li.cil.oc2.common.network.message; -import li.cil.oc2r.common.bus.device.rpc.item.FileImportExportCardItemDevice; +import li.cil.oc2.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 index 5f4aa607..2958dc13 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.network.message; +package li.cil.oc2.common.network.message; import net.minecraft.MethodsReturnNonnullByDefault; 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 index 0b463b0b..452145b8 100644 --- a/src/main/java/li/cil/oc2r/common/network/package-info.java +++ b/src/main/java/li/cil/oc2r/common/network/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.network; +package li.cil.oc2.common.network; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/package-info.java b/src/main/java/li/cil/oc2r/common/package-info.java index e536160d..0670c71c 100644 --- a/src/main/java/li/cil/oc2r/common/package-info.java +++ b/src/main/java/li/cil/oc2r/common/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common; +package li.cil.oc2.common; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/serialization/BlobStorage.java b/src/main/java/li/cil/oc2r/common/serialization/BlobStorage.java index d5c3d114..6f63d475 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization; +package li.cil.oc2.common.serialization; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/serialization/NBTSerialization.java b/src/main/java/li/cil/oc2r/common/serialization/NBTSerialization.java index 15eaaa50..2e704fd7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization; +package li.cil.oc2.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.oc2r.common.util.NBTTagIds; +import li.cil.oc2.common.util.NBTTagIds; import net.minecraft.nbt.*; import org.jetbrains.annotations.Contract; diff --git a/src/main/java/li/cil/oc2r/common/serialization/NBTToJsonConverter.java b/src/main/java/li/cil/oc2r/common/serialization/NBTToJsonConverter.java index b3cfb156..a6086037 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization; +package li.cil.oc2.common.serialization; import com.google.gson.*; -import li.cil.oc2r.common.util.NBTTagIds; +import li.cil.oc2.common.util.NBTTagIds; import net.minecraft.nbt.*; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/JsonArraySerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/JsonArraySerializer.java index e9b7ac24..1ef9534b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.ceres; +package li.cil.oc2.common.serialization.ceres; import com.google.gson.JsonArray; import com.google.gson.JsonParser; diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeListSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeListSerializer.java index f41bc32c..2ed366db 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.ceres; +package li.cil.oc2.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.oc2r.common.vm.context.global.MemoryRangeList; +import li.cil.oc2.common.vm.context.global.MemoryRangeList; import li.cil.sedna.api.memory.MemoryRange; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeSerializer.java index 3f3024d1..9f65bd57 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.ceres; +package li.cil.oc2.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/Serializers.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/Serializers.java index 52289655..7dddaf78 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.ceres; +package li.cil.oc2.common.serialization.ceres; import com.google.gson.JsonArray; import li.cil.ceres.Ceres; -import li.cil.oc2r.common.vm.context.global.MemoryRangeList; +import li.cil.oc2.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/oc2r/common/serialization/ceres/TextComponentSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/ceres/TextComponentSerializer.java index ca797e67..f3ee6ed1 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.ceres; +package li.cil.oc2.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 index 8d46a68d..4ecb1685 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.serialization.ceres; +package li.cil.oc2.common.serialization.ceres; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/DirectionJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/DirectionJsonSerializer.java index b4dbae05..a9741e73 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.common.serialization.gson; import com.google.gson.*; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/EmptyRPCMethodGroupSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/EmptyRPCMethodGroupSerializer.java index e2622e30..df87b4cc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/ItemStackJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/ItemStackJsonSerializer.java index 92f30eaf..1bd59733 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.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.oc2r.common.bus.device.rpc.RPCItemStackTagFilters; -import li.cil.oc2r.common.serialization.NBTToJsonConverter; +import li.cil.oc2.common.bus.device.rpc.RPCItemStackTagFilters; +import li.cil.oc2.common.serialization.NBTToJsonConverter; import net.minecraft.world.item.ItemStack; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/MessageJsonDeserializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/MessageJsonDeserializer.java index 1ddba9c9..edcb7b42 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/MethodInvocationJsonDeserializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/MethodInvocationJsonDeserializer.java index 9d38eaf6..b70bd859 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2r.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java index b640d47c..f0995d9d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.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.oc2r.common.bus.RPCDeviceBusAdapter; +import li.cil.oc2.common.bus.RPCDeviceBusAdapter; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/RPCMethodJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/RPCMethodJsonSerializer.java index 58b77b20..28fcd609 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.common.serialization.gson; import com.google.gson.*; -import li.cil.oc2r.api.bus.device.rpc.RPCMethod; -import li.cil.oc2r.api.bus.device.rpc.RPCParameter; +import li.cil.oc2.api.bus.device.rpc.RPCMethod; +import li.cil.oc2.api.bus.device.rpc.RPCParameter; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/SideJsonDeserializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/SideJsonDeserializer.java index 851dd951..f2b483f9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.common.serialization.gson; import com.google.gson.*; import com.google.gson.internal.bind.TypeAdapters; import com.google.gson.reflect.TypeToken; -import li.cil.oc2r.api.util.Side; +import li.cil.oc2.api.util.Side; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/UnsignedByteArrayJsonSerializer.java b/src/main/java/li/cil/oc2r/common/serialization/gson/UnsignedByteArrayJsonSerializer.java index 588eb6f9..8a901408 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.serialization.gson; +package li.cil.oc2.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 index f776d638..1071e17e 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.serialization.gson; +package li.cil.oc2.common.serialization.gson; import net.minecraft.MethodsReturnNonnullByDefault; 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 index b74a7906..50764906 100644 --- a/src/main/java/li/cil/oc2r/common/serialization/package-info.java +++ b/src/main/java/li/cil/oc2r/common/serialization/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.serialization; +package li.cil.oc2.common.serialization; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/tags/BlockTags.java b/src/main/java/li/cil/oc2r/common/tags/BlockTags.java index e5add4c3..18fed1e6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.tags; +package li.cil.oc2.common.tags; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/ItemTags.java b/src/main/java/li/cil/oc2r/common/tags/ItemTags.java index a2cdc92f..6a96597b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.tags; +package li.cil.oc2.common.tags; -import li.cil.oc2r.api.API; +import li.cil.oc2.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 index e00a6216..8c8a0e5f 100644 --- a/src/main/java/li/cil/oc2r/common/tags/package-info.java +++ b/src/main/java/li/cil/oc2r/common/tags/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.tags; +package li.cil.oc2.common.tags; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/util/BlockEntityUtils.java b/src/main/java/li/cil/oc2r/common/util/BlockEntityUtils.java index 567980df..044ec90a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.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/oc2r/common/util/BlockLocation.java b/src/main/java/li/cil/oc2r/common/util/BlockLocation.java index 2b18ecab..71f79801 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/li/cil/oc2r/common/util/ChainableVertexConsumer.java b/src/main/java/li/cil/oc2r/common/util/ChainableVertexConsumer.java index 85d47607..60d96aa5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/li/cil/oc2r/common/util/ChunkLocation.java b/src/main/java/li/cil/oc2r/common/util/ChunkLocation.java index de5e1c98..78ed25a7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.core.BlockPos; import net.minecraft.world.level.ChunkPos; diff --git a/src/main/java/li/cil/oc2r/common/util/ChunkUtils.java b/src/main/java/li/cil/oc2r/common/util/ChunkUtils.java index 817f21e6..694107a6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.mixin.ServerChunkCacheMixin; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/util/ColorUtils.java b/src/main/java/li/cil/oc2r/common/util/ColorUtils.java index f3177d94..96a94d17 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; public final class ColorUtils { public static int textureDiffuseColorsToRGB(final float[] colors) { diff --git a/src/main/java/li/cil/oc2r/common/util/Event.java b/src/main/java/li/cil/oc2r/common/util/Event.java index 3e113625..22a3aeee 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import java.util.HashSet; diff --git a/src/main/java/li/cil/oc2r/common/util/FakePlayerUtils.java b/src/main/java/li/cil/oc2r/common/util/FakePlayerUtils.java index 986814fc..74ff9a5b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import com.mojang.authlib.GameProfile; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.Config; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/util/HorizontalBlockUtils.java b/src/main/java/li/cil/oc2r/common/util/HorizontalBlockUtils.java index d1118a34..8a82d3f5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -import li.cil.oc2r.api.util.Side; +import li.cil.oc2.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/oc2r/common/util/ItemDeviceUtils.java b/src/main/java/li/cil/oc2r/common/util/ItemDeviceUtils.java index db7c5103..be531c89 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/common/util/ItemStackUtils.java b/src/main/java/li/cil/oc2r/common/util/ItemStackUtils.java index 76e4b0f7..35474f72 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.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.oc2r.common.Constants.MOD_TAG_NAME; +import static li.cil.oc2.common.Constants.MOD_TAG_NAME; public final class ItemStackUtils { public static CompoundTag getModDataTag(final ItemStack stack) { diff --git a/src/main/java/li/cil/oc2r/common/util/LazyOptionalUtils.java b/src/main/java/li/cil/oc2r/common/util/LazyOptionalUtils.java index 8bbb9dcf..fda70525 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.util.NonNullConsumer; diff --git a/src/main/java/li/cil/oc2r/common/util/LevelUtils.java b/src/main/java/li/cil/oc2r/common/util/LevelUtils.java index a372e8d3..7cc7433c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2r/common/util/LocationSupplierUtils.java b/src/main/java/li/cil/oc2r/common/util/LocationSupplierUtils.java index a96a33d0..d83b008a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2r.api.bus.device.provider.ItemDeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.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/oc2r/common/util/NBTTagIds.java b/src/main/java/li/cil/oc2r/common/util/NBTTagIds.java index ebcd3637..21bab57d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.nbt.Tag; diff --git a/src/main/java/li/cil/oc2r/common/util/NBTUtils.java b/src/main/java/li/cil/oc2r/common/util/NBTUtils.java index 1888b66d..34d8efd8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/util/ParameterizedEvent.java b/src/main/java/li/cil/oc2r/common/util/ParameterizedEvent.java index 259dac94..11d8dc17 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import java.util.HashSet; import java.util.function.Consumer; diff --git a/src/main/java/li/cil/oc2r/common/util/RegistryUtils.java b/src/main/java/li/cil/oc2r/common/util/RegistryUtils.java index 3ba2109a..0598ce9e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -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 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 net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/src/main/java/li/cil/oc2r/common/util/RunnableUtils.java b/src/main/java/li/cil/oc2r/common/util/RunnableUtils.java index 2c69ed23..3296798c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; public final class RunnableUtils { public static void doNothing() { diff --git a/src/main/java/li/cil/oc2r/common/util/ServerScheduler.java b/src/main/java/li/cil/oc2r/common/util/ServerScheduler.java index 96845475..ade3a86b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2r/common/util/SoundEvents.java b/src/main/java/li/cil/oc2r/common/util/SoundEvents.java index 67cb0311..ac1e32de 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/util/TerminalUtils.java b/src/main/java/li/cil/oc2r/common/util/TerminalUtils.java index e8986c3d..e0cb0d88 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -import li.cil.oc2r.common.vm.Terminal; +import li.cil.oc2.common.vm.Terminal; import java.nio.ByteBuffer; import java.util.function.Consumer; diff --git a/src/main/java/li/cil/oc2r/common/util/TextFormatUtils.java b/src/main/java/li/cil/oc2r/common/util/TextFormatUtils.java index 682a8629..350a3a6e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/common/util/ThrottledSoundEmitter.java b/src/main/java/li/cil/oc2r/common/util/ThrottledSoundEmitter.java index 43049b18..45df056f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/li/cil/oc2r/common/util/TickUtils.java b/src/main/java/li/cil/oc2r/common/util/TickUtils.java index d49890fb..abb61ac3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -import li.cil.oc2r.common.Constants; +import li.cil.oc2.common.Constants; import java.time.Duration; diff --git a/src/main/java/li/cil/oc2r/common/util/TooltipUtils.java b/src/main/java/li/cil/oc2r/common/util/TooltipUtils.java index 5a762f1d..ee7d512d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; -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 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 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.oc2r.common.Constants.*; -import static li.cil.oc2r.common.util.TextFormatUtils.withFormat; +import static li.cil.oc2.common.Constants.*; +import static li.cil.oc2.common.util.TextFormatUtils.withFormat; @SuppressWarnings("UnstableApiUsage") public final class TooltipUtils { diff --git a/src/main/java/li/cil/oc2r/common/util/TranslationUtils.java b/src/main/java/li/cil/oc2r/common/util/TranslationUtils.java index 46dcd73e..d2816471 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.common.util; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/li/cil/oc2r/common/util/Vec3Utils.java b/src/main/java/li/cil/oc2r/common/util/Vec3Utils.java index 7bc254a5..e2b321f8 100644 --- a/src/main/java/li/cil/oc2r/common/util/Vec3Utils.java +++ b/src/main/java/li/cil/oc2r/common/util/Vec3Utils.java @@ -1,4 +1,4 @@ -package li.cil.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.core.Vec3i; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/li/cil/oc2r/common/util/VoxelShapeUtils.java b/src/main/java/li/cil/oc2r/common/util/VoxelShapeUtils.java index cfadc120..1f90577c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.util; +package li.cil.oc2.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 index e9026345..500f2929 100644 --- a/src/main/java/li/cil/oc2r/common/util/package-info.java +++ b/src/main/java/li/cil/oc2r/common/util/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.util; +package li.cil.oc2.common.util; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/vm/AbstractTerminalVMRunner.java b/src/main/java/li/cil/oc2r/common/vm/AbstractTerminalVMRunner.java index 0dc78426..0928f717 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue; import li.cil.sedna.device.serial.UART16550A; diff --git a/src/main/java/li/cil/oc2r/common/vm/AbstractVMItemStackHandlers.java b/src/main/java/li/cil/oc2r/common/vm/AbstractVMItemStackHandlers.java index 92b876dc..3d8e2dff 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; -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 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 net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2r/common/vm/AbstractVirtualMachine.java b/src/main/java/li/cil/oc2r/common/vm/AbstractVirtualMachine.java index ae91d028..3ec3cc17 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; import li.cil.ceres.api.Serialized; -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.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.sedna.api.memory.MemoryAccessException; import li.cil.sedna.riscv.R5Board; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/li/cil/oc2r/common/vm/Allocator.java b/src/main/java/li/cil/oc2r/common/vm/Allocator.java index 1c15f7b5..6ba4649b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.Config; +import li.cil.oc2.api.API; +import li.cil.oc2.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/oc2r/common/vm/BaseAddressProvider.java b/src/main/java/li/cil/oc2r/common/vm/BaseAddressProvider.java index 1817556c..31e835b6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; -import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.bus.device.vm.VMDevice; import java.util.OptionalLong; diff --git a/src/main/java/li/cil/oc2r/common/vm/BuiltinDevices.java b/src/main/java/li/cil/oc2r/common/vm/BuiltinDevices.java index 83925d57..272a1c53 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; import li.cil.ceres.api.Serialized; -import li.cil.oc2r.common.bus.device.data.FileSystems; -import li.cil.oc2r.common.vm.context.global.GlobalVMContext; +import li.cil.oc2.common.bus.device.data.FileSystems; +import li.cil.oc2.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/oc2r/common/vm/MinecraftRealTimeCounter.java b/src/main/java/li/cil/oc2r/common/vm/MinecraftRealTimeCounter.java index babceff4..6148b58f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; import li.cil.sedna.api.device.rtc.RealTimeCounter; import net.minecraft.world.level.Level; diff --git a/src/main/java/li/cil/oc2r/common/vm/Terminal.java b/src/main/java/li/cil/oc2r/common/vm/Terminal.java index f4e99c5c..c5007c09 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.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.oc2r.api.API; +import li.cil.oc2.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/oc2r/common/vm/VMDeviceBusAdapter.java b/src/main/java/li/cil/oc2r/common/vm/VMDeviceBusAdapter.java index a1711597..ac9e6521 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; -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 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 java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2r/common/vm/VMItemStackHandlers.java b/src/main/java/li/cil/oc2r/common/vm/VMItemStackHandlers.java index ce855492..d3281eff 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; -import li.cil.oc2r.api.bus.device.DeviceType; +import li.cil.oc2.api.bus.device.DeviceType; import net.minecraftforge.items.IItemHandler; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/common/vm/VMRunState.java b/src/main/java/li/cil/oc2r/common/vm/VMRunState.java index ff87897a..be1e7057 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; public enum VMRunState { STOPPED, diff --git a/src/main/java/li/cil/oc2r/common/vm/VMRunner.java b/src/main/java/li/cil/oc2r/common/vm/VMRunner.java index 5a6dfcbe..866d24af 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; import li.cil.ceres.api.Serialized; -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.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.sedna.riscv.R5Board; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/common/vm/VirtualMachine.java b/src/main/java/li/cil/oc2r/common/vm/VirtualMachine.java index 699b75bd..3076fa84 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm; +package li.cil.oc2.common.vm; -import li.cil.oc2r.common.bus.CommonDeviceBusController; +import li.cil.oc2.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/oc2r/common/vm/context/EventManager.java b/src/main/java/li/cil/oc2r/common/vm/context/EventManager.java index 3d3275c5..28378cb5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context; +package li.cil.oc2.common.vm.context; public interface EventManager { void unregister(Object subscriber); diff --git a/src/main/java/li/cil/oc2r/common/vm/context/InterruptManager.java b/src/main/java/li/cil/oc2r/common/vm/context/InterruptManager.java index f5d75668..027cf4a1 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context; +package li.cil.oc2.common.vm.context; import java.util.BitSet; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/InterruptValidator.java b/src/main/java/li/cil/oc2r/common/vm/context/InterruptValidator.java index 368369e8..c52bddfc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context; +package li.cil.oc2.common.vm.context; public interface InterruptValidator { boolean isMaskValid(int mask); diff --git a/src/main/java/li/cil/oc2r/common/vm/context/MemoryRangeManager.java b/src/main/java/li/cil/oc2r/common/vm/context/MemoryRangeManager.java index 59691a55..bfc9bad4 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context; +package li.cil.oc2.common.vm.context; import li.cil.sedna.api.device.MemoryMappedDevice; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/VMContextManagerCollection.java b/src/main/java/li/cil/oc2r/common/vm/context/VMContextManagerCollection.java index 58fceb80..6c77ee26 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context; +package li.cil.oc2.common.vm.context; public interface VMContextManagerCollection { InterruptManager getInterruptManager(); diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalEventBus.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalEventBus.java index 7ee24193..f4144b2f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.common.vm.context.global; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.SubscriberExceptionContext; -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 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 org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptAllocator.java index c14b426a..eadf97ef 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.common.vm.context.global; -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 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 java.util.BitSet; import java.util.OptionalInt; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptController.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptController.java index 5744c07a..56d08aeb 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.common.vm.context.global; -import li.cil.oc2r.common.vm.context.InterruptValidator; +import li.cil.oc2.common.vm.context.InterruptValidator; import li.cil.sedna.api.device.InterruptController; final class GlobalInterruptController implements InterruptController { diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryAllocator.java index ccf3877c..ceb4e1a1 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.common.vm.context.global; -import li.cil.oc2r.api.bus.device.vm.context.MemoryAllocator; -import li.cil.oc2r.common.vm.Allocator; +import li.cil.oc2.api.bus.device.vm.context.MemoryAllocator; +import li.cil.oc2.common.vm.Allocator; import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryMap.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryMap.java index 9a35563e..793c6fb6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.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/oc2r/common/vm/context/global/GlobalMemoryRangeAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryRangeAllocator.java index 822c2b82..d9d5816a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.common.vm.context.global; import it.unimi.dsi.fastutil.objects.Object2LongArrayMap; import it.unimi.dsi.fastutil.objects.Object2LongMap; -import li.cil.oc2r.api.bus.device.vm.context.MemoryRangeAllocator; -import li.cil.oc2r.common.vm.context.MemoryRangeManager; +import li.cil.oc2.api.bus.device.vm.context.MemoryRangeAllocator; +import li.cil.oc2.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/oc2r/common/vm/context/global/GlobalVMContext.java b/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalVMContext.java index 4e39763f..1a8ca029 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.common.vm.context.global; import li.cil.ceres.api.Serialized; -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.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.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/oc2r/common/vm/context/global/MemoryRangeList.java b/src/main/java/li/cil/oc2r/common/vm/context/global/MemoryRangeList.java index 0b7dcf83..32f841e5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.global; +package li.cil.oc2.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 index 1b53b7ad..55d4086b 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.vm.context.global; +package li.cil.oc2.common.vm.context.global; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedEventBus.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedEventBus.java index 81b9fadd..d0fe29ce 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.managed; +package li.cil.oc2.common.vm.context.managed; -import li.cil.oc2r.api.bus.device.vm.context.VMLifecycleEventBus; -import li.cil.oc2r.common.vm.context.EventManager; +import li.cil.oc2.api.bus.device.vm.context.VMLifecycleEventBus; +import li.cil.oc2.common.vm.context.EventManager; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptAllocator.java index e8cbe162..0064ad88 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.managed; +package li.cil.oc2.common.vm.context.managed; -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 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 java.util.BitSet; import java.util.OptionalInt; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptController.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptController.java index 26d9f71a..c73082f9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.managed; +package li.cil.oc2.common.vm.context.managed; -import li.cil.oc2r.common.vm.context.InterruptValidator; +import li.cil.oc2.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/oc2r/common/vm/context/managed/ManagedMemoryAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryAllocator.java index 40d9fc70..98ed2a5c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.managed; +package li.cil.oc2.common.vm.context.managed; -import li.cil.oc2r.api.bus.device.vm.context.MemoryAllocator; -import li.cil.oc2r.common.vm.Allocator; +import li.cil.oc2.api.bus.device.vm.context.MemoryAllocator; +import li.cil.oc2.common.vm.Allocator; import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryMap.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryMap.java index a9be28d5..bd91d907 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.managed; +package li.cil.oc2.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/oc2r/common/vm/context/managed/ManagedMemoryRangeAllocator.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryRangeAllocator.java index 60e0b0f6..4a9907bb 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.managed; +package li.cil.oc2.common.vm.context.managed; -import li.cil.oc2r.api.bus.device.vm.context.MemoryRangeAllocator; -import li.cil.oc2r.common.vm.context.MemoryRangeManager; +import li.cil.oc2.api.bus.device.vm.context.MemoryRangeAllocator; +import li.cil.oc2.common.vm.context.MemoryRangeManager; import li.cil.sedna.api.device.MemoryMappedDevice; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedVMContext.java b/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedVMContext.java index 76c9632e..eaa6c061 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.context.managed; +package li.cil.oc2.common.vm.context.managed; -import li.cil.oc2r.api.bus.device.vm.context.*; -import li.cil.oc2r.common.vm.context.VMContextManagerCollection; +import li.cil.oc2.api.bus.device.vm.context.*; +import li.cil.oc2.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 index f0201dc0..1e0a9e06 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.vm.context.managed; +package li.cil.oc2.common.vm.context.managed; import net.minecraft.MethodsReturnNonnullByDefault; 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 index ba9a8427..f3b27499 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.vm.context; +package li.cil.oc2.common.vm.context; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/vm/device/PciRootPortDevice.java b/src/main/java/li/cil/oc2r/common/vm/device/PciRootPortDevice.java index e97ef0d8..34605d62 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.device; +package li.cil.oc2.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/oc2r/common/vm/device/SimpleFramebufferDevice.java b/src/main/java/li/cil/oc2r/common/vm/device/SimpleFramebufferDevice.java index ea34837c..2e680851 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.device; +package li.cil.oc2.common.vm.device; -import li.cil.oc2r.jcodec.common.model.Picture; -import li.cil.oc2r.jcodec.scale.RgbToYuv420j; +import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2.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/oc2r/common/vm/fs/LayeredFileSystem.java b/src/main/java/li/cil/oc2r/common/vm/fs/LayeredFileSystem.java index 03daaec4..1555f3a7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.fs; +package li.cil.oc2.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 index 3b2b9b87..a94c4a31 100644 --- 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 @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.vm.fs; +package li.cil.oc2.common.vm.fs; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/vm/package-info.java b/src/main/java/li/cil/oc2r/common/vm/package-info.java index b53ef283..780a7292 100644 --- a/src/main/java/li/cil/oc2r/common/vm/package-info.java +++ b/src/main/java/li/cil/oc2r/common/vm/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.common.vm; +package li.cil.oc2.common.vm; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/common/vm/provider/DeviceTreeProviders.java b/src/main/java/li/cil/oc2r/common/vm/provider/DeviceTreeProviders.java index 2d3714f7..912a47f6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.provider; +package li.cil.oc2.common.vm.provider; -import li.cil.oc2r.common.vm.device.PciRootPortDevice; -import li.cil.oc2r.common.vm.device.SimpleFramebufferDevice; +import li.cil.oc2.common.vm.device.PciRootPortDevice; +import li.cil.oc2.common.vm.device.SimpleFramebufferDevice; import li.cil.sedna.devicetree.DeviceTreeRegistry; public final class DeviceTreeProviders { diff --git a/src/main/java/li/cil/oc2r/common/vm/provider/PciRootPortDeviceProvider.java b/src/main/java/li/cil/oc2r/common/vm/provider/PciRootPortDeviceProvider.java index 7e5c19c1..514af517 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.provider; +package li.cil.oc2.common.vm.provider; -import li.cil.oc2r.common.vm.device.PciRootPortDevice; +import li.cil.oc2.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/oc2r/common/vm/provider/SimpleFramebufferDeviceProvider.java b/src/main/java/li/cil/oc2r/common/vm/provider/SimpleFramebufferDeviceProvider.java index a875de99..ac165c3c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.common.vm.provider; +package li.cil.oc2.common.vm.provider; -import li.cil.oc2r.common.vm.device.SimpleFramebufferDevice; +import li.cil.oc2.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/oc2r/common/vxlan/TunnelManager.java b/src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java index f28fff00..def122ef 100644 --- a/src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java +++ b/src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java @@ -1,7 +1,7 @@ -package li.cil.oc2r.common.vxlan; +package li.cil.oc2.common.vxlan; -import li.cil.oc2r.api.capabilities.NetworkInterface; -import li.cil.oc2r.common.Config; +import li.cil.oc2.api.capabilities.NetworkInterface; +import li.cil.oc2.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/oc2r/data/DataGenerators.java b/src/main/java/li/cil/oc2r/data/DataGenerators.java index 1381ad8c..eac532ac 100644 --- a/src/main/java/li/cil/oc2r/data/DataGenerators.java +++ b/src/main/java/li/cil/oc2r/data/DataGenerators.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; -import li.cil.oc2r.api.API; +import li.cil.oc2.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/oc2r/data/ModBlockStateProvider.java b/src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java index ccbf33fc..5a6399c5 100644 --- a/src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; -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 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 net.minecraft.core.Direction; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java b/src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java index 6ca99f14..33082310 100644 --- a/src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; -import li.cil.oc2r.api.API; +import li.cil.oc2.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.oc2r.common.block.Blocks.*; -import static li.cil.oc2r.common.tags.BlockTags.*; +import static li.cil.oc2.common.block.Blocks.*; +import static li.cil.oc2.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/oc2r/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java index 00f8eb13..79cdfa35 100644 --- a/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; -import li.cil.oc2r.api.API; -import li.cil.oc2r.common.entity.Entities; -import li.cil.oc2r.common.item.Items; +import li.cil.oc2.api.API; +import li.cil.oc2.common.entity.Entities; +import li.cil.oc2.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/oc2r/data/ModItemTagsProvider.java b/src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java index df9f8881..63ad5fdf 100644 --- a/src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; -import li.cil.oc2r.common.item.Items; -import li.cil.oc2r.common.tags.BlockTags; +import li.cil.oc2.common.item.Items; +import li.cil.oc2.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.oc2r.common.tags.ItemTags.*; +import static li.cil.oc2.common.tags.ItemTags.*; public final class ModItemTagsProvider extends ItemTagsProvider { public ModItemTagsProvider( diff --git a/src/main/java/li/cil/oc2r/data/ModLootTableProvider.java b/src/main/java/li/cil/oc2r/data/ModLootTableProvider.java index 540fbc86..fae0c9e5 100644 --- a/src/main/java/li/cil/oc2r/data/ModLootTableProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModLootTableProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; -import li.cil.oc2r.common.block.Blocks; +import li.cil.oc2.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.oc2r.common.Constants.*; +import static li.cil.oc2.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/oc2r/data/ModRecipesProvider.java b/src/main/java/li/cil/oc2r/data/ModRecipesProvider.java index 9c950c66..52aa4cd5 100644 --- a/src/main/java/li/cil/oc2r/data/ModRecipesProvider.java +++ b/src/main/java/li/cil/oc2r/data/ModRecipesProvider.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; -import li.cil.oc2r.common.item.Items; +import li.cil.oc2.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/oc2r/data/WrenchRecipeBuilder.java b/src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java index e87b0b39..ae052221 100644 --- a/src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java +++ b/src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.data; +package li.cil.oc2.data; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import li.cil.oc2r.common.item.Items; -import li.cil.oc2r.common.item.crafting.RecipeSerializers; +import li.cil.oc2.common.item.Items; +import li.cil.oc2.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/oc2r/data/package-info.java b/src/main/java/li/cil/oc2r/data/package-info.java index 4a321d19..0e56eff2 100644 --- a/src/main/java/li/cil/oc2r/data/package-info.java +++ b/src/main/java/li/cil/oc2r/data/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.data; +package li.cil.oc2.data; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MConst.java b/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MConst.java index aacab085..95761cf5 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.common.biari; +package li.cil.oc2.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/oc2r/jcodec/codecs/common/biari/MDecoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MDecoder.java index 13b5a740..72001509 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.common.biari; +package li.cil.oc2.jcodec.codecs.common.biari; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Const.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Const.java index d06b2e3f..7827ad95 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264; +package li.cil.oc2.jcodec.codecs.h264; -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 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 java.util.Arrays; -import static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/H264Decoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Decoder.java index 060093ad..0c45c158 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264; +package li.cil.oc2.jcodec.codecs.h264; -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 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 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.oc2r.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/H264Encoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Encoder.java index 9d46efa2..ed96d6b8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264; +package li.cil.oc2.jcodec.codecs.h264; -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 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 java.nio.ByteBuffer; import java.util.LinkedList; import java.util.List; -import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.escapeNAL; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/H264Utils.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Utils.java index e532467b..7adef5ad 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264; +package li.cil.oc2.jcodec.codecs.h264; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/POCManager.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/POCManager.java index e55afe7c..7af4e12f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264; +package li.cil.oc2.jcodec.codecs.h264; -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 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 static li.cil.oc2r.jcodec.codecs.h264.io.model.NALUnitType.IDR_SLICE; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/BlockInterpolator.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/BlockInterpolator.java index 2c8c8688..2bc99059 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.common.model.Picture; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2.jcodec.common.tools.MathUtil; import static java.lang.System.arraycopy; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CABACContst.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CABACContst.java index 134f7eed..a1682e06 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/CAVLCReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CAVLCReader.java index e4f3597b..63e389e7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.codecs.h264.H264Utils; -import li.cil.oc2r.jcodec.common.io.BitReader; +import li.cil.oc2.jcodec.codecs.h264.H264Utils; +import li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java index 3bc75bff..f0c572e3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.tools.MathUtil; -import static li.cil.oc2r.jcodec.codecs.h264.H264Const.CHROMA_BLOCK_LUT; -import static li.cil.oc2r.jcodec.codecs.h264.H264Const.CHROMA_POS_LUT; +import static li.cil.oc2.jcodec.codecs.h264.H264Const.CHROMA_BLOCK_LUT; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/CoeffTransformer.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CoeffTransformer.java index c6bdce5d..9e8cbeb7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.common.ArrayUtil; +import li.cil.oc2.jcodec.common.ArrayUtil; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DeblockerInput.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DeblockerInput.java index dac26caf..f8671b01 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 static li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet.getPicHeightInMbs; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/DecoderState.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DecoderState.java index 8c0b4675..eb349a1d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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; +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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/FrameReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/FrameReader.java index 13979d05..86a83906 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.unescapeNAL; -import static li.cil.oc2r.jcodec.codecs.h264.io.model.NALUnitType.*; +import static li.cil.oc2.jcodec.codecs.h264.H264Utils.unescapeNAL; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java index cefe0e4e..338b904b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.common.ArrayUtil; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.ArrayUtil; +import li.cil.oc2.jcodec.common.tools.MathUtil; -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; +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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java index c60e1119..17bfdb0f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java index f4a238dc..dca8cfc2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.tools.MathUtil; import static com.google.common.base.Preconditions.checkState; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlock.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlock.java index ef9e76e3..fd18a290 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 java.util.Arrays; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java index ca0cae3a..fd5bf56d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 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.*; +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.*; /** * A decoder for B direct macroblocks diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBase.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBase.java index fbcdea16..21ce8261 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 java.util.Arrays; -import static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; -import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java index 0f69883a..4754532b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -import li.cil.oc2r.jcodec.codecs.h264.decode.aso.Mapper; -import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2.jcodec.codecs.h264.decode.aso.Mapper; +import li.cil.oc2.jcodec.common.model.Picture; -import static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.collectPredictors; -import static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.saveVectIntra; +import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.collectPredictors; +import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.saveVectIntra; /** * A decoder for Intra PCM macroblocks diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter.java index dfe5e119..adcd4026 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 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; +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; /** * A decoder for Inter 16x16, 16x8 and 8x16 macroblocks diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java index 12035233..8d6e68e3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 java.util.Arrays; -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.*; +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.*; /** * A decoder for Inter 16x16, 16x8 and 8x16 macroblocks diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java index dcfe4bc1..5640b858 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 static li.cil.oc2r.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; +import static li.cil.oc2.jcodec.codecs.h264.decode.MBlockDecoderUtils.*; /** * A decoder for I16x16 macroblocks diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java index 4c580fbd..7626bb76 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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; +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; /** * A decoder for I16x16 macroblocks diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderUtils.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderUtils.java index 417d598d..c7c1ff90 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 static java.lang.System.arraycopy; -import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/MBlockSkipDecoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockSkipDecoder.java index e10b04ae..27e67331 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 java.util.Arrays; -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; +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; /** * A decoder for P skip macroblocks diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/PredictionMerger.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/PredictionMerger.java index 2000825a..eaf56c9c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 static li.cil.oc2r.jcodec.codecs.h264.H264Const.PartPred.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/RefListManager.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/RefListManager.java index d153deb1..0eff1230 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 java.util.Arrays; import java.util.Comparator; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceDecoder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceDecoder.java index ff598054..aa03b692 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 static java.lang.System.arraycopy; -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; +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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceHeaderReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceHeaderReader.java index e65d682f..dd389a89 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 java.util.ArrayList; -import static li.cil.oc2r.jcodec.codecs.h264.io.model.SeqParameterSet.getPicHeightInMbs; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/SliceReader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceReader.java index c0977783..ab29cac3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode; +package li.cil.oc2.jcodec.codecs.h264.decode; -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 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 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.*; +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.*; /** * Contains methods for reading high-level symbols out of H.264 bitstream diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java index 0ebb0921..9a796423 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode.aso; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java index ba2f55c7..cdc5e395 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode.aso; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/aso/MapManager.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MapManager.java index 6e0bb2e6..f49738e2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode.aso; +package li.cil.oc2.jcodec.codecs.h264.decode.aso; -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.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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/Mapper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/Mapper.java index 66c7f856..d32165dd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode.aso; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java index b849bd78..7dcac178 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode.aso; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java index ce01ac43..516c3049 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode.aso; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java index ed31d638..ed5c66df 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.decode.deblock; +package li.cil.oc2.jcodec.codecs.h264.decode.deblock; -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 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 static java.lang.Math.abs; -import static li.cil.oc2r.jcodec.codecs.h264.H264Utils.Mv.*; -import static li.cil.oc2r.jcodec.common.tools.MathUtil.clip; +import static li.cil.oc2.jcodec.codecs.h264.H264Utils.Mv.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/encode/CQPRateControl.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/CQPRateControl.java index 1512ffec..952aafac 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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; +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; /** * Constant QP with psyvisual adjustments diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodedMB.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodedMB.java index 962f6991..73e31c1c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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; +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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodingContext.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodingContext.java index 95d2bc2d..8aea05cf 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -import li.cil.oc2r.jcodec.codecs.h264.io.CAVLC; -import li.cil.oc2r.jcodec.codecs.h264.io.model.MBType; +import li.cil.oc2.jcodec.codecs.h264.io.CAVLC; +import li.cil.oc2.jcodec.codecs.h264.io.model.MBType; import static java.lang.System.arraycopy; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/H264EncoderUtils.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/H264EncoderUtils.java index 781130ce..4fea10ea 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/IntraPredEstimator.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/IntraPredEstimator.java index 45075166..2ee1eb13 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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 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 java.util.Arrays; -import static li.cil.oc2r.jcodec.codecs.h264.H264Const.BLK_DISP_MAP; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/encode/MBDeblocker.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBDeblocker.java index 1ac9cf82..e51c7bd3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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 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 static java.lang.Math.abs; -import static li.cil.oc2r.jcodec.codecs.h264.H264Const.QP_SCALE_CR; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/encode/MBEncoderHelper.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBEncoderHelper.java index 7c89af38..0736d9bd 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -import li.cil.oc2r.jcodec.common.model.Picture; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2.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/oc2r/jcodec/codecs/h264/encode/MBWriterI16x16.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterI16x16.java index a87caa5b..510a25f3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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 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 static li.cil.oc2r.jcodec.codecs.h264.H264Const.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/encode/MBWriterINxN.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterINxN.java index 87166146..edc20896 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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 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 static li.cil.oc2r.jcodec.codecs.h264.H264Const.BLK_DISP_MAP; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/encode/MBWriterP16x16.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterP16x16.java index 2ac8b24f..53da9b89 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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 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 java.util.Arrays; -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; +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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MotionEstimator.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MotionEstimator.java index b9d84dd9..02b6fef6 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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 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 static java.lang.Math.min; -import static li.cil.oc2r.jcodec.codecs.h264.encode.H264EncoderUtils.median; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/encode/RateControl.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/RateControl.java index 591d9935..0fffd182 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.encode; +package li.cil.oc2.jcodec.codecs.h264.encode; -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.oc2.jcodec.codecs.h264.io.model.SliceType; +import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/CABAC.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CABAC.java index a03254f8..66c2ffb2 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io; +package li.cil.oc2.jcodec.codecs.h264.io; -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 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 static li.cil.oc2r.jcodec.codecs.h264.io.CABAC.BlockType.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/CAVLC.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CAVLC.java index 02084536..62381f03 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io; +package li.cil.oc2.jcodec.codecs.h264.io; -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; +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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/AspectRatio.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/AspectRatio.java index e76f5ad7..f3ec6080 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/Frame.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/Frame.java index 7d2ad0be..590aa2d8 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.jcodec.codecs.h264.io.model; -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 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 java.util.Comparator; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/HRDParameters.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/HRDParameters.java index 1f1d3408..33ef6145 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/MBType.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/MBType.java index a76ed76a..ff741aae 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/NALUnit.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnit.java index 257936cb..0c169c4a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.jcodec.codecs.h264.io.model; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnitType.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnitType.java index d7a99f3d..4a32a143 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/PictureParameterSet.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PictureParameterSet.java index 202fa381..2d0e026d 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.jcodec.codecs.h264.io.model; -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.oc2.jcodec.codecs.h264.decode.CAVLCReader; +import li.cil.oc2.jcodec.common.io.BitReader; +import li.cil.oc2.jcodec.common.io.BitWriter; import java.nio.ByteBuffer; import java.util.Arrays; -import static li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/PredictionWeightTable.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PredictionWeightTable.java index bae5b4e0..9bda9784 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/RefPicMarking.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarking.java index 8582d850..b4e65aef 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java index 86abe051..8bfc8d18 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/SeqParameterSet.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SeqParameterSet.java index 69b255ab..25f1cda3 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.jcodec.codecs.h264.io.model; -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 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 java.nio.ByteBuffer; import java.util.Arrays; -import static li.cil.oc2r.jcodec.codecs.h264.io.write.CAVLCWriter.*; +import static li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/SliceHeader.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceHeader.java index 15a67702..79600dd1 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/SliceType.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceType.java index d98793dc..9aa610d7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/model/VUIParameters.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/VUIParameters.java index 8297ae6a..48ff42c0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.model; +package li.cil.oc2.jcodec.codecs.h264.io.model; /** * This class is part of JCodec ( www.jcodec.org ) diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/CAVLCWriter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/CAVLCWriter.java index 8f0d2e90..a070988b 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.write; +package li.cil.oc2.jcodec.codecs.h264.io.write; -import li.cil.oc2r.jcodec.common.io.BitWriter; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.io.BitWriter; +import li.cil.oc2.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/oc2r/jcodec/codecs/h264/io/write/SliceHeaderWriter.java b/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/SliceHeaderWriter.java index e04bb3d4..60b71fee 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.codecs.h264.io.write; +package li.cil.oc2.jcodec.codecs.h264.io.write; -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; +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; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/common/ArrayUtil.java b/src/main/java/li/cil/oc2r/jcodec/common/ArrayUtil.java index 3d98f57b..799135dc 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common; +package li.cil.oc2.jcodec.common; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/common/IntArrayList.java b/src/main/java/li/cil/oc2r/jcodec/common/IntArrayList.java index ff91c9d2..9e9aeb4e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common; +package li.cil.oc2.jcodec.common; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2r/jcodec/common/IntObjectMap.java b/src/main/java/li/cil/oc2r/jcodec/common/IntObjectMap.java index 437c0ef6..574e1962 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common; +package li.cil.oc2.jcodec.common; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2r/jcodec/common/VideoDecoder.java b/src/main/java/li/cil/oc2r/jcodec/common/VideoDecoder.java index f48b9a8d..d7c1870c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common; +package li.cil.oc2.jcodec.common; -import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2.jcodec.common.model.Picture; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2r/jcodec/common/VideoEncoder.java b/src/main/java/li/cil/oc2r/jcodec/common/VideoEncoder.java index 30184b18..40476b2e 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common; +package li.cil.oc2.jcodec.common; -import li.cil.oc2r.jcodec.common.model.ColorSpace; -import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2.jcodec.common.model.ColorSpace; +import li.cil.oc2.jcodec.common.model.Picture; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/BitReader.java b/src/main/java/li/cil/oc2r/jcodec/common/io/BitReader.java index 94c4b4b0..bf579b1c 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.io; +package li.cil.oc2.jcodec.common.io; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/BitWriter.java b/src/main/java/li/cil/oc2r/jcodec/common/io/BitWriter.java index 6046ef33..3da21507 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.io; +package li.cil.oc2.jcodec.common.io; import java.nio.ByteBuffer; diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/VLC.java b/src/main/java/li/cil/oc2r/jcodec/common/io/VLC.java index 066ef348..e2f0ba49 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.io; +package li.cil.oc2.jcodec.common.io; -import li.cil.oc2r.jcodec.common.IntArrayList; +import li.cil.oc2.jcodec.common.IntArrayList; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/VLCBuilder.java b/src/main/java/li/cil/oc2r/jcodec/common/io/VLCBuilder.java index 3fffd07b..d98a684f 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.io; +package li.cil.oc2.jcodec.common.io; import it.unimi.dsi.fastutil.ints.Int2IntArrayMap; -import li.cil.oc2r.jcodec.common.IntArrayList; +import li.cil.oc2.jcodec.common.IntArrayList; /** diff --git a/src/main/java/li/cil/oc2r/jcodec/common/model/ColorSpace.java b/src/main/java/li/cil/oc2r/jcodec/common/model/ColorSpace.java index a2973cb1..24b5e382 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.model; +package li.cil.oc2.jcodec.common.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/common/model/Picture.java b/src/main/java/li/cil/oc2r/jcodec/common/model/Picture.java index 556a5968..ecf7278a 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.model; +package li.cil.oc2.jcodec.common.model; import java.util.Arrays; diff --git a/src/main/java/li/cil/oc2r/jcodec/common/model/Size.java b/src/main/java/li/cil/oc2r/jcodec/common/model/Size.java index 3d8319ed..54047e46 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.model; +package li.cil.oc2.jcodec.common.model; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/common/tools/MathUtil.java b/src/main/java/li/cil/oc2r/jcodec/common/tools/MathUtil.java index a99d296d..a3f274a7 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.common.tools; +package li.cil.oc2.jcodec.common.tools; /** * This class is part of JCodec ( www.jcodec.org ) This software is distributed diff --git a/src/main/java/li/cil/oc2r/jcodec/scale/RgbToYuv420j.java b/src/main/java/li/cil/oc2r/jcodec/scale/RgbToYuv420j.java index 00512822..921445e9 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.scale; +package li.cil.oc2.jcodec.scale; -import li.cil.oc2r.jcodec.common.model.Picture; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2.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/oc2r/jcodec/scale/Transform.java b/src/main/java/li/cil/oc2r/jcodec/scale/Transform.java index 4a0d7a2d..836a2bc0 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.scale; +package li.cil.oc2.jcodec.scale; -import li.cil.oc2r.jcodec.common.model.Picture; +import li.cil.oc2.jcodec.common.model.Picture; /** * This class is part of JCodec ( www.jcodec.org ) diff --git a/src/main/java/li/cil/oc2r/jcodec/scale/Yuv420jToRgb.java b/src/main/java/li/cil/oc2r/jcodec/scale/Yuv420jToRgb.java index 852199f5..a1ca7951 100644 --- a/src/main/java/li/cil/oc2r/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.oc2r.jcodec.scale; +package li.cil.oc2.jcodec.scale; -import li.cil.oc2r.jcodec.common.model.Picture; -import li.cil.oc2r.jcodec.common.tools.MathUtil; +import li.cil.oc2.jcodec.common.model.Picture; +import li.cil.oc2.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 3063e48d..90f803fa 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,10 +1,10 @@ modLoader = "javafml" loaderVersion = "[47,)" -issueTrackerURL = "https://github.com/fnuecke/oc2r/issues" +issueTrackerURL = "https://github.com/perkinslr/oc2r/issues" license = "MIT" [[mods]] -modId = "oc2r" +modId = "oc2" version = "${file.jarVersion}" displayName = "OpenComputers II: Reimagined" authors = "North Western Development (Originally by Sangar)" @@ -14,30 +14,30 @@ 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.oc2r]] +[[dependencies.oc2]] modId = "forge" mandatory = true versionRange = "[40.1.68,)" ordering = "NONE" side = "BOTH" -[[dependencies.oc2r]] +[[dependencies.oc2]] modId = "minecraft" mandatory = true versionRange = "1.20.1" ordering = "NONE" side = "BOTH" -[[dependencies.oc2r]] +[[dependencies.oc2]] modId = "sedna" mandatory = true versionRange = "[1.0.14,)" ordering = "NONE" side = "BOTH" -[[dependencies.oc2r]] +[[dependencies.oc2]] modId = "markdown_manual" mandatory = true versionRange = "[1.2.1,)" side = "CLIENT" -[[dependencies.oc2r]] +[[dependencies.oc2]] modId = "projectred_transmission" mandatory = false versionRange = "[4.19.0,)" diff --git a/src/main/resources/assets/oc2r/blockstates/bus_cable.json b/src/main/resources/assets/oc2r/blockstates/bus_cable.json index 3a529bb3..fa635cd8 100644 --- a/src/main/resources/assets/oc2r/blockstates/bus_cable.json +++ b/src/main/resources/assets/oc2r/blockstates/bus_cable.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "oc2r:block/cable_base" + "model": "oc2:block/cable_base" } }, { @@ -11,7 +11,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_link", + "model": "oc2:block/cable_link", "x": -90, "y": 270 } @@ -22,7 +22,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_plug", + "model": "oc2:block/cable_plug", "x": -90, "y": 270 } @@ -33,7 +33,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_link", + "model": "oc2:block/cable_link", "x": 90, "y": 270 } @@ -44,7 +44,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_plug", + "model": "oc2:block/cable_plug", "x": 90, "y": 270 } @@ -55,7 +55,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_link", + "model": "oc2:block/cable_link", "y": 180 } }, @@ -65,7 +65,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_plug", + "model": "oc2:block/cable_plug", "y": 180 } }, @@ -75,7 +75,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_link" + "model": "oc2:block/cable_link" } }, { @@ -84,7 +84,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_plug" + "model": "oc2:block/cable_plug" } }, { @@ -93,7 +93,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_link", + "model": "oc2:block/cable_link", "y": 90 } }, @@ -103,7 +103,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_plug", + "model": "oc2:block/cable_plug", "y": 90 } }, @@ -113,7 +113,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_link", + "model": "oc2:block/cable_link", "y": 270 } }, @@ -123,7 +123,7 @@ "has_facade": "false" }, "apply": { - "model": "oc2r:block/cable_plug", + "model": "oc2:block/cable_plug", "y": 270 } } diff --git a/src/main/resources/assets/oc2r/blockstates/charger.json b/src/main/resources/assets/oc2r/blockstates/charger.json index 34d24703..f91bbeed 100644 --- a/src/main/resources/assets/oc2r/blockstates/charger.json +++ b/src/main/resources/assets/oc2r/blockstates/charger.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/charger" + "model": "oc2:block/charger" }, "facing=south": { - "model": "oc2r:block/charger", + "model": "oc2:block/charger", "y": 180 }, "facing=west": { - "model": "oc2r:block/charger", + "model": "oc2:block/charger", "y": 270 }, "facing=east": { - "model": "oc2r:block/charger", + "model": "oc2:block/charger", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/computer.json b/src/main/resources/assets/oc2r/blockstates/computer.json index f13155d7..023c5106 100644 --- a/src/main/resources/assets/oc2r/blockstates/computer.json +++ b/src/main/resources/assets/oc2r/blockstates/computer.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/computer" + "model": "oc2:block/computer" }, "facing=south": { - "model": "oc2r:block/computer", + "model": "oc2:block/computer", "y": 180 }, "facing=west": { - "model": "oc2r:block/computer", + "model": "oc2:block/computer", "y": 270 }, "facing=east": { - "model": "oc2r:block/computer", + "model": "oc2: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 index 75bd6b82..6be1c44e 100644 --- a/src/main/resources/assets/oc2r/blockstates/creative_energy.json +++ b/src/main/resources/assets/oc2r/blockstates/creative_energy.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "oc2r:block/creative_energy" + "model": "oc2: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 index 12f20b4f..b72941fe 100644 --- a/src/main/resources/assets/oc2r/blockstates/disk_drive.json +++ b/src/main/resources/assets/oc2r/blockstates/disk_drive.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/disk_drive" + "model": "oc2:block/disk_drive" }, "facing=south": { - "model": "oc2r:block/disk_drive", + "model": "oc2:block/disk_drive", "y": 180 }, "facing=west": { - "model": "oc2r:block/disk_drive", + "model": "oc2:block/disk_drive", "y": 270 }, "facing=east": { - "model": "oc2r:block/disk_drive", + "model": "oc2: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 index 0b2976cc..be0a273c 100644 --- a/src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json +++ b/src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/flash_memory_flasher" + "model": "oc2:block/flash_memory_flasher" }, "facing=south": { - "model": "oc2r:block/flash_memory_flasher", + "model": "oc2:block/flash_memory_flasher", "y": 180 }, "facing=west": { - "model": "oc2r:block/flash_memory_flasher", + "model": "oc2:block/flash_memory_flasher", "y": 270 }, "facing=east": { - "model": "oc2r:block/flash_memory_flasher", + "model": "oc2:block/flash_memory_flasher", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/keyboard.json b/src/main/resources/assets/oc2r/blockstates/keyboard.json index 276023b0..7d14a478 100644 --- a/src/main/resources/assets/oc2r/blockstates/keyboard.json +++ b/src/main/resources/assets/oc2r/blockstates/keyboard.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/keyboard" + "model": "oc2:block/keyboard" }, "facing=south": { - "model": "oc2r:block/keyboard", + "model": "oc2:block/keyboard", "y": 180 }, "facing=west": { - "model": "oc2r:block/keyboard", + "model": "oc2:block/keyboard", "y": 270 }, "facing=east": { - "model": "oc2r:block/keyboard", + "model": "oc2:block/keyboard", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/monitor.json b/src/main/resources/assets/oc2r/blockstates/monitor.json index 197642b5..f24d17b1 100644 --- a/src/main/resources/assets/oc2r/blockstates/monitor.json +++ b/src/main/resources/assets/oc2r/blockstates/monitor.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/monitor" + "model": "oc2:block/monitor" }, "facing=south": { - "model": "oc2r:block/monitor", + "model": "oc2:block/monitor", "y": 180 }, "facing=west": { - "model": "oc2r:block/monitor", + "model": "oc2:block/monitor", "y": 270 }, "facing=east": { - "model": "oc2r:block/monitor", + "model": "oc2:block/monitor", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/network_connector.json b/src/main/resources/assets/oc2r/blockstates/network_connector.json index 19baa4c0..7a6873de 100644 --- a/src/main/resources/assets/oc2r/blockstates/network_connector.json +++ b/src/main/resources/assets/oc2r/blockstates/network_connector.json @@ -1,55 +1,55 @@ { "variants": { "face=floor,facing=north": { - "model": "oc2r:block/network_connector" + "model": "oc2:block/network_connector" }, "face=wall,facing=north": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 90 }, "face=ceiling,facing=north": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 180, "y": 180 }, "face=floor,facing=south": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "y": 180 }, "face=wall,facing=south": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 90, "y": 180 }, "face=ceiling,facing=south": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 180 }, "face=floor,facing=west": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "y": 270 }, "face=wall,facing=west": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 90, "y": 270 }, "face=ceiling,facing=west": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 180, "y": 90 }, "face=floor,facing=east": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "y": 90 }, "face=wall,facing=east": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 90, "y": 90 }, "face=ceiling,facing=east": { - "model": "oc2r:block/network_connector", + "model": "oc2:block/network_connector", "x": 180, "y": 270 } diff --git a/src/main/resources/assets/oc2r/blockstates/network_hub.json b/src/main/resources/assets/oc2r/blockstates/network_hub.json index 9e790fa4..99bb9127 100644 --- a/src/main/resources/assets/oc2r/blockstates/network_hub.json +++ b/src/main/resources/assets/oc2r/blockstates/network_hub.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/network_hub" + "model": "oc2:block/network_hub" }, "facing=south": { - "model": "oc2r:block/network_hub", + "model": "oc2:block/network_hub", "y": 180 }, "facing=west": { - "model": "oc2r:block/network_hub", + "model": "oc2:block/network_hub", "y": 270 }, "facing=east": { - "model": "oc2r:block/network_hub", + "model": "oc2:block/network_hub", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/network_switch.json b/src/main/resources/assets/oc2r/blockstates/network_switch.json index eb2f9747..cb558822 100644 --- a/src/main/resources/assets/oc2r/blockstates/network_switch.json +++ b/src/main/resources/assets/oc2r/blockstates/network_switch.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/network_switch" + "model": "oc2:block/network_switch" }, "facing=south": { - "model": "oc2r:block/network_switch", + "model": "oc2:block/network_switch", "y": 180 }, "facing=west": { - "model": "oc2r:block/network_switch", + "model": "oc2:block/network_switch", "y": 270 }, "facing=east": { - "model": "oc2r:block/network_switch", + "model": "oc2:block/network_switch", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/pci_card_cage.json b/src/main/resources/assets/oc2r/blockstates/pci_card_cage.json index e1fe97ee..769b106f 100644 --- a/src/main/resources/assets/oc2r/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": "oc2r:block/pci_card_cage" + "model": "oc2:block/pci_card_cage" }, "facing=south,lit=false": { - "model": "oc2r:block/pci_card_cage", + "model": "oc2:block/pci_card_cage", "y": 180 }, "facing=west,lit=false": { - "model": "oc2r:block/pci_card_cage", + "model": "oc2:block/pci_card_cage", "y": 270 }, "facing=east,lit=false": { - "model": "oc2r:block/pci_card_cage", + "model": "oc2:block/pci_card_cage", "y": 90 }, "facing=north,lit=true": { - "model": "oc2r:block/pci_card_cage" + "model": "oc2:block/pci_card_cage" }, "facing=south,lit=true": { - "model": "oc2r:block/pci_card_cage", + "model": "oc2:block/pci_card_cage", "y": 180 }, "facing=west,lit=true": { - "model": "oc2r:block/pci_card_cage", + "model": "oc2:block/pci_card_cage", "y": 270 }, "facing=east,lit=true": { - "model": "oc2r:block/pci_card_cage", + "model": "oc2:block/pci_card_cage", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/projector.json b/src/main/resources/assets/oc2r/blockstates/projector.json index eebe0ffd..c9124c5c 100644 --- a/src/main/resources/assets/oc2r/blockstates/projector.json +++ b/src/main/resources/assets/oc2r/blockstates/projector.json @@ -1,33 +1,33 @@ { "variants": { "facing=north,lit=false": { - "model": "oc2r:block/projector" + "model": "oc2:block/projector" }, "facing=south,lit=false": { - "model": "oc2r:block/projector", + "model": "oc2:block/projector", "y": 180 }, "facing=west,lit=false": { - "model": "oc2r:block/projector", + "model": "oc2:block/projector", "y": 270 }, "facing=east,lit=false": { - "model": "oc2r:block/projector", + "model": "oc2:block/projector", "y": 90 }, "facing=north,lit=true": { - "model": "oc2r:block/projector" + "model": "oc2:block/projector" }, "facing=south,lit=true": { - "model": "oc2r:block/projector", + "model": "oc2:block/projector", "y": 180 }, "facing=west,lit=true": { - "model": "oc2r:block/projector", + "model": "oc2:block/projector", "y": 270 }, "facing=east,lit=true": { - "model": "oc2r:block/projector", + "model": "oc2:block/projector", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/redstone_interface.json b/src/main/resources/assets/oc2r/blockstates/redstone_interface.json index a37c62e1..2fed34fc 100644 --- a/src/main/resources/assets/oc2r/blockstates/redstone_interface.json +++ b/src/main/resources/assets/oc2r/blockstates/redstone_interface.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/redstone_interface" + "model": "oc2:block/redstone_interface" }, "facing=south": { - "model": "oc2r:block/redstone_interface", + "model": "oc2:block/redstone_interface", "y": 180 }, "facing=west": { - "model": "oc2r:block/redstone_interface", + "model": "oc2:block/redstone_interface", "y": 270 }, "facing=east": { - "model": "oc2r:block/redstone_interface", + "model": "oc2:block/redstone_interface", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/blockstates/vxlan_hub.json b/src/main/resources/assets/oc2r/blockstates/vxlan_hub.json index 093f5c10..c951dc4e 100644 --- a/src/main/resources/assets/oc2r/blockstates/vxlan_hub.json +++ b/src/main/resources/assets/oc2r/blockstates/vxlan_hub.json @@ -1,18 +1,18 @@ { "variants": { "facing=north": { - "model": "oc2r:block/vxlan_hub" + "model": "oc2:block/vxlan_hub" }, "facing=south": { - "model": "oc2r:block/vxlan_hub", + "model": "oc2:block/vxlan_hub", "y": 180 }, "facing=west": { - "model": "oc2r:block/vxlan_hub", + "model": "oc2:block/vxlan_hub", "y": 270 }, "facing=east": { - "model": "oc2r:block/vxlan_hub", + "model": "oc2:block/vxlan_hub", "y": 90 } } diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/bus_cable.md b/src/main/resources/assets/oc2r/doc/en_us/block/bus_cable.md index 699ef9cf..3ca641d8 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:bus_cable) +![Party Bus](block:oc2:bus_cable) The bus cable connects [bus interfaces](bus_interface.md) to a computer. diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/bus_interface.md b/src/main/resources/assets/oc2r/doc/en_us/block/bus_interface.md index bdda5162..11cafbc8 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:bus_interface) +![Plug and play](item:oc2: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/oc2r/doc/en_us/block/charger.md b/src/main/resources/assets/oc2r/doc/en_us/block/charger.md index 9e3cc579..6c72f1da 100644 --- a/src/main/resources/assets/oc2r/doc/en_us/block/charger.md +++ b/src/main/resources/assets/oc2r/doc/en_us/block/charger.md @@ -1,5 +1,5 @@ # Charger -![Codename: Leeroy](block:oc2r:charger) +![Codename: Leeroy](block:oc2:charger) The charger transfers energy from a connected power source to energy consumers on top of it. diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/computer.md b/src/main/resources/assets/oc2r/doc/en_us/block/computer.md index dfcf5cbc..51dcc1de 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:computer) +![1 + 1 = 10](block:oc2: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/oc2r/doc/en_us/block/disk_drive.md b/src/main/resources/assets/oc2r/doc/en_us/block/disk_drive.md index 88a972fe..e655359a 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:disk_drive) +![Taking it for a spin](block:oc2: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/oc2r/doc/en_us/block/flash_memory_flasher.md b/src/main/resources/assets/oc2r/doc/en_us/block/flash_memory_flasher.md index 963b794c..625c20fe 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:flash_memory_flasher) +![Flashes before your eyes](block:oc2: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/oc2r/doc/en_us/block/keyboard.md b/src/main/resources/assets/oc2r/doc/en_us/block/keyboard.md index d344bb67..730070c9 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:keyboard) +![To click or not to click](block:oc2: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/oc2r/doc/en_us/block/monitor.md b/src/main/resources/assets/oc2r/doc/en_us/block/monitor.md index e2737c43..bd4350b1 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:monitor) +![Monitor](block:oc2: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/oc2r/doc/en_us/block/network_connector.md b/src/main/resources/assets/oc2r/doc/en_us/block/network_connector.md index 5da95b0f..26ad85ce 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_connector) +![The data must flow](block:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/network_hub.md b/src/main/resources/assets/oc2r/doc/en_us/block/network_hub.md index f59f734e..ce2738c7 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_hub) +![One to five](block:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/projector.md b/src/main/resources/assets/oc2r/doc/en_us/block/projector.md index c3d686d7..75f62e73 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:projector) +![Shadow on the wall](block:oc2: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/oc2r/doc/en_us/block/redstone_interface.md b/src/main/resources/assets/oc2r/doc/en_us/block/redstone_interface.md index 88449cc0..71c2e821 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:redstone_interface) +![Everything Red](block:oc2:redstone_interface) The redstone interface provides an omnidirectional bus to receive and emit redstone signals. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/block_operations_module.md b/src/main/resources/assets/oc2r/doc/en_us/item/block_operations_module.md index 89089b15..87c5172c 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:block_operations_module) +![Break it, quick replace it](item:oc2:block_operations_module) The block operations module provides to [robots](robot.md) the ability to break and place blocks in the world. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/file_import_export_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/file_import_export_card.md index af000214..12f73381 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:file_import_export_card) +![Tear down this wall!](item:oc2: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). diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/flash_memory.md b/src/main/resources/assets/oc2r/doc/en_us/item/flash_memory.md index d089e1a1..645c256f 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:flash_memory) +![Not that Flash](item:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/floppy.md b/src/main/resources/assets/oc2r/doc/en_us/item/floppy.md index af651b1e..3cc19e2c 100644 --- a/src/main/resources/assets/oc2r/doc/en_us/item/floppy.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/floppy.md @@ -1,5 +1,5 @@ # Floppy -![It's not the floppy that bends](item:oc2r:floppy) +![It's not the floppy that bends](item:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md b/src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md index bdbe90bf..4f2df52c 100644 --- a/src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md @@ -1,5 +1,5 @@ # Hard Drive -![Going in circles](item:oc2r:hard_drive_large) +![Going in circles](item:oc2:hard_drive_large) Hard drives are the main storage device used for data storage in [computers](../block/computer.md) and [robots](robot.md). diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/inventory_operations_module.md b/src/main/resources/assets/oc2r/doc/en_us/item/inventory_operations_module.md index 95a6020c..0d92757a 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:inventory_operations_module) +![What's yours is mine](item:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/manual.md b/src/main/resources/assets/oc2r/doc/en_us/item/manual.md index d26b84b1..afab9bb7 100644 --- a/src/main/resources/assets/oc2r/doc/en_us/item/manual.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/manual.md @@ -1,5 +1,5 @@ # The Computerists Handbook -![Nobody reads me anyway...](item:oc2r:manual) +![Nobody reads me anyway...](item:oc2: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! diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/memory.md b/src/main/resources/assets/oc2r/doc/en_us/item/memory.md index 7875cffe..6409f77e 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:memory_large) +![Random Access Memories](item:oc2:memory_large) The random access memory (RAM) device provides working memory to [computers](../block/computer.md) and [robots](robot.md). diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md index e06e1308..32cc8714 100644 --- a/src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md @@ -1,5 +1,5 @@ # Network Cable -![What the CAT!?](item:oc2r:network_cable) +![What the CAT!?](item:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/network_interface_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_interface_card.md index 5f512306..1e3a307e 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_interface_card) +![Talk to strangers](item:oc2: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/oc2r/doc/en_us/item/network_tunnel_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_card.md index 9c6fb1c3..3b91fdf6 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_tunnel_card) +![Tunnel vision?](item:oc2: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/oc2r/doc/en_us/item/network_tunnel_module.md b/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_module.md index d1152a94..c1544cf1 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_tunnel_module) +![Tunnel vision?](item:oc2: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/oc2r/doc/en_us/item/redstone_interface_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md index ceb04b5c..afb63829 100644 --- a/src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md @@ -1,5 +1,5 @@ # Redstone Interface Card -![Got signal?](item:oc2r:redstone_interface_card) +![Got signal?](item:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/robot.md b/src/main/resources/assets/oc2r/doc/en_us/item/robot.md index a29536ca..275f1e62 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:robot) +![I, for one, welcome our new robot overlords](item:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/sound_card.md b/src/main/resources/assets/oc2r/doc/en_us/item/sound_card.md index 80e511eb..bf86bef6 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:sound_card) +![Less sound of silence](item:oc2: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. diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/wrench.md b/src/main/resources/assets/oc2r/doc/en_us/item/wrench.md index 78f3e6f1..17ebdb22 100644 --- a/src/main/resources/assets/oc2r/doc/en_us/item/wrench.md +++ b/src/main/resources/assets/oc2r/doc/en_us/item/wrench.md @@ -1,5 +1,5 @@ # Scrench -![Screw it!](item:oc2r:wrench) +![Screw it!](item:oc2: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). diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md index a167a730..7c53867f 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md @@ -1,5 +1,5 @@ # Интерфейсный кабель -![Внутри бегают байтики](block:oc2r:bus_cable) +![Внутри бегают байтики](block:oc2:bus_cable) Интерфейсный кабель соединяет [интерфейсные шины](bus_interface.md) других устройств с интерфейсной шиной компьютера. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_interface.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_interface.md index d177dcc0..935ad611 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:bus_interface) +![Plug and play](item:oc2:bus_interface) Интерфейсные шины позволяют соединять внешние устройства с [компьютерами](computer.md). Помимо компьютеров, шина присоединяется и к блокам-устройствам, вроде [красного интерфейса](redstone_interface.md). diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md index 0412c31c..2d283de3 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md @@ -1,5 +1,5 @@ # Зарядное устройство -![Кодовое имя: Лирой](block:oc2r:charger) +![Кодовое имя: Лирой](block:oc2:charger) Зарядное устройство передает энергию от подключенного источника питания к потребителю, установленному сверху. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/computer.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/computer.md index 0c78a161..182d7643 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:computer) +![1 + 1 = 10](block:oc2:computer) Компьютер является основой для аппаратного обеспечения, необходимого для запуска операционной системы и низкоуровневых программ. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/disk_drive.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/disk_drive.md index 4dc09b42..1ac36fe4 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:disk_drive) +![Он заставляет дискеты крутиться](block:oc2:disk_drive) Дисковод предоставляет функцию быстрого обмена файлами на носителях. [Дискеты](../item/floppy.md) можно вставлять и извлекать в любое время, в отличие от [жестких дисков](../item/hard_drive.md). diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/flash_memory_flasher.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/flash_memory_flasher.md index 28c8c1ae..2fddc988 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/block/flash_memory_flasher.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/flash_memory_flasher.md @@ -1,5 +1,5 @@ # Программатор карты памяти -![Flash перед глазами](block:oc2r:flash_memory_flasher) +![Flash перед глазами](block:oc2:flash_memory_flasher) Программатор карты памяти предоставляет возможность прошивать скомпилированную прошивку на карту памяти для вашего компьютера. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md index 0c94681d..9566a339 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md @@ -1,5 +1,5 @@ # Клавиатура -![Нажимать или не нажимать, вот в чем вопрос](block:oc2r:keyboard) +![Нажимать или не нажимать, вот в чем вопрос](block:oc2:keyboard) Клавиатура передает нажатия клавиш [компьютеру](computer.md). Она может использоваться совместно с [проектором](projector.md), когда на компьютере запущен Linux. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/monitor.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/monitor.md index e27cf156..39becdaf 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/block/monitor.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/monitor.md @@ -1,5 +1,5 @@ # Монитор -![А какая у тебя диагональ?](block:oc2r:monitor) +![А какая у тебя диагональ?](block:oc2:monitor) Монитор, как и проектор, служит устройством графического вывода для [компьютера](computer.md). Он имеет разрешение 640 на 480 пикселей и цветовой формат *r5g6b5*: 5 бит для красной цветовой составляющей, 6 бит для зеленой и 5 бит для синей. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/network_connector.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/network_connector.md index fe1cc7a8..8e62a9eb 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_connector) +![Данные должны двигаться](block:oc2:network_connector) Сетевой разъем является одним из основных деталей для [компьютерных](computer.md) сетей. Используйте [сетевые кабели](../item/network_cable.md) для соединения разъемов между собой. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/network_hub.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/network_hub.md index edaf818f..cc03dedf 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_hub) +![От одного до пяти](block:oc2:network_hub) Сетевой концентратор соединяет между собой несколько [сетевых разъемов](network_connector.md). Он рассылает пакет, пришедший с одного разъема, на остальные. Операция рассылки занимает один прыжок, снижая время жизни пакета. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md index f6d73b6d..3fc46484 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md @@ -1,5 +1,5 @@ # Проектор -![Тень на стене](block:oc2r:projector) +![Тень на стене](block:oc2:projector) Проектор предоставляет [компьютеру](computer.md) устройство framebuffer. Оно имеет разрешение 640 на 480 пикселей, с цветовым форматом r5g6b5: 5 битов на красный, 6 битов на зеленый и 5 битов на синий. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/redstone_interface.md b/src/main/resources/assets/oc2r/doc/ru_ru/block/redstone_interface.md index 123cce07..86ff815e 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:redstone_interface) +![Весь красный](block:oc2:redstone_interface) Красный интерфейс предоставляет двунаправленную шину для получения и излучения красного сигнала. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/block_operations_module.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/block_operations_module.md index d34d0240..9cde51d6 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:block_operations_module) +![Сломай и быстро замени](item:oc2:block_operations_module) Модуль управления блоками позволяет [роботам](robot.md) ломать и ставить блоки в игровом мире. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/file_import_export_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/file_import_export_card.md index b1f26dda..7c79116f 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:file_import_export_card) +![Разрушим эту стену!](item:oc2:file_import_export_card) Карта импорта/экспорта файлов напрочь ломает четвертую стену. Она позволяет: - выгружать файлы с вашего реального ПК на [компьютеры](../block/computer.md) из мода. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/flash_memory.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/flash_memory.md index 89fb7d87..4b40567f 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:flash_memory) +![К бумажным картам отношения не имеет](item:oc2:flash_memory) Карта памяти содержит загрузочный код, загружаемый в [компьютерную](../block/computer.md) память при его старте. Проще говоря, она содержит прошивку для компьютера. Прошивка, поставляемая с новыми компьютерами и [роботами](robot.md) содержит в себе ядро Linux. Ядро загружает корневую файловую систему, хранящуюся на первом [жестком диске](hard_drive.md) в системе. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md index 01d335ab..c47eb2e9 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md @@ -1,5 +1,5 @@ # Дискета -![Лучше не гните ее](item:oc2r:floppy) +![Лучше не гните ее](item:oc2:floppy) Дискета является сменным носителем. Это значит, что их можно менять в [дисководе](../block/disk_drive.md) не перезагружая [компьютер](../block/disk_drive.md). diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md index 743dd621..8dbe0884 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md @@ -1,5 +1,5 @@ # Жесткий диск -![Начинает крутиться](item:oc2r:hard_drive_large) +![Начинает крутиться](item:oc2:hard_drive_large) Жесткие диски являются основным файловым хранилищем в [компьютерах](../block/computer.md) и [роботах](robot.md). diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/inventory_operations_module.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/inventory_operations_module.md index 60f46a07..388095f9 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:inventory_operations_module) +![Что твое, то мое](item:oc2:inventory_operations_module) Модуль управления инвентарем позволяет [роботам](robot.md) брать и выкидывать предметы из своего инвентаря. Это касается как предметов, так и блоков. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md index f1cfe7fc..1f404a70 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md @@ -1,5 +1,5 @@ # Справочник компьютерщика -![Никто меня не читает...](item:oc2r:manual) +![Никто меня не читает...](item:oc2:manual) Маленькая книжечка с короткими описаниями всего, что касается [компьютеров](../block/computer.md) и устройств для них. Собственно, ее же вы сейчас и читаете! diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md index edb70b4e..ed558483 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md @@ -1,5 +1,5 @@ # Память -![Воспоминания Произвольного Доступа](item:oc2r:memory_large) +![Воспоминания Произвольного Доступа](item:oc2:memory_large) Оперативное Запоминающее Устройство (ОЗУ) является одной из необходимых вещей для работы [компьютера](../block/computer.md) и [робота](robot.md). diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md index f9824fed..37bae8b5 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md @@ -1,5 +1,5 @@ # Сетевой кабель -![Какого КОТА!?](item:oc2r:network_cable) +![Какого КОТА!?](item:oc2:network_cable) Сетевые кабели соединяют пары [сетевых разъемов](../block/network_connector.md) между собой. Один кабель можно протянуть на довольно длинную дистанцию. Для подключения кабеля кликните им по двум сетевым разъемам. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_interface_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_interface_card.md index 3b34dcca..cc2aa7e9 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_interface_card) +![Поговори с незнакомцами](item:oc2:network_interface_card) Сетевая интерфейсная карта (NIC) позволяет [компьютерам](../block/computer.md) обмениваться сообщениями через [сетевые разъемы](../block/network_connector.md), подключенные к ним. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_card.md index 753c3b4b..35aeb73e 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_tunnel_card) +![Туннельное зрение?](item:oc2:network_tunnel_card) Сетевая туннельная карта позволяет [компьютерам](../block/computer.md) отправлять и принимать сообщения с другого туннельного устройства (туннельные карты и [туннельные модули](network_tunnel_module.md)), привязанного к нему. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_module.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_module.md index e5c7cc44..33df8e56 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:network_tunnel_module) +![Туннельное зрение?](item:oc2:network_tunnel_module) Сетевой туннельный модуль позволяет [роботам](robot.md) отправлять и принимать сообщения с другого туннельного устройства (туннельные модули и [туннельные карты](network_tunnel_card.md)), привязанного к нему. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md index a9ec77d1..16ed755d 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md @@ -1,5 +1,5 @@ # Красная интерфейсная карта -![Есть сигнал?](item:oc2r:redstone_interface_card) +![Есть сигнал?](item:oc2:redstone_interface_card) Красная интерфейсная карта - более компактная версия [красного интерфейсного блока](../block/redstone_interface.md). Она позволяет пользователям собирать более компактные системы. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md index bbc1dc65..75d716be 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md @@ -1,5 +1,5 @@ # Робот -![Приветствую наших новых повелителей роботов](item:oc2r:robot) +![Приветствую наших новых повелителей роботов](item:oc2:robot) Фактически роботы представляют из себя маленькие [компьютеры](../block/computer.md). Однако учитывая их нестационарное назначение, роботы несколько отличаются от обычных компьютеров. Они не могут подключаться к [интерфейсной шине](../block/bus_interface.md). Вместо карт расширения они поддерживают модульные устройства. Это специальные устройства, разработанные с учетом мобильности роботов. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/sound_card.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/sound_card.md index dd97187b..14a8bb4e 100644 --- a/src/main/resources/assets/oc2r/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:oc2r:sound_card) +![Меньше звука тишины](item:oc2:sound_card) Звуковая карта позволяет проигрывать разные звуковые эффекты из своей огромной библиотеки реалистичных семплов. Из-за некоторых технических особенностей, последовательное проигрывание эффектов требует небольшой паузы между ними. Если попытаться проиграть эффект в это время, то звука просто не будет. diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md b/src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md index e4d06a2c..a71f69fe 100644 --- a/src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md +++ b/src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md @@ -1,5 +1,5 @@ # Ключ -![А зачем отвертка?](item:oc2r:wrench) +![А зачем отвертка?](item:oc2:wrench) Ключ-отвертка или просто ключ предназначен для конфигурации некоторых блоков, например [компьютеров](../block/computer.md). diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_cable.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_cable.md index de6918bf..8f524622 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_cable.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_cable.md @@ -1,5 +1,5 @@ # 总线线缆 -![Party Bus](block:oc2r:bus_cable) +![Party Bus](block:oc2:bus_cable) 总线线缆将 [总线接口](bus_interface.md) 连接到计算机。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_interface.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_interface.md index f3147d16..5f817fc0 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_interface.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_interface.md @@ -1,5 +1,5 @@ # 总线接口 -![即插即用](item:oc2r:bus_interface) +![即插即用](item:oc2:bus_interface) 总线接口将外部设备连接到 [计算机](computer.md)。这包括显式设备方块，例如 [红石接口](redstone_interface.md)。还提供了一些通用功能方块，例如能量存储信息。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/charger.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/charger.md index 2ae57d28..623bae1b 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/charger.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/charger.md @@ -1,5 +1,5 @@ # 充电器 -![代号：Leeroy](block:oc2r:charger) +![代号：Leeroy](block:oc2:charger) 充电器将能量从连接的电源传输到其上方的能量接收器。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/computer.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/computer.md index dbce6af8..013978c5 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/computer.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/computer.md @@ -1,5 +1,5 @@ # 计算机 -![1 + 1 = 10](block:oc2r:computer) +![1 + 1 = 10](block:oc2:computer) 计算机为构建能够运行操作系统或低级软件的硬件提供了基础。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/disk_drive.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/disk_drive.md index 296e47fb..e9a38f4b 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/disk_drive.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/disk_drive.md @@ -1,5 +1,5 @@ # 磁盘驱动器 -![旋转一下](block:oc2r:disk_drive) +![旋转一下](block:oc2:disk_drive) 磁盘驱动器提供了快速媒体交换的选项。与 [硬盘](../item/hard_drive.md) 不同，[软盘](../item/floppy.md) 可以在运行时添加和移除。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/flash_memory_flasher.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/flash_memory_flasher.md index eb765c5f..c44adab7 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/flash_memory_flasher.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/flash_memory_flasher.md @@ -1,5 +1,5 @@ # 闪存刷新器 -![在你眼前闪烁](block:oc2r:flash_memory_flasher) +![在你眼前闪烁](block:oc2:flash_memory_flasher) 闪存刷新器提供了一种将自定义编译的固件刷新到计算机的闪存芯片上的方法。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/keyboard.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/keyboard.md index bc91efc1..385996d0 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/keyboard.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/keyboard.md @@ -1,5 +1,5 @@ # 键盘 -![点击与否](block:oc2r:keyboard) +![点击与否](block:oc2:keyboard) 键盘允许 [计算机](computer.md) 捕捉按键输入。它的主要使用场景是在使用 Linux 系统时与 [投影仪](projector.md) 配合使用。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/monitor.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/monitor.md index 332a16bf..02882df5 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/monitor.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/monitor.md @@ -1,5 +1,5 @@ # 显示器 -![显示器](block:oc2r:monitor) +![显示器](block:oc2:monitor) 显示器与投影仪类似，为 [计算机](computer.md) 提供了一个帧缓冲设备。它们的分辨率为 640 x 480 像素，颜色格式为 r5g6b5：红色组件 5 位，绿色组件 6 位，蓝色组件 5 位。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/network_connector.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/network_connector.md index a3640ed2..365c92a0 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/network_connector.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/network_connector.md @@ -1,5 +1,5 @@ # 网络连接口 -![数据必须流动](block:oc2r:network_connector) +![数据必须流动](block:oc2:network_connector) 网络连接口是构建连接不同 [计算机](computer.md) 的网络的基本组成部分。使用 [网线](../item/network_cable.md) 将连接口相互连接。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/network_hub.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/network_hub.md index 50140c51..11247528 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/network_hub.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/network_hub.md @@ -1,4 +1,4 @@ # 网线集线器 -![一对五](block:oc2r:network_hub) +![一对五](block:oc2:network_hub) 网线集线器将多个 [网络连接口](network_connector.md) 互相连接。它将任何到达附加连接口的数据包转发到所有其他附加的连接口。此转发操作将消耗一个跳数，减少数据包的生存时间。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/projector.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/projector.md index 0a90c6a8..372a7256 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/projector.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/projector.md @@ -1,5 +1,5 @@ # 投影仪 -![墙上的阴影](block:oc2r:projector) +![墙上的阴影](block:oc2:projector) 投影仪为 [计算机](computer.md) 提供了一个帧缓冲设备。它的分辨率为 640 x 480 像素，颜色格式为 r5g6b5：红色组件 5 位，绿色组件 6 位，蓝色组件 5 位。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/redstone_interface.md b/src/main/resources/assets/oc2r/doc/zh_cn/block/redstone_interface.md index 4acb0146..ab6db16a 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/block/redstone_interface.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/block/redstone_interface.md @@ -1,5 +1,5 @@ # 红石接口 -![一切都是红色的](block:oc2r:redstone_interface) +![一切都是红色的](block:oc2:redstone_interface) 红石接口提供了一个全方向的总线，用于接收和发射红石信号。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/block_operations_module.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/block_operations_module.md index 8d900f4b..498f671e 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/block_operations_module.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/block_operations_module.md @@ -1,5 +1,5 @@ # 方块操作模块 -![快速破坏和替换](item:oc2r:block_operations_module) +![快速破坏和替换](item:oc2:block_operations_module) 方块操作模块为 [机器人](robot.md) 提供了在世界中破坏和放置方块的能力。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/file_import_export_card.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/file_import_export_card.md index 982708f5..9571fef8 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/file_import_export_card.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/file_import_export_card.md @@ -1,5 +1,5 @@ # 文件导入/导出卡 -![拆除这堵墙！](item:oc2r:file_import_export_card) +![拆除这堵墙！](item:oc2:file_import_export_card) 文件导入/导出卡允许打破第四面墙。它允许： - 从您的真实计算机上传文件到虚拟 [计算机](../block/computer.md)。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/flash_memory.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/flash_memory.md index f9941616..92e7275e 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/flash_memory.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/flash_memory.md @@ -1,4 +1,4 @@ # 闪存 -![不是那个闪电](item:oc2r:flash_memory) +![不是那个闪电](item:oc2:flash_memory) 闪存包含在 [计算机](../block/computer.md) 启动时加载到内存中的初始代码。这通常至少包括系统的固件。新计算机和 [机器人](robot.md) 附带的默认固件还包含一个 Linux 内核。该内核期望在系统的第一个 [硬盘](hard_drive.md) 上存在根文件系统。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/floppy.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/floppy.md index 48303575..3766f2a2 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/floppy.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/floppy.md @@ -1,5 +1,5 @@ # 软盘 -![不是弯的软盘](item:oc2r:floppy) +![不是弯的软盘](item:oc2:floppy) 软盘是可移动媒体，这意味着它们可以插入和移除 [磁盘驱动器](../block/disk_drive.md) 而不需要使用磁盘驱动器的 [计算机](../block/computer.md) 重新启动即可使用它们。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/hard_drive.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/hard_drive.md index a6758dea..313a40ca 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/hard_drive.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/hard_drive.md @@ -1,5 +1,5 @@ # 硬盘 -![转圈圈](item:oc2r:hard_drive_large) +![转圈圈](item:oc2:hard_drive_large) 硬盘是用于在[计算机](../block/computer.md)和[机器人](robot.md)中存储数据的主要存储设备。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/inventory_operations_module.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/inventory_operations_module.md index f5a053e7..c5e7e6d3 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/inventory_operations_module.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/inventory_operations_module.md @@ -1,5 +1,5 @@ # 物品栏操作模块 -![你的就是我的](item:oc2r:inventory_operations_module) +![你的就是我的](item:oc2:inventory_operations_module) 物品栏操作模块为[机器人](robot.md)提供了从世界中的物品栏插入和提取物品的能力。它支持方块和实体的物品栏。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/manual.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/manual.md index 74119ef6..21a1c673 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/manual.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/manual.md @@ -1,5 +1,5 @@ # 计算机专家手册 -![反正没人看我...](item:oc2r:manual) +![反正没人看我...](item:oc2:manual) 你随手可查的关于[计算机](../block/computer.md)及其相关设备的所有主题的快速参考。这就是你当前正在阅读的内容！ diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/memory.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/memory.md index d5f7defa..797fed1d 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/memory.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/memory.md @@ -1,5 +1,5 @@ # 内存条 -![随机访问记忆](item:oc2r:memory_large) +![随机访问记忆](item:oc2:memory_large) 随机访问内存（RAM）设备为[计算机](../block/computer.md)和[机器人](robot.md)提供工作内存。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_cable.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_cable.md index bf7e8349..10537cc4 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_cable.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_cable.md @@ -1,5 +1,5 @@ # 网线 -![什么猫!?](item:oc2r:network_cable) +![什么猫!?](item:oc2:network_cable) 网线连接一对[网络连接口](../block/network_connector.md)。这使得便捷地跨越较大距离成为可能。要放置网线，请依次使用它连接两个网络连接口。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_interface_card.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_interface_card.md index f3aec1e2..d7e5d012 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_interface_card.md @@ -1,5 +1,5 @@ # 网卡 -![与陌生人交谈](item:oc2r:network_interface_card) +![与陌生人交谈](item:oc2:network_interface_card) 网卡（NIC）允许[计算机](../block/computer.md)向[网络连接口](../block/network_connector.md)发送和接收消息。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_card.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_card.md index 4753c29e..0fb716e6 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_card.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_card.md @@ -1,5 +1,5 @@ # 网络频道卡 -![频道视野？](item:oc2r:network_tunnel_card) +![频道视野？](item:oc2:network_tunnel_card) 网络频道卡允许[计算机](../block/computer.md)向与该卡连接的另一个频道设备（频道卡和[频道模块](network_tunnel_module.md)）发送和接收消息。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_module.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_module.md index affafc73..5151cdd2 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_module.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_module.md @@ -1,5 +1,5 @@ # 网络频道模块 -![频道视野？](item:oc2r:network_tunnel_module) +![频道视野？](item:oc2:network_tunnel_module) 网络频道模块允许[机器人](robot.md)向与该模块连接的另一个频道设备（频道模块和[频道卡](network_tunnel_card.md)）发送和接收消息。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/redstone_interface_card.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/redstone_interface_card.md index 313a3b91..c28e16dd 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/redstone_interface_card.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/redstone_interface_card.md @@ -1,5 +1,5 @@ # 红石卡 -![有信号吗？](item:oc2r:redstone_interface_card) +![有信号吗？](item:oc2:redstone_interface_card) 红石卡是[红石接口](../block/redstone_interface.md)的一个更紧凑的版本。它使用户能够构建更紧凑的设计。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/robot.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/robot.md index d95732de..652f609f 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/robot.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/robot.md @@ -1,5 +1,5 @@ # 机器人 -![我欢迎我们的新机器人统治者](item:oc2r:robot) +![我欢迎我们的新机器人统治者](item:oc2:robot) 机器人本质上是移动的[计算机](../block/computer.md)。由于其非固定性质，其行为与常规计算机有所不同。它们不能连接到[总线接口](../block/bus_interface.md)。与卡片设备不同，机器人支持模块设备。这些模块设备专门考虑了机器人的移动性。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/sound_card.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/sound_card.md index c42ad668..903b5f2d 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/sound_card.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/sound_card.md @@ -1,5 +1,5 @@ # 声音卡 -![少一点寂静的声音](item:oc2r:sound_card) +![少一点寂静的声音](item:oc2:sound_card) 声音卡允许从其广泛的逼真样本库中播放各种声音效果。由于内部工程限制，播放连续效果时需要短暂的暂停。在此时间窗口内尝试播放其他效果将没有效果。 diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/wrench.md b/src/main/resources/assets/oc2r/doc/zh_cn/item/wrench.md index 34c1a22b..71de5a66 100644 --- a/src/main/resources/assets/oc2r/doc/zh_cn/item/wrench.md +++ b/src/main/resources/assets/oc2r/doc/zh_cn/item/wrench.md @@ -1,5 +1,5 @@ # 螺丝刀扳手 -![扭转工具！](item:oc2r:wrench) +![扭转工具！](item:oc2:wrench) 名为“螺丝刀扳手”的扳手-螺丝刀多功能工具，可用于直接访问一些方块的配置，例如 [计算机](../block/computer.md)。 diff --git a/src/main/resources/assets/oc2r/lang/en_us.json b/src/main/resources/assets/oc2r/lang/en_us.json index c2b1e57e..31830f68 100644 --- a/src/main/resources/assets/oc2r/lang/en_us.json +++ b/src/main/resources/assets/oc2r/lang/en_us.json @@ -1,158 +1,158 @@ { - "item_group.oc2r.common": "OpenComputers II", + "item_group.oc2.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.", + "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.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.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.oc2r.transistor": "Transistor", - "item.oc2r.transistor.desc": "Crafting material.", - "item.oc2r.circuit_board": "Circuit Board", - "item.oc2r.circuit_board.desc": "Crafting material.", + "item.oc2.transistor": "Transistor", + "item.oc2.transistor.desc": "Crafting material.", + "item.oc2.circuit_board": "Circuit Board", + "item.oc2.circuit_board.desc": "Crafting material.", - "item.oc2r.silicon": "Silicon", - "item.oc2r.silicon.desc": "Crafting material.", - "item.oc2r.silicon_blend": "Silicon Blend", - "item.oc2r.silicon_blend.desc": "A mixture of sand and quartz from which silicon is cooked.", - "item.oc2r.silicon_wafer": "Silicon Wafer", - "item.oc2r.silicon_wafer.desc": "A wafer ready for processor construction.", - "item.oc2r.raw_silicon_wafer": "Raw Silicon Wafer", - "item.oc2r.raw_silicon_wafer.desc": "A wafer with small imperfections that must be cooked out.", + "item.oc2.silicon": "Silicon", + "item.oc2.silicon.desc": "Crafting material.", + "item.oc2.silicon_blend": "Silicon Blend", + "item.oc2.silicon_blend.desc": "A mixture of sand and quartz from which silicon is cooked.", + "item.oc2.silicon_wafer": "Silicon Wafer", + "item.oc2.silicon_wafer.desc": "A wafer ready for processor construction.", + "item.oc2.raw_silicon_wafer": "Raw Silicon Wafer", + "item.oc2.raw_silicon_wafer.desc": "A wafer with small imperfections that must be cooked out.", - "entity.oc2r.robot": "Robot", + "entity.oc2.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.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.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.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.oc2r.machine.open_inventory.capt": "Open Inventory", - "gui.oc2r.machine.open_terminal.capt": "Open Terminal", + "gui.oc2.machine.open_inventory.capt": "Open Inventory", + "gui.oc2.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.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.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.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.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.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.oc2r.keyboard.close_info": "Right click to close.", + "gui.oc2.keyboard.close_info": "Right click to close.", - "gui.oc2r.network_tunnel.link": "Link", + "gui.oc2.network_tunnel.link": "Link", - "manual.oc2r.home": "Home", - "manual.oc2r.blocks": "Blocks", - "manual.oc2r.items": "Items", + "manual.oc2.home": "Home", + "manual.oc2.blocks": "Blocks", + "manual.oc2.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.", + "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.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", + "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.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" + "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/oc2r/lang/ru_ru.json b/src/main/resources/assets/oc2r/lang/ru_ru.json index 16c4a143..5c02fdc7 100644 --- a/src/main/resources/assets/oc2r/lang/ru_ru.json +++ b/src/main/resources/assets/oc2r/lang/ru_ru.json @@ -1,140 +1,140 @@ { - "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": "Монитор", - "block.oc2r.monitor.desc": "Монитор основанный на фреймбуфере с клавиатурой.", - "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 уровень 1", - "item.oc2r.cpu_tier_1.desc": "Выполняет компьютерные инструкции.", - "item.oc2r.cpu_tier_2": "CPU уровень 2", - "item.oc2r.cpu_tier_2.desc": "Выполняет компьютерные инструкции.", - "item.oc2r.cpu_tier_3": "CPU уровень 3", - "item.oc2r.cpu_tier_3.desc": "Выполняет компьютерные инструкции.", - "item.oc2r.cpu_tier_4": "CPU уровень 4", - "item.oc2r.cpu_tier_4.desc": "Выполняет компьютерные инструкции.", - "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.raw_silicon_wafer": "Необработанная кремниевая пластина", - "item.oc2r.raw_silicon_wafer.desc": "Пластина с небольшими дефектами, которую необходимо обработать.", - "item.oc2r.redstone_interface_card": "Красная интерфейсная карта", - "item.oc2r.redstone_interface_card.desc": "Подает и считывает редстоун сигналы от блока компьютера.", - "item.oc2r.robot": "Робот", - "item.oc2r.robot.desc": "Портативный компьютер. Используйте ключ, чтобы убрать его", - "item.oc2r.silicon": "Кремний", - "item.oc2r.silicon.desc": "Материал крафта.", - "item.oc2r.silicon_blend": "Смесь кремния", - "item.oc2r.silicon_blend.desc": "Смесь песка и кварца, из которой готовят кремний.", - "item.oc2r.silicon_wafer": "Кремниевая пластина", - "item.oc2r.silicon_wafer.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" + "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": "Монитор", + "block.oc2.monitor.desc": "Монитор основанный на фреймбуфере с клавиатурой.", + "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 уровень 1", + "item.oc2.cpu_tier_1.desc": "Выполняет компьютерные инструкции.", + "item.oc2.cpu_tier_2": "CPU уровень 2", + "item.oc2.cpu_tier_2.desc": "Выполняет компьютерные инструкции.", + "item.oc2.cpu_tier_3": "CPU уровень 3", + "item.oc2.cpu_tier_3.desc": "Выполняет компьютерные инструкции.", + "item.oc2.cpu_tier_4": "CPU уровень 4", + "item.oc2.cpu_tier_4.desc": "Выполняет компьютерные инструкции.", + "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.raw_silicon_wafer": "Необработанная кремниевая пластина", + "item.oc2.raw_silicon_wafer.desc": "Пластина с небольшими дефектами, которую необходимо обработать.", + "item.oc2.redstone_interface_card": "Красная интерфейсная карта", + "item.oc2.redstone_interface_card.desc": "Подает и считывает редстоун сигналы от блока компьютера.", + "item.oc2.robot": "Робот", + "item.oc2.robot.desc": "Портативный компьютер. Используйте ключ, чтобы убрать его", + "item.oc2.silicon": "Кремний", + "item.oc2.silicon.desc": "Материал крафта.", + "item.oc2.silicon_blend": "Смесь кремния", + "item.oc2.silicon_blend.desc": "Смесь песка и кварца, из которой готовят кремний.", + "item.oc2.silicon_wafer": "Кремниевая пластина", + "item.oc2.silicon_wafer.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/oc2r/lang/zh_cn.json b/src/main/resources/assets/oc2r/lang/zh_cn.json index cf747f92..d706b0d1 100644 --- a/src/main/resources/assets/oc2r/lang/zh_cn.json +++ b/src/main/resources/assets/oc2r/lang/zh_cn.json @@ -1,140 +1,140 @@ { - "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": "显示器", - "block.oc2r.monitor.desc": "一款基于帧缓冲的特殊显示器，用于您的电脑。", - "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": "缺少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": "1级 CPU", - "item.oc2r.cpu_tier_1.desc": "处理计算机指令。", - "item.oc2r.cpu_tier_2": "2级 CPU", - "item.oc2r.cpu_tier_2.desc": "处理计算机指令。", - "item.oc2r.cpu_tier_3": "3级 CPU", - "item.oc2r.cpu_tier_3.desc": "处理计算机指令。", - "item.oc2r.cpu_tier_4": "4级 CPU", - "item.oc2r.cpu_tier_4.desc": "处理计算机指令。", - "item.oc2r.file_import_export_card": "文件导入/导出卡", - "item.oc2r.file_import_export_card.desc": "提供一个API来导入/导出文件。", - "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": "计算机和机器人使用的随机访问内存（RAM）。", - "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.raw_silicon_wafer": "原料硅片", - "item.oc2r.raw_silicon_wafer.desc": "一种带有小瑕疵的硅片，需要烘烤以去除这些瑕疵。", - "item.oc2r.redstone_interface_card": "红石卡", - "item.oc2r.redstone_interface_card.desc": "通过计算机发射和读取红石信号。", - "item.oc2r.robot": "机器人", - "item.oc2r.robot.desc": "使用螺丝刀扳手或者兼容的扳手来添加或移除组件。", - "item.oc2r.silicon": "硅", - "item.oc2r.silicon.desc": "制作材料", - "item.oc2r.silicon_blend": "硅混合物", - "item.oc2r.silicon_blend.desc": "一种由沙子和石英混合而成的物质，用于提炼硅。", - "item.oc2r.silicon_wafer": "硅片", - "item.oc2r.silicon_wafer.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": "开放式电脑 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": "频道：%s" + "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": "显示器", + "block.oc2.monitor.desc": "一款基于帧缓冲的特殊显示器，用于您的电脑。", + "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": "缺少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": "1级 CPU", + "item.oc2.cpu_tier_1.desc": "处理计算机指令。", + "item.oc2.cpu_tier_2": "2级 CPU", + "item.oc2.cpu_tier_2.desc": "处理计算机指令。", + "item.oc2.cpu_tier_3": "3级 CPU", + "item.oc2.cpu_tier_3.desc": "处理计算机指令。", + "item.oc2.cpu_tier_4": "4级 CPU", + "item.oc2.cpu_tier_4.desc": "处理计算机指令。", + "item.oc2.file_import_export_card": "文件导入/导出卡", + "item.oc2.file_import_export_card.desc": "提供一个API来导入/导出文件。", + "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": "计算机和机器人使用的随机访问内存（RAM）。", + "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.raw_silicon_wafer": "原料硅片", + "item.oc2.raw_silicon_wafer.desc": "一种带有小瑕疵的硅片，需要烘烤以去除这些瑕疵。", + "item.oc2.redstone_interface_card": "红石卡", + "item.oc2.redstone_interface_card.desc": "通过计算机发射和读取红石信号。", + "item.oc2.robot": "机器人", + "item.oc2.robot.desc": "使用螺丝刀扳手或者兼容的扳手来添加或移除组件。", + "item.oc2.silicon": "硅", + "item.oc2.silicon.desc": "制作材料", + "item.oc2.silicon_blend": "硅混合物", + "item.oc2.silicon_blend.desc": "一种由沙子和石英混合而成的物质，用于提炼硅。", + "item.oc2.silicon_wafer": "硅片", + "item.oc2.silicon_wafer.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": "开放式电脑 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": "频道：%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 index 3a1c05c0..1672f401 100644 --- a/src/main/resources/assets/oc2r/models/block/cable_base.json +++ b/src/main/resources/assets/oc2r/models/block/cable_base.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_link.json b/src/main/resources/assets/oc2r/models/block/cable_link.json index 34035375..c4089bc6 100644 --- a/src/main/resources/assets/oc2r/models/block/cable_link.json +++ b/src/main/resources/assets/oc2r/models/block/cable_link.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_plug.json b/src/main/resources/assets/oc2r/models/block/cable_plug.json index 3f013338..365378ae 100644 --- a/src/main/resources/assets/oc2r/models/block/cable_plug.json +++ b/src/main/resources/assets/oc2r/models/block/cable_plug.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_straight.json b/src/main/resources/assets/oc2r/models/block/cable_straight.json index 46a9435d..a31779f3 100644 --- a/src/main/resources/assets/oc2r/models/block/cable_straight.json +++ b/src/main/resources/assets/oc2r/models/block/cable_straight.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/cable_support.json b/src/main/resources/assets/oc2r/models/block/cable_support.json index c6e52785..9f8c87d8 100644 --- a/src/main/resources/assets/oc2r/models/block/cable_support.json +++ b/src/main/resources/assets/oc2r/models/block/cable_support.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/charger.json b/src/main/resources/assets/oc2r/models/block/charger.json index ec94a43b..6c41de82 100644 --- a/src/main/resources/assets/oc2r/models/block/charger.json +++ b/src/main/resources/assets/oc2r/models/block/charger.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/computer.json b/src/main/resources/assets/oc2r/models/block/computer.json index 4b2445f8..d8ca0661 100644 --- a/src/main/resources/assets/oc2r/models/block/computer.json +++ b/src/main/resources/assets/oc2r/models/block/computer.json @@ -1,11 +1,11 @@ { "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", + "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": [ diff --git a/src/main/resources/assets/oc2r/models/block/creative_energy.json b/src/main/resources/assets/oc2r/models/block/creative_energy.json index d18f6cb2..af9ff5c5 100644 --- a/src/main/resources/assets/oc2r/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": "oc2r:block/creative_energy" + "all": "oc2:block/creative_energy" } } diff --git a/src/main/resources/assets/oc2r/models/block/disk_drive.json b/src/main/resources/assets/oc2r/models/block/disk_drive.json index 1b8d09dd..dca2fd2d 100644 --- a/src/main/resources/assets/oc2r/models/block/disk_drive.json +++ b/src/main/resources/assets/oc2r/models/block/disk_drive.json @@ -1 +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]}}}]} +{"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]}}}]} 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 index 1b8d09dd..dca2fd2d 100644 --- a/src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json +++ b/src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/keyboard.json b/src/main/resources/assets/oc2r/models/block/keyboard.json index 73e7104a..032e500d 100644 --- a/src/main/resources/assets/oc2r/models/block/keyboard.json +++ b/src/main/resources/assets/oc2r/models/block/keyboard.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/monitor.json b/src/main/resources/assets/oc2r/models/block/monitor.json index 856b3cd1..0034b85c 100644 --- a/src/main/resources/assets/oc2r/models/block/monitor.json +++ b/src/main/resources/assets/oc2r/models/block/monitor.json @@ -2,9 +2,9 @@ "parent": "block/block", "loader": "forge:obj", "flip_v": true, - "model": "oc2r:models/block/monitor.obj", + "model": "oc2:models/block/monitor.obj", "textures": { - "texture0": "oc2r:block/monitor/monitor", - "particle": "oc2r:block/monitor/monitor" + "texture0": "oc2:block/monitor/monitor", + "particle": "oc2:block/monitor/monitor" } } diff --git a/src/main/resources/assets/oc2r/models/block/network_connector.json b/src/main/resources/assets/oc2r/models/block/network_connector.json index 39a5e9dc..d97a97cd 100644 --- a/src/main/resources/assets/oc2r/models/block/network_connector.json +++ b/src/main/resources/assets/oc2r/models/block/network_connector.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/network_hub.json b/src/main/resources/assets/oc2r/models/block/network_hub.json index a6108a6d..68ef62ad 100644 --- a/src/main/resources/assets/oc2r/models/block/network_hub.json +++ b/src/main/resources/assets/oc2r/models/block/network_hub.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/network_switch.json b/src/main/resources/assets/oc2r/models/block/network_switch.json index 58d7c5ea..36b365b8 100644 --- a/src/main/resources/assets/oc2r/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": "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" + "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" }, "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 index 33e97ae2..1267853b 100644 --- a/src/main/resources/assets/oc2r/models/block/pci_card_cage.json +++ b/src/main/resources/assets/oc2r/models/block/pci_card_cage.json @@ -1 +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]}}}]} +{"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/oc2r/models/block/projector.json b/src/main/resources/assets/oc2r/models/block/projector.json index 17c087b9..16bdff6c 100644 --- a/src/main/resources/assets/oc2r/models/block/projector.json +++ b/src/main/resources/assets/oc2r/models/block/projector.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/redstone_interface.json b/src/main/resources/assets/oc2r/models/block/redstone_interface.json index 0a549f26..742438b5 100644 --- a/src/main/resources/assets/oc2r/models/block/redstone_interface.json +++ b/src/main/resources/assets/oc2r/models/block/redstone_interface.json @@ -1 +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]}}}]} +{"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]}}}]} diff --git a/src/main/resources/assets/oc2r/models/block/vxlan_hub.json b/src/main/resources/assets/oc2r/models/block/vxlan_hub.json index 4e4f4562..622cc9b3 100644 --- a/src/main/resources/assets/oc2r/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": "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" + "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" }, "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 index 02a87851..d720cef8 100644 --- a/src/main/resources/assets/oc2r/models/item/block_operations_module.json +++ b/src/main/resources/assets/oc2r/models/item/block_operations_module.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/block_operations_module" + "layer0": "oc2:item/block_operations_module" } } diff --git a/src/main/resources/assets/oc2r/models/item/bus_cable.json b/src/main/resources/assets/oc2r/models/item/bus_cable.json index 7018bef0..547e650f 100644 --- a/src/main/resources/assets/oc2r/models/item/bus_cable.json +++ b/src/main/resources/assets/oc2r/models/item/bus_cable.json @@ -1,5 +1,5 @@ { - "parent": "oc2r:block/cable_straight", + "parent": "oc2:block/cable_straight", "display": { "gui": { "rotation": [ diff --git a/src/main/resources/assets/oc2r/models/item/bus_interface.json b/src/main/resources/assets/oc2r/models/item/bus_interface.json index 47b4e160..4f131fe9 100644 --- a/src/main/resources/assets/oc2r/models/item/bus_interface.json +++ b/src/main/resources/assets/oc2r/models/item/bus_interface.json @@ -1,5 +1,5 @@ { - "parent": "oc2r:block/cable_plug", + "parent": "oc2:block/cable_plug", "display": { "gui": { "rotation": [ diff --git a/src/main/resources/assets/oc2r/models/item/charger.json b/src/main/resources/assets/oc2r/models/item/charger.json index aef6413a..c77a006c 100644 --- a/src/main/resources/assets/oc2r/models/item/charger.json +++ b/src/main/resources/assets/oc2r/models/item/charger.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/charger" + "parent": "oc2: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 index b6e65d4f..8375fc86 100644 --- a/src/main/resources/assets/oc2r/models/item/circuit_board.json +++ b/src/main/resources/assets/oc2r/models/item/circuit_board.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/circuit_board" + "layer0": "oc2: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 index 87f9cb40..a22104b9 100644 --- a/src/main/resources/assets/oc2r/models/item/computer.json +++ b/src/main/resources/assets/oc2r/models/item/computer.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/computer" + "parent": "oc2:block/computer" } diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_1.json b/src/main/resources/assets/oc2r/models/item/cpu_tier_1.json index 6f651de2..54a9a303 100644 --- a/src/main/resources/assets/oc2r/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": "oc2r:item/cpu_tier_1" + "layer0": "oc2: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 index 83aa4ab9..4c001339 100644 --- a/src/main/resources/assets/oc2r/models/item/cpu_tier_2.json +++ b/src/main/resources/assets/oc2r/models/item/cpu_tier_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/cpu_tier_2" + "layer0": "oc2: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 index 439acbc8..9a311dc9 100644 --- a/src/main/resources/assets/oc2r/models/item/cpu_tier_3.json +++ b/src/main/resources/assets/oc2r/models/item/cpu_tier_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/cpu_tier_3" + "layer0": "oc2:item/cpu_tier_3" } } diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_4.json b/src/main/resources/assets/oc2r/models/item/cpu_tier_4.json index 2db63cee..e38ee80e 100644 --- a/src/main/resources/assets/oc2r/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": "oc2r:item/cpu_tier_4" + "layer0": "oc2: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 index 6e177018..41fe656b 100644 --- a/src/main/resources/assets/oc2r/models/item/creative_energy.json +++ b/src/main/resources/assets/oc2r/models/item/creative_energy.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/creative_energy" + "parent": "oc2: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 index 84fae56e..9db583a1 100644 --- a/src/main/resources/assets/oc2r/models/item/disk_drive.json +++ b/src/main/resources/assets/oc2r/models/item/disk_drive.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/disk_drive" + "parent": "oc2: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 index 7fcd3c61..4f3c7347 100644 --- 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 @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/file_import_export_card" + "layer0": "oc2: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 index 069e825c..a5a68c4d 100644 --- a/src/main/resources/assets/oc2r/models/item/flash_memory.json +++ b/src/main/resources/assets/oc2r/models/item/flash_memory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/flash_memory" + "layer0": "oc2:item/flash_memory" } } diff --git a/src/main/resources/assets/oc2r/models/item/flash_memory_custom.json b/src/main/resources/assets/oc2r/models/item/flash_memory_custom.json index 069e825c..a5a68c4d 100644 --- a/src/main/resources/assets/oc2r/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": "oc2r:item/flash_memory" + "layer0": "oc2: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 index 3c4409d0..4d0591e6 100644 --- a/src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json +++ b/src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/flash_memory_flasher" + "parent": "oc2: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 index 500d0966..e3c1457c 100644 --- a/src/main/resources/assets/oc2r/models/item/floppy.json +++ b/src/main/resources/assets/oc2r/models/item/floppy.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/floppy_base", - "layer1": "oc2r:item/floppy_tint" + "layer0": "oc2:item/floppy_base", + "layer1": "oc2: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 index 500d0966..e3c1457c 100644 --- a/src/main/resources/assets/oc2r/models/item/floppy_modern.json +++ b/src/main/resources/assets/oc2r/models/item/floppy_modern.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/floppy_base", - "layer1": "oc2r:item/floppy_tint" + "layer0": "oc2:item/floppy_base", + "layer1": "oc2: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 index ce13c2ff..0d9aa83a 100644 --- a/src/main/resources/assets/oc2r/models/item/hard_drive_custom.json +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_custom.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/hard_drive_base", - "layer1": "oc2r:item/hard_drive_tint" + "layer0": "oc2:item/hard_drive_base", + "layer1": "oc2: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 index ce13c2ff..0d9aa83a 100644 --- 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 @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/hard_drive_base", - "layer1": "oc2r:item/hard_drive_tint" + "layer0": "oc2:item/hard_drive_base", + "layer1": "oc2: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 index ce13c2ff..0d9aa83a 100644 --- a/src/main/resources/assets/oc2r/models/item/hard_drive_large.json +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_large.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/hard_drive_base", - "layer1": "oc2r:item/hard_drive_tint" + "layer0": "oc2:item/hard_drive_base", + "layer1": "oc2: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 index ce13c2ff..0d9aa83a 100644 --- a/src/main/resources/assets/oc2r/models/item/hard_drive_medium.json +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_medium.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/hard_drive_base", - "layer1": "oc2r:item/hard_drive_tint" + "layer0": "oc2:item/hard_drive_base", + "layer1": "oc2: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 index ce13c2ff..0d9aa83a 100644 --- a/src/main/resources/assets/oc2r/models/item/hard_drive_small.json +++ b/src/main/resources/assets/oc2r/models/item/hard_drive_small.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/hard_drive_base", - "layer1": "oc2r:item/hard_drive_tint" + "layer0": "oc2:item/hard_drive_base", + "layer1": "oc2: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 index bd7b2326..f565b4f6 100644 --- a/src/main/resources/assets/oc2r/models/item/inventory_operations_module.json +++ b/src/main/resources/assets/oc2r/models/item/inventory_operations_module.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/inventory_operations_module" + "layer0": "oc2: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 index 47e9a219..50e6b0ba 100644 --- a/src/main/resources/assets/oc2r/models/item/keyboard.json +++ b/src/main/resources/assets/oc2r/models/item/keyboard.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/keyboard" + "parent": "oc2:block/keyboard" } diff --git a/src/main/resources/assets/oc2r/models/item/manual.json b/src/main/resources/assets/oc2r/models/item/manual.json index 3eecc583..4140d77e 100644 --- a/src/main/resources/assets/oc2r/models/item/manual.json +++ b/src/main/resources/assets/oc2r/models/item/manual.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/manual" + "layer0": "oc2:item/manual" } } diff --git a/src/main/resources/assets/oc2r/models/item/memory_extra_large.json b/src/main/resources/assets/oc2r/models/item/memory_extra_large.json index 9f25a419..f07b7646 100644 --- a/src/main/resources/assets/oc2r/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": "oc2r:item/memory_extra_large" + "layer0": "oc2: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 index 50144c74..81d93b9c 100644 --- a/src/main/resources/assets/oc2r/models/item/memory_large.json +++ b/src/main/resources/assets/oc2r/models/item/memory_large.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/memory_large" + "layer0": "oc2: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 index 23fa8a2d..c3da2b2e 100644 --- a/src/main/resources/assets/oc2r/models/item/memory_medium.json +++ b/src/main/resources/assets/oc2r/models/item/memory_medium.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/memory_medium" + "layer0": "oc2: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 index 96b94bc9..1069e856 100644 --- a/src/main/resources/assets/oc2r/models/item/memory_small.json +++ b/src/main/resources/assets/oc2r/models/item/memory_small.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/memory_small" + "layer0": "oc2: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 index bb48edbb..c8363946 100644 --- a/src/main/resources/assets/oc2r/models/item/monitor.json +++ b/src/main/resources/assets/oc2r/models/item/monitor.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/monitor" + "parent": "oc2:block/monitor" } diff --git a/src/main/resources/assets/oc2r/models/item/network_cable.json b/src/main/resources/assets/oc2r/models/item/network_cable.json index 76123a8d..f7f5d527 100644 --- a/src/main/resources/assets/oc2r/models/item/network_cable.json +++ b/src/main/resources/assets/oc2r/models/item/network_cable.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/network_cable" + "layer0": "oc2:item/network_cable" } } diff --git a/src/main/resources/assets/oc2r/models/item/network_connector.json b/src/main/resources/assets/oc2r/models/item/network_connector.json index 138831d6..9482f13c 100644 --- a/src/main/resources/assets/oc2r/models/item/network_connector.json +++ b/src/main/resources/assets/oc2r/models/item/network_connector.json @@ -1,5 +1,5 @@ { - "parent": "oc2r:block/network_connector", + "parent": "oc2:block/network_connector", "display": { "gui": { "rotation": [ diff --git a/src/main/resources/assets/oc2r/models/item/network_hub.json b/src/main/resources/assets/oc2r/models/item/network_hub.json index 967fd4bc..f205ddc6 100644 --- a/src/main/resources/assets/oc2r/models/item/network_hub.json +++ b/src/main/resources/assets/oc2r/models/item/network_hub.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/network_hub" + "parent": "oc2: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 index 200ea8df..12d27838 100644 --- a/src/main/resources/assets/oc2r/models/item/network_interface_card.json +++ b/src/main/resources/assets/oc2r/models/item/network_interface_card.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/network_interface_card" + "layer0": "oc2: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 index 9d52f858..657bd289 100644 --- a/src/main/resources/assets/oc2r/models/item/network_switch.json +++ b/src/main/resources/assets/oc2r/models/item/network_switch.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/network_switch" + "parent": "oc2: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 index 84434847..8be134a9 100644 --- a/src/main/resources/assets/oc2r/models/item/network_tunnel_card.json +++ b/src/main/resources/assets/oc2r/models/item/network_tunnel_card.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/network_tunnel_card" + "layer0": "oc2: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 index 1339709b..3fdcd1cc 100644 --- a/src/main/resources/assets/oc2r/models/item/network_tunnel_module.json +++ b/src/main/resources/assets/oc2r/models/item/network_tunnel_module.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/network_tunnel_module" + "layer0": "oc2: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 index 7dde9270..b01fc003 100644 --- a/src/main/resources/assets/oc2r/models/item/pci_card_cage.json +++ b/src/main/resources/assets/oc2r/models/item/pci_card_cage.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/pci_card_cage" + "parent": "oc2: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 index a73a8bcb..f935e4bf 100644 --- a/src/main/resources/assets/oc2r/models/item/projector.json +++ b/src/main/resources/assets/oc2r/models/item/projector.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/projector" + "parent": "oc2:block/projector" } diff --git a/src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json b/src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json index a0f3cacf..77f59295 100644 --- a/src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json +++ b/src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/raw_silicon_wafer" + "layer0": "oc2:item/raw_silicon_wafer" } } diff --git a/src/main/resources/assets/oc2r/models/item/redstone_interface.json b/src/main/resources/assets/oc2r/models/item/redstone_interface.json index 4db417fb..a476fc4d 100644 --- a/src/main/resources/assets/oc2r/models/item/redstone_interface.json +++ b/src/main/resources/assets/oc2r/models/item/redstone_interface.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/redstone_interface" + "parent": "oc2: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 index 0d14d5c1..be10221f 100644 --- a/src/main/resources/assets/oc2r/models/item/redstone_interface_card.json +++ b/src/main/resources/assets/oc2r/models/item/redstone_interface_card.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/redstone_interface_card" + "layer0": "oc2:item/redstone_interface_card" } } diff --git a/src/main/resources/assets/oc2r/models/item/silicon.json b/src/main/resources/assets/oc2r/models/item/silicon.json index dae2affd..a180dbfe 100644 --- a/src/main/resources/assets/oc2r/models/item/silicon.json +++ b/src/main/resources/assets/oc2r/models/item/silicon.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/silicon" + "layer0": "oc2:item/silicon" } } diff --git a/src/main/resources/assets/oc2r/models/item/silicon_blend.json b/src/main/resources/assets/oc2r/models/item/silicon_blend.json index 63d09e1d..800b5693 100644 --- a/src/main/resources/assets/oc2r/models/item/silicon_blend.json +++ b/src/main/resources/assets/oc2r/models/item/silicon_blend.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/silicon_blend" + "layer0": "oc2:item/silicon_blend" } } diff --git a/src/main/resources/assets/oc2r/models/item/silicon_wafer.json b/src/main/resources/assets/oc2r/models/item/silicon_wafer.json index 213b2afb..c8dc0845 100644 --- a/src/main/resources/assets/oc2r/models/item/silicon_wafer.json +++ b/src/main/resources/assets/oc2r/models/item/silicon_wafer.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/silicon_wafer" + "layer0": "oc2:item/silicon_wafer" } } diff --git a/src/main/resources/assets/oc2r/models/item/sound_card.json b/src/main/resources/assets/oc2r/models/item/sound_card.json index 37ad6d72..ced89005 100644 --- a/src/main/resources/assets/oc2r/models/item/sound_card.json +++ b/src/main/resources/assets/oc2r/models/item/sound_card.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/sound_card" + "layer0": "oc2: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 index 114d0196..18e573c4 100644 --- a/src/main/resources/assets/oc2r/models/item/transistor.json +++ b/src/main/resources/assets/oc2r/models/item/transistor.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/transistor" + "layer0": "oc2: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 index 1e8bbe74..eee4e7ff 100644 --- a/src/main/resources/assets/oc2r/models/item/vxlan_hub.json +++ b/src/main/resources/assets/oc2r/models/item/vxlan_hub.json @@ -1,3 +1,3 @@ { - "parent": "oc2r:block/vxlan_hub" + "parent": "oc2:block/vxlan_hub" } diff --git a/src/main/resources/assets/oc2r/models/item/wrench.json b/src/main/resources/assets/oc2r/models/item/wrench.json index 300714f6..0db4c527 100644 --- a/src/main/resources/assets/oc2r/models/item/wrench.json +++ b/src/main/resources/assets/oc2r/models/item/wrench.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "oc2r:item/wrench" + "layer0": "oc2:item/wrench" } } diff --git a/src/main/resources/assets/oc2r/shaders/core/projectors.json b/src/main/resources/assets/oc2r/shaders/core/projectors.json index bc73658b..b26f9a94 100644 --- a/src/main/resources/assets/oc2r/shaders/core/projectors.json +++ b/src/main/resources/assets/oc2r/shaders/core/projectors.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "oc2r:projectors", - "fragment": "oc2r:projectors", + "vertex": "oc2:projectors", + "fragment": "oc2:projectors", "attributes": ["Position", "UV0"], "samplers": [ {"name": "MainCameraDepth"}, diff --git a/src/main/resources/assets/oc2r/sounds.json b/src/main/resources/assets/oc2r/sounds.json index d61aecb2..35089839 100644 --- a/src/main/resources/assets/oc2r/sounds.json +++ b/src/main/resources/assets/oc2r/sounds.json @@ -1,10 +1,10 @@ { "computer_running": { "category": "block", - "subtitle": "subtitles.oc2r.computer", + "subtitle": "subtitles.oc2.computer", "sounds": [ { - "name": "oc2r:computer_running", + "name": "oc2:computer_running", "stream": true, "volume": 0.25 } @@ -12,41 +12,41 @@ }, "floppy_access": { "category": "block", - "subtitle": "subtitles.oc2r.floppy", + "subtitle": "subtitles.oc2.floppy", "sounds": [ - "oc2r:floppy_access1", - "oc2r:floppy_access2", - "oc2r:floppy_access3", - "oc2r:floppy_access4", - "oc2r:floppy_access5", - "oc2r:floppy_access6" + "oc2:floppy_access1", + "oc2:floppy_access2", + "oc2:floppy_access3", + "oc2:floppy_access4", + "oc2:floppy_access5", + "oc2:floppy_access6" ] }, "floppy_eject": { "category": "block", - "subtitle": "subtitles.oc2r.floppy_eject", + "subtitle": "subtitles.oc2.floppy_eject", "sounds": [ - "oc2r:floppy_eject" + "oc2:floppy_eject" ] }, "floppy_insert": { "category": "block", - "subtitle": "subtitles.oc2r.floppy_insert", + "subtitle": "subtitles.oc2.floppy_insert", "sounds": [ - "oc2r:floppy_insert" + "oc2:floppy_insert" ] }, "hdd_access": { "category": "block", - "subtitle": "subtitles.oc2r.hdd", + "subtitle": "subtitles.oc2.hdd", "sounds": [ - "oc2r:hdd_access1", - "oc2r:hdd_access2", - "oc2r:hdd_access3", - "oc2r:hdd_access4", - "oc2r:hdd_access5", - "oc2r:hdd_access6", - "oc2r:hdd_access7" + "oc2:hdd_access1", + "oc2:hdd_access2", + "oc2:hdd_access3", + "oc2:hdd_access4", + "oc2:hdd_access5", + "oc2:hdd_access6", + "oc2:hdd_access7" ] } } diff --git a/src/main/resources/data/forge/tags/items/silicon.json b/src/main/resources/data/forge/tags/items/silicon.json index d566e40a..c3b650dc 100644 --- a/src/main/resources/data/forge/tags/items/silicon.json +++ b/src/main/resources/data/forge/tags/items/silicon.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "oc2r:silicon" + "oc2:silicon" ] } diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/block_operations_module.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/block_operations_module.json index bb282af4..835ea1f2 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:block_operations_module" + "oc2:block_operations_module" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:block_operations_module" + "recipe": "oc2:block_operations_module" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_cable.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_cable.json index 839490ad..a29a7546 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:bus_cable" + "oc2:bus_cable" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:bus_cable" + "recipe": "oc2:bus_cable" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_interface.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_interface.json index d7832faf..935f4928 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:bus_interface" + "oc2:bus_interface" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:bus_cable" + "oc2:bus_cable" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:bus_interface" + "recipe": "oc2:bus_interface" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/charger.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/charger.json index ff52545a..c84cc281 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:charger" + "oc2:charger" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:charger" + "recipe": "oc2:charger" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/circuit_board.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/circuit_board.json index 9c379c7f..eff1764d 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:circuit_board" + "oc2:circuit_board" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:circuit_board" + "recipe": "oc2:circuit_board" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/computer.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/computer.json index 75b91793..563cbcff 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:computer" + "oc2:computer" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:circuit_board" + "oc2:circuit_board" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:computer" + "recipe": "oc2:computer" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/disk_drive.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/disk_drive.json index 268c4330..fd987fe2 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:disk_drive" + "oc2:disk_drive" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:disk_drive" + "recipe": "oc2:disk_drive" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/file_import_export_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/file_import_export_card.json index f67d0400..9005454d 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:file_import_export_card" + "oc2:file_import_export_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:file_import_export_card" + "recipe": "oc2:file_import_export_card" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory.json index e884723b..c8970079 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:flash_memory" + "oc2:flash_memory" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:flash_memory" + "recipe": "oc2:flash_memory" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json index 68eb78c2..229e711b 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.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": [ - "oc2r:flash_memory_custom" + "oc2:flash_memory_custom" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:flash_memory_custom" + "recipe": "oc2:flash_memory_custom" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy.json index baa314a3..5babc04e 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:floppy" + "oc2:floppy" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:disk_drive" + "oc2:disk_drive" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:floppy" + "recipe": "oc2:floppy" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy_modern.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy_modern.json index 28c0542c..9a4e61c1 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:floppy_modern" + "oc2:floppy_modern" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:disk_drive" + "oc2:disk_drive" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:floppy_modern" + "recipe": "oc2:floppy_modern" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_custom.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_custom.json index 7eaca159..eef235fe 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:hard_drive_custom" + "oc2:hard_drive_custom" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:hard_drive_custom" + "recipe": "oc2:hard_drive_custom" } } }, 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 index 40a1eaf7..cb3f2ab8 100644 --- 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 @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2r:hard_drive_extra_large" + "oc2:hard_drive_extra_large" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:hard_drive_extra_large" + "recipe": "oc2:hard_drive_extra_large" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_large.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_large.json index fc89cdf5..54825ff2 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_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": [ - "oc2r:hard_drive_large" + "oc2:hard_drive_large" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:hard_drive_large" + "recipe": "oc2:hard_drive_large" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_medium.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_medium.json index c665a227..a2001806 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:hard_drive_medium" + "oc2:hard_drive_medium" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:hard_drive_medium" + "recipe": "oc2:hard_drive_medium" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_small.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_small.json index 3218fe44..4beea8ea 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:hard_drive_small" + "oc2:hard_drive_small" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:hard_drive_small" + "recipe": "oc2:hard_drive_small" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/inventory_operations_module.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/inventory_operations_module.json index 59fdb479..aaf42612 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:inventory_operations_module" + "oc2:inventory_operations_module" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:inventory_operations_module" + "recipe": "oc2:inventory_operations_module" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/keyboard.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/keyboard.json index acfb0b38..42621e67 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:keyboard" + "oc2:keyboard" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:keyboard" + "recipe": "oc2:keyboard" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/manual.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/manual.json index e0f34b34..06b00537 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:manual" + "oc2:manual" ] }, "criteria": { @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:wrench" + "oc2:wrench" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:manual" + "recipe": "oc2:manual" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.json index e93a97f1..a118ae62 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.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": [ - "oc2r:memory_extra_large" + "oc2:memory_extra_large" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:memory_extra_large" + "recipe": "oc2:memory_extra_large" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_large.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_large.json index bb2fa505..5e36f056 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:memory_large" + "oc2:memory_large" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:memory_large" + "recipe": "oc2:memory_large" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_medium.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_medium.json index b3c521c5..b1d788a9 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:memory_medium" + "oc2:memory_medium" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:memory_medium" + "recipe": "oc2:memory_medium" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_small.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_small.json index 097ba94e..afbcb638 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:memory_small" + "oc2:memory_small" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:memory_small" + "recipe": "oc2:memory_small" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_cable.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_cable.json index 45be0b8c..701afa28 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:network_cable" + "oc2:network_cable" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:network_connector" + "oc2:network_connector" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:network_cable" + "recipe": "oc2:network_cable" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_connector.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_connector.json index 11a17ab9..49fabf43 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:network_connector" + "oc2:network_connector" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:network_connector" + "recipe": "oc2:network_connector" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_hub.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_hub.json index ca4d0142..3a9d6069 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:network_hub" + "oc2:network_hub" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:network_connector" + "oc2:network_connector" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:network_hub" + "recipe": "oc2:network_hub" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_interface_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_interface_card.json index d98e37fd..127869cc 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:network_interface_card" + "oc2:network_interface_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:network_interface_card" + "recipe": "oc2:network_interface_card" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_card.json index b7326705..66976ca7 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:network_tunnel_card" + "oc2:network_tunnel_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:network_tunnel_card" + "recipe": "oc2:network_tunnel_card" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_module.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_module.json index 28a991df..277ace0e 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:network_tunnel_module" + "oc2:network_tunnel_module" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:robot" + "oc2:robot" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:network_tunnel_module" + "recipe": "oc2:network_tunnel_module" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/projector.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/projector.json index 57126887..ac163330 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:projector" + "oc2:projector" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:projector" + "recipe": "oc2:projector" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface.json index 15bbd455..b1238ace 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:redstone_interface" + "oc2:redstone_interface" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:redstone_interface" + "recipe": "oc2:redstone_interface" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface_card.json index 62adf5f0..0e6bfda6 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:redstone_interface_card" + "oc2:redstone_interface_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:redstone_interface_card" + "recipe": "oc2:redstone_interface_card" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/robot.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/robot.json index ffda9650..220f80cf 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:robot" + "oc2:robot" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -24,7 +24,7 @@ "items": [ { "items": [ - "oc2r:circuit_board" + "oc2:circuit_board" ] } ] @@ -33,7 +33,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:robot" + "recipe": "oc2:robot" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/sound_card.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/sound_card.json index 110a0649..b1a0b42a 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:sound_card" + "oc2:sound_card" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:computer" + "oc2:computer" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:sound_card" + "recipe": "oc2:sound_card" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/transistor.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/transistor.json index e63816b9..9a7babb8 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:transistor" + "oc2:transistor" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:transistor" + "recipe": "oc2:transistor" } } }, diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/wrench.json b/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/wrench.json index f85de253..4ccc36a5 100644 --- a/src/main/resources/data/oc2r/advancements/recipes/oc2r.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": [ - "oc2r:wrench" + "oc2:wrench" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "oc2r:transistor" + "oc2:transistor" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2r:wrench" + "recipe": "oc2:wrench" } } }, diff --git a/src/main/resources/data/oc2r/file_systems/README.md b/src/main/resources/data/oc2r/file_systems/README.md index a7e642f4..c174f59a 100644 --- a/src/main/resources/data/oc2r/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/ - - oc2r/ + - oc2/ - file_systems/ - my_block_descriptor.json - my_block.ext2 @@ -46,7 +46,7 @@ Example: ```json { "type": "layer", - "location": "oc2r:file_systems/my_layer.zip" + "location": "oc2:file_systems/my_layer.zip" } ``` @@ -64,6 +64,6 @@ Example: { "type": "block", "name": "My Disk Image", - "location": "oc2r:file_systems/my_block.ext2" + "location": "oc2: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 index 20a86de9..329b9040 100644 --- a/src/main/resources/data/oc2r/file_systems/scripts.json +++ b/src/main/resources/data/oc2r/file_systems/scripts.json @@ -1,5 +1,5 @@ { "type": "layer", "order": 0, - "location": "oc2r:file_systems/scripts.zip" + "location": "oc2:file_systems/scripts.zip" } 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 index 925610ed..ebf024ef 100644 --- 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 @@ -1,6 +1,6 @@ { - "item": "oc2r:hard_drive", + "item": "oc2:hard_drive", "tags": [ - "tag.oc2r.size" + "tag.oc2.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 index 09b08a11..fd16800b 100644 --- a/src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json +++ b/src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json @@ -1,6 +1,6 @@ { - "item": "oc2r:memory", + "item": "oc2:memory", "tags": [ - "tag.oc2r.size" + "tag.oc2.size" ] } diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/charger.json b/src/main/resources/data/oc2r/loot_tables/blocks/charger.json index c64fd5c0..c36a7f59 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:charger" + "name": "oc2:charger" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/computer.json b/src/main/resources/data/oc2r/loot_tables/blocks/computer.json index 38575b60..473150ec 100644 --- a/src/main/resources/data/oc2r/loot_tables/blocks/computer.json +++ b/src/main/resources/data/oc2r/loot_tables/blocks/computer.json @@ -25,7 +25,7 @@ ] } ], - "name": "oc2r:computer" + "name": "oc2:computer" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/disk_drive.json b/src/main/resources/data/oc2r/loot_tables/blocks/disk_drive.json index 8c638451..6e423399 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:disk_drive" + "name": "oc2:disk_drive" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/keyboard.json b/src/main/resources/data/oc2r/loot_tables/blocks/keyboard.json index 2466a709..48fcd18a 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:keyboard" + "name": "oc2:keyboard" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/network_connector.json b/src/main/resources/data/oc2r/loot_tables/blocks/network_connector.json index 0a4ad429..383dd98a 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:network_connector" + "name": "oc2:network_connector" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/network_hub.json b/src/main/resources/data/oc2r/loot_tables/blocks/network_hub.json index 4c95e834..74de0a72 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:network_hub" + "name": "oc2:network_hub" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/projector.json b/src/main/resources/data/oc2r/loot_tables/blocks/projector.json index bfd38da4..002e0f9e 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:projector" + "name": "oc2:projector" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/redstone_interface.json b/src/main/resources/data/oc2r/loot_tables/blocks/redstone_interface.json index f97aabc2..9cefca6e 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:redstone_interface" + "name": "oc2:redstone_interface" } ], "conditions": [ diff --git a/src/main/resources/data/oc2r/recipes/block_operations_module.json b/src/main/resources/data/oc2r/recipes/block_operations_module.json index 5ce54ecb..9a5df7ee 100644 --- a/src/main/resources/data/oc2r/recipes/block_operations_module.json +++ b/src/main/resources/data/oc2r/recipes/block_operations_module.json @@ -6,7 +6,7 @@ ], "key": { "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "P": { "item": "minecraft:diamond_pickaxe" @@ -15,10 +15,10 @@ "tag": "forge:ingots/gold" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:block_operations_module" + "item": "oc2:block_operations_module" } } diff --git a/src/main/resources/data/oc2r/recipes/bus_cable.json b/src/main/resources/data/oc2r/recipes/bus_cable.json index 0ec0a6f7..e98759f6 100644 --- a/src/main/resources/data/oc2r/recipes/bus_cable.json +++ b/src/main/resources/data/oc2r/recipes/bus_cable.json @@ -13,11 +13,11 @@ "tag": "forge:ingots/gold" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" } }, "result": { - "item": "oc2r:bus_cable", + "item": "oc2:bus_cable", "count": 16 } } diff --git a/src/main/resources/data/oc2r/recipes/bus_interface.json b/src/main/resources/data/oc2r/recipes/bus_interface.json index f9516f36..cbca7885 100644 --- a/src/main/resources/data/oc2r/recipes/bus_interface.json +++ b/src/main/resources/data/oc2r/recipes/bus_interface.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, { - "item": "oc2r:bus_cable" + "item": "oc2:bus_cable" } ], "result": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" } } diff --git a/src/main/resources/data/oc2r/recipes/charger.json b/src/main/resources/data/oc2r/recipes/charger.json index 4665cd53..189e4b74 100644 --- a/src/main/resources/data/oc2r/recipes/charger.json +++ b/src/main/resources/data/oc2r/recipes/charger.json @@ -13,16 +13,16 @@ "item": "minecraft:light_weighted_pressure_plate" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "R": { "tag": "forge:storage_blocks/redstone" } }, "result": { - "item": "oc2r:charger" + "item": "oc2:charger" } } diff --git a/src/main/resources/data/oc2r/recipes/circuit_board.json b/src/main/resources/data/oc2r/recipes/circuit_board.json index 2833e2a7..e9b4dcce 100644 --- a/src/main/resources/data/oc2r/recipes/circuit_board.json +++ b/src/main/resources/data/oc2r/recipes/circuit_board.json @@ -8,11 +8,11 @@ "item": "minecraft:clay_ball" }, { - "item": "oc2r:transistor" + "item": "oc2:transistor" } ], "result": { - "item": "oc2r:circuit_board", + "item": "oc2:circuit_board", "count": 6 } } diff --git a/src/main/resources/data/oc2r/recipes/computer.json b/src/main/resources/data/oc2r/recipes/computer.json index a3b96a9b..a3637e62 100644 --- a/src/main/resources/data/oc2r/recipes/computer.json +++ b/src/main/resources/data/oc2r/recipes/computer.json @@ -13,26 +13,26 @@ "tag": "forge:chests/wooden" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:computer", + "item": "oc2:computer", "nbt": { "BlockEntityTag": { "items": { - "translation{key='gui.oc2r.device_type.flash_memory', args=[]}": { + "translation{key='gui.oc2.device_type.flash_memory', args=[]}": { "Items": [ { "Slot": 0, "Count": 1, - "id": "oc2r:flash_memory_custom" + "id": "oc2:flash_memory_custom" } ], "Size": 1 diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_1.json b/src/main/resources/data/oc2r/recipes/cpu_tier_1.json index 5aaf1a5b..a008b16c 100644 --- a/src/main/resources/data/oc2r/recipes/cpu_tier_1.json +++ b/src/main/resources/data/oc2r/recipes/cpu_tier_1.json @@ -13,16 +13,16 @@ "tag": "forge:ingots/copper" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "S": { - "item": "oc2r:silicon_wafer" + "item": "oc2:silicon_wafer" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:cpu_tier_1" + "item": "oc2:cpu_tier_1" } } diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_2.json b/src/main/resources/data/oc2r/recipes/cpu_tier_2.json index 934b2abc..792073a3 100644 --- a/src/main/resources/data/oc2r/recipes/cpu_tier_2.json +++ b/src/main/resources/data/oc2r/recipes/cpu_tier_2.json @@ -13,16 +13,16 @@ "tag": "forge:ingots/copper" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "S": { - "item": "oc2r:silicon_wafer" + "item": "oc2:silicon_wafer" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:cpu_tier_2" + "item": "oc2:cpu_tier_2" } } diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_3.json b/src/main/resources/data/oc2r/recipes/cpu_tier_3.json index 0ccc5d31..9c95b49f 100644 --- a/src/main/resources/data/oc2r/recipes/cpu_tier_3.json +++ b/src/main/resources/data/oc2r/recipes/cpu_tier_3.json @@ -13,16 +13,16 @@ "tag": "forge:ingots/gold" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "S": { - "item": "oc2r:silicon_wafer" + "item": "oc2:silicon_wafer" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:cpu_tier_3" + "item": "oc2:cpu_tier_3" } } diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_4.json b/src/main/resources/data/oc2r/recipes/cpu_tier_4.json index 919ae71f..d2fecaed 100644 --- a/src/main/resources/data/oc2r/recipes/cpu_tier_4.json +++ b/src/main/resources/data/oc2r/recipes/cpu_tier_4.json @@ -13,16 +13,16 @@ "tag": "forge:ingots/gold" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "S": { - "item": "oc2r:silicon_wafer" + "item": "oc2:silicon_wafer" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:cpu_tier_4" + "item": "oc2:cpu_tier_4" } } diff --git a/src/main/resources/data/oc2r/recipes/disk_drive.json b/src/main/resources/data/oc2r/recipes/disk_drive.json index 09b18b33..d9549442 100644 --- a/src/main/resources/data/oc2r/recipes/disk_drive.json +++ b/src/main/resources/data/oc2r/recipes/disk_drive.json @@ -13,19 +13,19 @@ "tag": "minecraft:buttons" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "D": { "item": "minecraft:dispenser" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:disk_drive" + "item": "oc2:disk_drive" } } diff --git a/src/main/resources/data/oc2r/recipes/file_import_export_card.json b/src/main/resources/data/oc2r/recipes/file_import_export_card.json index c1b140fe..c8dbbdc9 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:file_import_export_card" + "item": "oc2:file_import_export_card" } } diff --git a/src/main/resources/data/oc2r/recipes/flash_memory.json b/src/main/resources/data/oc2r/recipes/flash_memory.json index 0d894848..1433ca13 100644 --- a/src/main/resources/data/oc2r/recipes/flash_memory.json +++ b/src/main/resources/data/oc2r/recipes/flash_memory.json @@ -9,16 +9,16 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "R": { "tag": "forge:dusts/redstone" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:flash_memory" + "item": "oc2:flash_memory" } } diff --git a/src/main/resources/data/oc2r/recipes/flash_memory_custom.json b/src/main/resources/data/oc2r/recipes/flash_memory_custom.json index 9b34456c..3004a95d 100644 --- a/src/main/resources/data/oc2r/recipes/flash_memory_custom.json +++ b/src/main/resources/data/oc2r/recipes/flash_memory_custom.json @@ -1,14 +1,14 @@ { - "type": "oc2r:wrench", + "type": "oc2:wrench", "ingredients": [ { - "item": "oc2r:wrench" + "item": "oc2:wrench" }, { - "item": "oc2r:flash_memory" + "item": "oc2:flash_memory" } ], "result": { - "item": "oc2r:flash_memory_custom" + "item": "oc2:flash_memory_custom" } } diff --git a/src/main/resources/data/oc2r/recipes/flash_memory_flasher.json b/src/main/resources/data/oc2r/recipes/flash_memory_flasher.json index c1898d41..896d065e 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "D": { "item": "minecraft:dropper" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:flash_memory_flasher" + "item": "oc2:flash_memory_flasher" } } diff --git a/src/main/resources/data/oc2r/recipes/floppy.json b/src/main/resources/data/oc2r/recipes/floppy.json index d1a3e384..0e8eab0a 100644 --- a/src/main/resources/data/oc2r/recipes/floppy.json +++ b/src/main/resources/data/oc2r/recipes/floppy.json @@ -9,16 +9,16 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "Q": { "tag": "forge:gems/quartz" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:floppy" + "item": "oc2:floppy" } } diff --git a/src/main/resources/data/oc2r/recipes/floppy_modern.json b/src/main/resources/data/oc2r/recipes/floppy_modern.json index 715bc81b..65343e20 100644 --- a/src/main/resources/data/oc2r/recipes/floppy_modern.json +++ b/src/main/resources/data/oc2r/recipes/floppy_modern.json @@ -10,16 +10,16 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "Q": { "tag": "forge:gems/quartz" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:floppy_modern" + "item": "oc2: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 index 77bca18b..6df0e213 100644 --- a/src/main/resources/data/oc2r/recipes/hard_drive_custom.json +++ b/src/main/resources/data/oc2r/recipes/hard_drive_custom.json @@ -1,14 +1,14 @@ { - "type": "oc2r:wrench", + "type": "oc2:wrench", "ingredients": [ { - "item": "oc2r:wrench" + "item": "oc2:wrench" }, { - "item": "oc2r:hard_drive_large" + "item": "oc2:hard_drive_large" } ], "result": { - "item": "oc2r:hard_drive_custom" + "item": "oc2:hard_drive_custom" } } diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_extra_large.json b/src/main/resources/data/oc2r/recipes/hard_drive_extra_large.json index a881a42a..4b37f468 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2r:hard_drive_extra_large" + "item": "oc2:hard_drive_extra_large" } } diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_large.json b/src/main/resources/data/oc2r/recipes/hard_drive_large.json index 42025d78..8096710c 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2r:hard_drive_large" + "item": "oc2:hard_drive_large" } } diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_medium.json b/src/main/resources/data/oc2r/recipes/hard_drive_medium.json index 77977c79..c968f9b9 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2r:hard_drive_medium" + "item": "oc2:hard_drive_medium" } } diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_small.json b/src/main/resources/data/oc2r/recipes/hard_drive_small.json index 6cebe302..7d326dc1 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2r:hard_drive_small" + "item": "oc2:hard_drive_small" } } diff --git a/src/main/resources/data/oc2r/recipes/inventory_operations_module.json b/src/main/resources/data/oc2r/recipes/inventory_operations_module.json index 642eed34..a3a3cfb7 100644 --- a/src/main/resources/data/oc2r/recipes/inventory_operations_module.json +++ b/src/main/resources/data/oc2r/recipes/inventory_operations_module.json @@ -6,7 +6,7 @@ ], "key": { "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "C": { "tag": "forge:chests/wooden" @@ -15,10 +15,10 @@ "tag": "forge:ingots/gold" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:inventory_operations_module" + "item": "oc2:inventory_operations_module" } } diff --git a/src/main/resources/data/oc2r/recipes/keyboard.json b/src/main/resources/data/oc2r/recipes/keyboard.json index 290fdbf9..3f636e8f 100644 --- a/src/main/resources/data/oc2r/recipes/keyboard.json +++ b/src/main/resources/data/oc2r/recipes/keyboard.json @@ -13,16 +13,16 @@ "tag": "minecraft:buttons" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:keyboard" + "item": "oc2:keyboard" } } diff --git a/src/main/resources/data/oc2r/recipes/manual.json b/src/main/resources/data/oc2r/recipes/manual.json index e5bca1f0..6338b4b3 100644 --- a/src/main/resources/data/oc2r/recipes/manual.json +++ b/src/main/resources/data/oc2r/recipes/manual.json @@ -1,14 +1,14 @@ { - "type": "oc2r:wrench", + "type": "oc2:wrench", "ingredients": [ { - "item": "oc2r:wrench" + "item": "oc2:wrench" }, { "item": "minecraft:book" } ], "result": { - "item": "oc2r:manual" + "item": "oc2:manual" } } diff --git a/src/main/resources/data/oc2r/recipes/memory_extra_large.json b/src/main/resources/data/oc2r/recipes/memory_extra_large.json index 00ed5000..d1dbd6ec 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" }, "E": { "tag": "forge:gems/emerald" } }, "result": { - "item": "oc2r:memory_extra_large", + "item": "oc2:memory_extra_large", "count": 2 } } diff --git a/src/main/resources/data/oc2r/recipes/memory_large.json b/src/main/resources/data/oc2r/recipes/memory_large.json index 77861f46..9a99c780 100644 --- a/src/main/resources/data/oc2r/recipes/memory_large.json +++ b/src/main/resources/data/oc2r/recipes/memory_large.json @@ -9,14 +9,14 @@ "tag": "forge:gems/diamond" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:memory_large", + "item": "oc2:memory_large", "count": 2 } } diff --git a/src/main/resources/data/oc2r/recipes/memory_medium.json b/src/main/resources/data/oc2r/recipes/memory_medium.json index f90b62ca..81a49fac 100644 --- a/src/main/resources/data/oc2r/recipes/memory_medium.json +++ b/src/main/resources/data/oc2r/recipes/memory_medium.json @@ -9,14 +9,14 @@ "tag": "forge:ingots/gold" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:memory_medium", + "item": "oc2:memory_medium", "count": 2 } } diff --git a/src/main/resources/data/oc2r/recipes/memory_small.json b/src/main/resources/data/oc2r/recipes/memory_small.json index f24196da..31cda205 100644 --- a/src/main/resources/data/oc2r/recipes/memory_small.json +++ b/src/main/resources/data/oc2r/recipes/memory_small.json @@ -9,14 +9,14 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:memory_small", + "item": "oc2:memory_small", "count": 2 } } diff --git a/src/main/resources/data/oc2r/recipes/network_cable.json b/src/main/resources/data/oc2r/recipes/network_cable.json index f4ec5641..7d6bb7ef 100644 --- a/src/main/resources/data/oc2r/recipes/network_cable.json +++ b/src/main/resources/data/oc2r/recipes/network_cable.json @@ -13,11 +13,11 @@ "tag": "forge:glass" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" } }, "result": { - "item": "oc2r:network_cable", + "item": "oc2:network_cable", "count": 8 } } diff --git a/src/main/resources/data/oc2r/recipes/network_connector.json b/src/main/resources/data/oc2r/recipes/network_connector.json index 13d8b8c8..9ce76176 100644 --- a/src/main/resources/data/oc2r/recipes/network_connector.json +++ b/src/main/resources/data/oc2r/recipes/network_connector.json @@ -12,11 +12,11 @@ "tag": "forge:glass" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" } }, "result": { - "item": "oc2r:network_connector", + "item": "oc2:network_connector", "count": 4 } } diff --git a/src/main/resources/data/oc2r/recipes/network_hub.json b/src/main/resources/data/oc2r/recipes/network_hub.json index 209eeff2..f445e76b 100644 --- a/src/main/resources/data/oc2r/recipes/network_hub.json +++ b/src/main/resources/data/oc2r/recipes/network_hub.json @@ -10,19 +10,19 @@ "tag": "forge:ingots/iron" }, "C": { - "item": "oc2r:network_connector" + "item": "oc2:network_connector" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:network_hub" + "item": "oc2:network_hub" } } diff --git a/src/main/resources/data/oc2r/recipes/network_interface_card.json b/src/main/resources/data/oc2r/recipes/network_interface_card.json index 241cda90..8d7ece8c 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:network_interface_card" + "item": "oc2:network_interface_card" } } diff --git a/src/main/resources/data/oc2r/recipes/network_tunnel_card.json b/src/main/resources/data/oc2r/recipes/network_tunnel_card.json index d31c8170..10ceb13e 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:network_tunnel_card" + "item": "oc2:network_tunnel_card" } } diff --git a/src/main/resources/data/oc2r/recipes/network_tunnel_module.json b/src/main/resources/data/oc2r/recipes/network_tunnel_module.json index 13e6a819..1d704fd4 100644 --- a/src/main/resources/data/oc2r/recipes/network_tunnel_module.json +++ b/src/main/resources/data/oc2r/recipes/network_tunnel_module.json @@ -6,7 +6,7 @@ ], "key": { "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "E": { "tag": "forge:ender_pearls" @@ -15,10 +15,10 @@ "tag": "forge:ingots/gold" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:network_tunnel_module" + "item": "oc2:network_tunnel_module" } } diff --git a/src/main/resources/data/oc2r/recipes/projector.json b/src/main/resources/data/oc2r/recipes/projector.json index 64c05169..5d7a0663 100644 --- a/src/main/resources/data/oc2r/recipes/projector.json +++ b/src/main/resources/data/oc2r/recipes/projector.json @@ -16,16 +16,16 @@ "tag": "forge:gems/diamond" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:projector" + "item": "oc2:projector" } } diff --git a/src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json b/src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json index f52ce402..5fff1630 100644 --- a/src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json +++ b/src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "oc2r:raw_silicon_wafer", + "item": "oc2:raw_silicon_wafer", "count": 1 } } diff --git a/src/main/resources/data/oc2r/recipes/redstone_interface.json b/src/main/resources/data/oc2r/recipes/redstone_interface.json index 1f205f7a..340ec5f4 100644 --- a/src/main/resources/data/oc2r/recipes/redstone_interface.json +++ b/src/main/resources/data/oc2r/recipes/redstone_interface.json @@ -13,16 +13,16 @@ "item": "minecraft:comparator" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "X": { - "item": "oc2r:bus_interface" + "item": "oc2:bus_interface" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:redstone_interface" + "item": "oc2:redstone_interface" } } diff --git a/src/main/resources/data/oc2r/recipes/redstone_interface_card.json b/src/main/resources/data/oc2r/recipes/redstone_interface_card.json index dcfb4b77..9060b996 100644 --- a/src/main/resources/data/oc2r/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": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:redstone_interface_card" + "item": "oc2:redstone_interface_card" } } diff --git a/src/main/resources/data/oc2r/recipes/robot.json b/src/main/resources/data/oc2r/recipes/robot.json index 9ebc91ec..f36e68a9 100644 --- a/src/main/resources/data/oc2r/recipes/robot.json +++ b/src/main/resources/data/oc2r/recipes/robot.json @@ -16,23 +16,23 @@ "item": "minecraft:piston" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:robot", + "item": "oc2:robot", "nbt": { - "oc2r": { + "oc2": { "items": { - "translation{key='gui.oc2r.device_type.flash_memory', args=[]}": { + "translation{key='gui.oc2.device_type.flash_memory', args=[]}": { "Items": [ { "Slot": 0, "Count": 1, - "id": "oc2r:flash_memory_custom" + "id": "oc2:flash_memory_custom" } ], "Size": 1 diff --git a/src/main/resources/data/oc2r/recipes/silicon.json b/src/main/resources/data/oc2r/recipes/silicon.json index e09d10de..ccedf3a9 100644 --- a/src/main/resources/data/oc2r/recipes/silicon.json +++ b/src/main/resources/data/oc2r/recipes/silicon.json @@ -1,9 +1,9 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "oc2r:silicon_blend" + "item": "oc2:silicon_blend" }, - "result": "oc2r:silicon", + "result": "oc2:silicon", "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/oc2r/recipes/silicon_blend.json b/src/main/resources/data/oc2r/recipes/silicon_blend.json index 1469857b..8d17375a 100644 --- a/src/main/resources/data/oc2r/recipes/silicon_blend.json +++ b/src/main/resources/data/oc2r/recipes/silicon_blend.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "oc2r:silicon_blend", + "item": "oc2:silicon_blend", "count": 4 } } diff --git a/src/main/resources/data/oc2r/recipes/silicon_wafer.json b/src/main/resources/data/oc2r/recipes/silicon_wafer.json index 55c041e6..379fb5d1 100644 --- a/src/main/resources/data/oc2r/recipes/silicon_wafer.json +++ b/src/main/resources/data/oc2r/recipes/silicon_wafer.json @@ -1,9 +1,9 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "oc2r:raw_silicon_wafer" + "item": "oc2:raw_silicon_wafer" }, - "result": "oc2r:silicon_wafer", + "result": "oc2:silicon_wafer", "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/oc2r/recipes/sound_card.json b/src/main/resources/data/oc2r/recipes/sound_card.json index e2b7dce4..1c6bfead 100644 --- a/src/main/resources/data/oc2r/recipes/sound_card.json +++ b/src/main/resources/data/oc2r/recipes/sound_card.json @@ -12,13 +12,13 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" }, "B": { - "item": "oc2r:circuit_board" + "item": "oc2:circuit_board" } }, "result": { - "item": "oc2r:sound_card" + "item": "oc2:sound_card" } } diff --git a/src/main/resources/data/oc2r/recipes/transistor.json b/src/main/resources/data/oc2r/recipes/transistor.json index 2ce9a859..74c6b522 100644 --- a/src/main/resources/data/oc2r/recipes/transistor.json +++ b/src/main/resources/data/oc2r/recipes/transistor.json @@ -16,7 +16,7 @@ } }, "result": { - "item": "oc2r:transistor", + "item": "oc2:transistor", "count": 12 } } diff --git a/src/main/resources/data/oc2r/recipes/unflash.json b/src/main/resources/data/oc2r/recipes/unflash.json index b6242eaa..5c721a71 100644 --- a/src/main/resources/data/oc2r/recipes/unflash.json +++ b/src/main/resources/data/oc2r/recipes/unflash.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "oc2r:flash_memory_custom" + "item": "oc2:flash_memory_custom" } ], "result": { - "item": "oc2r:flash_memory" + "item": "oc2:flash_memory" } } diff --git a/src/main/resources/data/oc2r/recipes/wrench.json b/src/main/resources/data/oc2r/recipes/wrench.json index 4f560be4..b349ea43 100644 --- a/src/main/resources/data/oc2r/recipes/wrench.json +++ b/src/main/resources/data/oc2r/recipes/wrench.json @@ -10,10 +10,10 @@ "tag": "forge:ingots/iron" }, "T": { - "item": "oc2r:transistor" + "item": "oc2:transistor" } }, "result": { - "item": "oc2r:wrench" + "item": "oc2:wrench" } } diff --git a/src/main/resources/data/oc2r/tags/blocks/cables.json b/src/main/resources/data/oc2r/tags/blocks/cables.json index c2fda5e5..8fda7d91 100644 --- a/src/main/resources/data/oc2r/tags/blocks/cables.json +++ b/src/main/resources/data/oc2r/tags/blocks/cables.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "oc2r:bus_cable" + "oc2:bus_cable" ] } diff --git a/src/main/resources/data/oc2r/tags/blocks/devices.json b/src/main/resources/data/oc2r/tags/blocks/devices.json index fa8dbb43..70f6bc35 100644 --- a/src/main/resources/data/oc2r/tags/blocks/devices.json +++ b/src/main/resources/data/oc2r/tags/blocks/devices.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "oc2r:computer", - "oc2r:redstone_interface", - "oc2r:disk_drive", - "oc2r:projector" + "oc2:computer", + "oc2:redstone_interface", + "oc2:disk_drive", + "oc2: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 index 3df66895..5a72f850 100644 --- a/src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json +++ b/src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json @@ -1,13 +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" + "oc2:computer", + "oc2:bus_cable", + "oc2:network_connector", + "oc2:network_hub", + "oc2:redstone_interface", + "oc2:disk_drive", + "oc2:charger", + "oc2:projector" ] } diff --git a/src/main/resources/data/oc2r/tags/items/cables.json b/src/main/resources/data/oc2r/tags/items/cables.json index c2fda5e5..8fda7d91 100644 --- a/src/main/resources/data/oc2r/tags/items/cables.json +++ b/src/main/resources/data/oc2r/tags/items/cables.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "oc2r:bus_cable" + "oc2:bus_cable" ] } 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 index 45c4bad5..50ec87fa 100644 --- a/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json +++ b/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json @@ -1,26 +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" + "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/oc2r/tags/items/devices.json b/src/main/resources/data/oc2r/tags/items/devices.json index 70b89ba1..bc44270c 100644 --- a/src/main/resources/data/oc2r/tags/items/devices.json +++ b/src/main/resources/data/oc2r/tags/items/devices.json @@ -1,16 +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" + "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/oc2r/tags/items/devices/card.json b/src/main/resources/data/oc2r/tags/items/devices/card.json index 6109ce21..3b8f72d0 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/card.json +++ b/src/main/resources/data/oc2r/tags/items/devices/card.json @@ -1,10 +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" + "oc2:redstone_interface_card", + "oc2:network_interface_card", + "oc2:file_import_export_card", + "oc2:sound_card", + "oc2: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 index 5282a5fc..0abfb014 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/cpu.json +++ b/src/main/resources/data/oc2r/tags/items/devices/cpu.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "oc2r:cpu_tier_1", - "oc2r:cpu_tier_2", - "oc2r:cpu_tier_3", - "oc2r:cpu_tier_4" + "oc2:cpu_tier_1", + "oc2:cpu_tier_2", + "oc2:cpu_tier_3", + "oc2: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 index 4c672487..ea2de6f4 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/flash_memory.json +++ b/src/main/resources/data/oc2r/tags/items/devices/flash_memory.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "oc2r:flash_memory", - "oc2r:flash_memory_custom" + "oc2:flash_memory", + "oc2: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 index efa9ca65..f1fd7e1f 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/floppy.json +++ b/src/main/resources/data/oc2r/tags/items/devices/floppy.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "oc2r:floppy", - "oc2r:floppy_modern" + "oc2:floppy", + "oc2: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 index b57141c5..30764a13 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json +++ b/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json @@ -1,10 +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" + "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/oc2r/tags/items/devices/memory.json b/src/main/resources/data/oc2r/tags/items/devices/memory.json index 928bd07b..c2ed3079 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/memory.json +++ b/src/main/resources/data/oc2r/tags/items/devices/memory.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "oc2r:memory_small", - "oc2r:memory_medium", - "oc2r:memory_large", - "oc2r:memory_extra_large" + "oc2:memory_small", + "oc2:memory_medium", + "oc2:memory_large", + "oc2: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 index ef155361..76845085 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json +++ b/src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "oc2r:network_tunnel_card", - "oc2r:network_tunnel_module" + "oc2:network_tunnel_card", + "oc2: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 index 0b184616..7b7ec73c 100644 --- a/src/main/resources/data/oc2r/tags/items/devices/robot_module.json +++ b/src/main/resources/data/oc2r/tags/items/devices/robot_module.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "oc2r:inventory_operations_module", - "oc2r:block_operations_module", - "oc2r:network_tunnel_module" + "oc2:inventory_operations_module", + "oc2:block_operations_module", + "oc2: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 index 7a9493ff..2cf45fa2 100644 --- a/src/main/resources/data/oc2r/tags/items/tool_materials.json +++ b/src/main/resources/data/oc2r/tags/items/tool_materials.json @@ -1,11 +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" + "#oc2:tool_materials/wood", + "#oc2:tool_materials/stone", + "#oc2:tool_materials/iron", + "#oc2:tool_materials/gold", + "#oc2:tool_materials/diamond", + "#oc2:tool_materials/netherite" ] } diff --git a/src/main/resources/data/oc2r/tags/items/wrenches.json b/src/main/resources/data/oc2r/tags/items/wrenches.json index d66e16de..d97158c9 100644 --- a/src/main/resources/data/oc2r/tags/items/wrenches.json +++ b/src/main/resources/data/oc2r/tags/items/wrenches.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "oc2r:wrench" + "oc2:wrench" ] } diff --git a/src/main/resources/mixins.oc2r.json b/src/main/resources/mixins.oc2r.json index 4f3e97c2..3e9d9541 100644 --- a/src/main/resources/mixins.oc2r.json +++ b/src/main/resources/mixins.oc2r.json @@ -2,8 +2,8 @@ "minVersion": "0.8.5", "compatibilityLevel": "JAVA_17", "required": true, - "package": "li.cil.oc2r.common.mixin", - "refmap": "mixins.oc2r.refmap.json", + "package": "li.cil.oc2.common.mixin", + "refmap": "mixins.oc2.refmap.json", "mixins": [ "ServerChunkCacheMixin" ],