Changed back to old file directories going from oc2r -> oc2

README.md

@@ -26,12 +26,12 @@ 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
+[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

src/main/java/li/cil/oc2/api/API.java

@@ -1,11 +1,11 @@
 /* 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;
 

src/main/java/li/cil/oc2/api/README.md

@@ -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() {
@@ -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 {
@@ -235,8 +235,8 @@ 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<BlockDeviceProvider> 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<BlockDeviceProvider> 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;
 

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/api/bus/device/data/package-info.java

@@ -2,7 +2,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api.bus.device.rpc;
+package li.cil.oc2.api.bus.device.data;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/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;
  * <p>
  * 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)

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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}.

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java

@@ -1,12 +1,12 @@
 /* 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.oc2r.api.bus.device.rpc.RPCEventSource;
+import li.cil.oc2.api.bus.device.ItemDevice;
+import li.cil.oc2.api.bus.device.rpc.RPCDevice;
+import li.cil.oc2.api.bus.device.rpc.RPCMethod;
+import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup;
+import li.cil.oc2.api.bus.device.rpc.RPCEventSource;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/api/bus/device/object/package-info.java

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.api.bus.device.object;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/li/cil/oc2/api/bus/device/package-info.java

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.api.bus.device;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/li/cil/oc2/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.
  * <p>
  * 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.
  * <p>
@@ -39,9 +39,9 @@ import net.minecraft.nbt.CompoundTag;
  * }
  * </pre>
  *
- * @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 {

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;
  * }
  * </pre>
  *
- * @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 {

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.api.bus.device.provider;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/api/bus/device/rpc/IEventSink.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.JsonElement;
 import java.util.UUID;
 

src/main/java/li/cil/oc2/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;
  * </pre>
  *
  * @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 {
     /**

src/main/java/li/cil/oc2/api/bus/device/rpc/RPCEventSource.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.*;
 

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;
  * <p>
  * 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
  */

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/api/bus/device/rpc/package-info.java

@@ -2,7 +2,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api.bus.device.vm;
+package li.cil.oc2.api.bus.device.rpc;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/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.

src/main/java/li/cil/oc2/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 {
     /**

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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.

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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 {
     /**

src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.api.bus.device.vm.context;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/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.

src/main/java/li/cil/oc2/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

src/main/java/li/cil/oc2/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.

src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.api.bus.device.vm.event;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/li/cil/oc2/api/bus/device/vm/package-info.java

@@ -2,7 +2,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api.capabilities;
+package li.cil.oc2.api.bus.device.vm;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/api/bus/package-info.java

@@ -3,29 +3,29 @@
 /**
  * The device bus is the glue that connects devices and VMs.
  * <p>
- * 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.
  * <p>
  * 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.
  * <p>
- * {@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.
  * <p>
- * 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.
  * <p>
  * 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}.
  * <ul>
  * <li>
  * 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;
 

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/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

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/api/capabilities/package-info.java

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.api.capabilities;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/li/cil/oc2/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;
 

src/main/java/li/cil/oc2/api/imc/package-info.java

@@ -2,7 +2,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.client;
+package li.cil.oc2.api.imc;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/api/inet/InternetDeviceLifecycle.java

@@ -1,4 +1,4 @@
-package li.cil.oc2r.api.inet;
+package li.cil.oc2.api.inet;
 
 import net.minecraft.nbt.Tag;
 

src/main/java/li/cil/oc2/api/inet/InternetManager.java

@@ -1,4 +1,4 @@
-package li.cil.oc2r.api.inet;
+package li.cil.oc2.api.inet;
 
 public interface InternetManager {
 

src/main/java/li/cil/oc2/api/inet/LayerParameters.java

@@ -1,4 +1,4 @@
-package li.cil.oc2r.api.inet;
+package li.cil.oc2.api.inet;
 
 import net.minecraft.nbt.Tag;
 

src/main/java/li/cil/oc2/api/inet/TransportMessage.java

@@ -1,7 +1,7 @@
-package li.cil.oc2r.api.inet;
+package li.cil.oc2.api.inet;
 
-import li.cil.oc2r.api.inet.layer.NetworkLayer;
-import li.cil.oc2r.common.inet.InetUtils;
+import li.cil.oc2.api.inet.layer.NetworkLayer;
+import li.cil.oc2.common.inet.InetUtils;
 
 import java.net.InetAddress;
 import java.nio.ByteBuffer;

src/main/java/li/cil/oc2/api/inet/layer/LinkLocalLayer.java

@@ -1,7 +1,7 @@
-package li.cil.oc2r.api.inet.layer;
+package li.cil.oc2.api.inet.layer;
 
-import li.cil.oc2r.api.inet.InternetDeviceLifecycle;
-import li.cil.oc2r.api.inet.provider.NetworkLayerInternetProvider;
+import li.cil.oc2.api.inet.InternetDeviceLifecycle;
+import li.cil.oc2.api.inet.provider.NetworkLayerInternetProvider;
 
 import java.nio.ByteBuffer;
 

src/main/java/li/cil/oc2/api/inet/layer/NetworkLayer.java

@@ -1,7 +1,7 @@
-package li.cil.oc2r.api.inet.layer;
+package li.cil.oc2.api.inet.layer;
 
-import li.cil.oc2r.api.inet.InternetDeviceLifecycle;
-import li.cil.oc2r.api.inet.provider.TransportLayerInternetProvider;
+import li.cil.oc2.api.inet.InternetDeviceLifecycle;
+import li.cil.oc2.api.inet.provider.TransportLayerInternetProvider;
 
 import java.nio.ByteBuffer;
 

src/main/java/li/cil/oc2/api/inet/layer/SessionLayer.java

@@ -1,7 +1,7 @@
-package li.cil.oc2r.api.inet.layer;
+package li.cil.oc2.api.inet.layer;
 
-import li.cil.oc2r.api.inet.InternetDeviceLifecycle;
-import li.cil.oc2r.api.inet.session.Session;
+import li.cil.oc2.api.inet.InternetDeviceLifecycle;
+import li.cil.oc2.api.inet.session.Session;
 
 import javax.annotation.Nullable;
 import java.nio.ByteBuffer;

src/main/java/li/cil/oc2/api/inet/layer/TransportLayer.java

@@ -1,8 +1,8 @@
-package li.cil.oc2r.api.inet.layer;
+package li.cil.oc2.api.inet.layer;
 
-import li.cil.oc2r.api.inet.InternetDeviceLifecycle;
-import li.cil.oc2r.api.inet.TransportMessage;
-import li.cil.oc2r.api.inet.provider.SessionLayerInternetProvider;
+import li.cil.oc2.api.inet.InternetDeviceLifecycle;
+import li.cil.oc2.api.inet.TransportMessage;
+import li.cil.oc2.api.inet.provider.SessionLayerInternetProvider;
 
 /**
  * Transport TCP/IP layer interface.

src/main/java/li/cil/oc2/api/inet/layer/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api.inet.layer;
+package li.cil.oc2.api.inet.layer;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/api/inet/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api.inet;
+package li.cil.oc2.api.inet;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/api/inet/provider/InternetProvider.java

@@ -1,7 +1,7 @@
-package li.cil.oc2r.api.inet.provider;
+package li.cil.oc2.api.inet.provider;
 
-import li.cil.oc2r.api.inet.LayerParameters;
-import li.cil.oc2r.api.inet.layer.LinkLocalLayer;
+import li.cil.oc2.api.inet.LayerParameters;
+import li.cil.oc2.api.inet.layer.LinkLocalLayer;
 
 /**
  * Internet access provider for oc2:internet-card item.

src/main/java/li/cil/oc2/api/inet/provider/LinkLocalLayerInternetProvider.java

@@ -1,9 +1,9 @@
-package li.cil.oc2r.api.inet.provider;
+package li.cil.oc2.api.inet.provider;
 
-import li.cil.oc2r.api.inet.LayerParameters;
-import li.cil.oc2r.api.inet.layer.LinkLocalLayer;
-import li.cil.oc2r.api.inet.layer.NetworkLayer;
-import li.cil.oc2r.common.inet.*;
+import li.cil.oc2.api.inet.LayerParameters;
+import li.cil.oc2.api.inet.layer.LinkLocalLayer;
+import li.cil.oc2.api.inet.layer.NetworkLayer;
+import li.cil.oc2.common.inet.*;
 
 /**
  * An {@link InternetProvider} partial implementation that expects an {@link LinkLocalLayer} implementation from

src/main/java/li/cil/oc2/api/inet/provider/NetworkLayerInternetProvider.java

@@ -1,13 +1,13 @@
-package li.cil.oc2r.api.inet.provider;
+package li.cil.oc2.api.inet.provider;
 
-import li.cil.oc2r.api.inet.LayerParameters;
-import li.cil.oc2r.api.inet.layer.LinkLocalLayer;
-import li.cil.oc2r.api.inet.layer.NetworkLayer;
-import li.cil.oc2r.api.inet.layer.TransportLayer;
-import li.cil.oc2r.common.inet.DefaultLinkLocalLayer;
-import li.cil.oc2r.common.inet.DefaultNetworkLayer;
-import li.cil.oc2r.common.inet.InetUtils;
-import li.cil.oc2r.common.inet.NullLayer;
+import li.cil.oc2.api.inet.LayerParameters;
+import li.cil.oc2.api.inet.layer.LinkLocalLayer;
+import li.cil.oc2.api.inet.layer.NetworkLayer;
+import li.cil.oc2.api.inet.layer.TransportLayer;
+import li.cil.oc2.common.inet.DefaultLinkLocalLayer;
+import li.cil.oc2.common.inet.DefaultNetworkLayer;
+import li.cil.oc2.common.inet.InetUtils;
+import li.cil.oc2.common.inet.NullLayer;
 
 /**
  * An {@link InternetProvider} partial implementation that expects an {@link NetworkLayer} implementation from

src/main/java/li/cil/oc2/api/inet/provider/SessionLayerInternetProvider.java

@@ -1,12 +1,12 @@
-package li.cil.oc2r.api.inet.provider;
+package li.cil.oc2.api.inet.provider;
 
-import li.cil.oc2r.api.inet.LayerParameters;
-import li.cil.oc2r.api.inet.layer.SessionLayer;
-import li.cil.oc2r.api.inet.layer.TransportLayer;
-import li.cil.oc2r.common.inet.DefaultSessionLayer;
-import li.cil.oc2r.common.inet.DefaultTransportLayer;
-import li.cil.oc2r.common.inet.InetUtils;
-import li.cil.oc2r.common.inet.NullLayer;
+import li.cil.oc2.api.inet.LayerParameters;
+import li.cil.oc2.api.inet.layer.SessionLayer;
+import li.cil.oc2.api.inet.layer.TransportLayer;
+import li.cil.oc2.common.inet.DefaultSessionLayer;
+import li.cil.oc2.common.inet.DefaultTransportLayer;
+import li.cil.oc2.common.inet.InetUtils;
+import li.cil.oc2.common.inet.NullLayer;
 
 /**
  * An {@link InternetProvider} partial implementation that expects an {@link SessionLayer} implementation from

src/main/java/li/cil/oc2/api/inet/provider/TransportLayerInternetProvider.java

@@ -1,13 +1,13 @@
-package li.cil.oc2r.api.inet.provider;
+package li.cil.oc2.api.inet.provider;
 
-import li.cil.oc2r.api.inet.LayerParameters;
-import li.cil.oc2r.api.inet.layer.NetworkLayer;
-import li.cil.oc2r.api.inet.layer.SessionLayer;
-import li.cil.oc2r.api.inet.layer.TransportLayer;
-import li.cil.oc2r.common.inet.DefaultNetworkLayer;
-import li.cil.oc2r.common.inet.DefaultTransportLayer;
-import li.cil.oc2r.common.inet.InetUtils;
-import li.cil.oc2r.common.inet.NullLayer;
+import li.cil.oc2.api.inet.LayerParameters;
+import li.cil.oc2.api.inet.layer.NetworkLayer;
+import li.cil.oc2.api.inet.layer.SessionLayer;
+import li.cil.oc2.api.inet.layer.TransportLayer;
+import li.cil.oc2.common.inet.DefaultNetworkLayer;
+import li.cil.oc2.common.inet.DefaultTransportLayer;
+import li.cil.oc2.common.inet.InetUtils;
+import li.cil.oc2.common.inet.NullLayer;
 
 /**
  * An {@link InternetProvider} partial implementation that expects an {@link TransportLayer} implementation from

src/main/java/li/cil/oc2/api/inet/provider/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api.inet.provider;
+package li.cil.oc2.api.inet.provider;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/api/inet/session/DatagramSession.java

@@ -1,4 +1,4 @@
-package li.cil.oc2r.api.inet.session;
+package li.cil.oc2.api.inet.session;
 
 public interface DatagramSession extends Session {
 }

src/main/java/li/cil/oc2/api/inet/session/EchoSession.java

@@ -1,4 +1,4 @@
-package li.cil.oc2r.api.inet.session;
+package li.cil.oc2.api.inet.session;
 
 public interface EchoSession extends Session {
     int getSequenceNumber();

src/main/java/li/cil/oc2/api/inet/session/Session.java

@@ -1,4 +1,4 @@
-package li.cil.oc2r.api.inet.session;
+package li.cil.oc2.api.inet.session;
 
 import javax.annotation.Nullable;
 import java.net.InetSocketAddress;

src/main/java/li/cil/oc2/api/inet/session/StreamSession.java

@@ -1,4 +1,4 @@
-package li.cil.oc2r.api.inet.session;
+package li.cil.oc2.api.inet.session;
 
 import java.nio.ByteBuffer;
 

src/main/java/li/cil/oc2/api/package-info.java

@@ -2,7 +2,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api;
+package li.cil.oc2.api;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/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.
  * <p>
  * 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,

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;
 import net.minecraft.core.BlockPos;
@@ -10,7 +10,7 @@ import javax.annotation.Nullable;
 /**
  * This enum indicates a side of a block device.
  * <p>
- * 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.

src/main/java/li/cil/oc2/api/util/package-info.java

@@ -2,7 +2,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2r.api.imc;
+package li.cil.oc2.api.util;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/client/audio/package-info.java

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.client.audio;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/li/cil/oc2/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<T extends AbstractMachineTerminalContainer> extends AbstractModContainerScreen<T> {

src/main/java/li/cil/oc2/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<T extends AbstractMachineTerminalContainer> extends AbstractModContainerScreen<T> {

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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<T extends AbstractMonitorContainer> extends AbstractModContainerScreen<T> {

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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();

src/main/java/li/cil/oc2/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;

src/main/java/li/cil/oc2/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;