diff --git a/README.md b/README.md index ccc1834a..e5236bff 100644 --- a/README.md +++ b/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/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 +[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/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 diff --git a/build.gradle b/build.gradle index 8e4a9b17..b1814e8a 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ def getGitRef() { } version = "${semver}+${getGitRef()}" -group = "li.cil.oc2" +group = "li.cil.oc2r" java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -172,30 +172,30 @@ minecraft { client { workingDirectory project.file("runclient") - property "forge.enabledGameTestNamespaces", "oc2" + property "forge.enabledGameTestNamespaces", "oc2r" } server { workingDirectory project.file("run") - property "forge.enabledGameTestNamespaces", "oc2" + property "forge.enabledGameTestNamespaces", "oc2r" arg "--nogui" } gameTestServer { workingDirectory project.file('run') - property "forge.enabledGameTestNamespaces", "oc2" + property "forge.enabledGameTestNamespaces", "oc2r" } data { workingDirectory project.file("run") - args "--mod", "oc2", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources") + args "--mod", "oc2r", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources") } } } mixin { add sourceSets.main, "mixins.oc2.refmap.json" - config "mixins.oc2.json" + config "mixins.oc2r.json" // quiet } @@ -212,14 +212,14 @@ jar { manifest { attributes([ "FMLAT" : "accesstransformer.cfg", - "Specification-Title" : "oc2", + "Specification-Title" : "oc2r", "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.oc2.json", + "MixinConfigs" : "mixins.oc2r.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/oc2/api/**" + include "li/cil/oc2r/api/**" } artifacts { diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java deleted file mode 100644 index b67780c0..00000000 --- a/src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device.vm.context; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java deleted file mode 100644 index 08173178..00000000 --- a/src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.api.bus.device.vm.event; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/terminal/package-info.java b/src/main/java/li/cil/oc2/client/gui/terminal/package-info.java deleted file mode 100644 index 6dc108fe..00000000 --- a/src/main/java/li/cil/oc2/client/gui/terminal/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.gui.terminal; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/util/package-info.java b/src/main/java/li/cil/oc2/client/gui/util/package-info.java deleted file mode 100644 index 811d7482..00000000 --- a/src/main/java/li/cil/oc2/client/gui/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.gui.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/gui/widget/package-info.java b/src/main/java/li/cil/oc2/client/gui/widget/package-info.java deleted file mode 100644 index 6f146b0c..00000000 --- a/src/main/java/li/cil/oc2/client/gui/widget/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.gui.widget; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/item/package-info.java b/src/main/java/li/cil/oc2/client/item/package-info.java deleted file mode 100644 index 248854e6..00000000 --- a/src/main/java/li/cil/oc2/client/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/manual/package-info.java b/src/main/java/li/cil/oc2/client/manual/package-info.java deleted file mode 100644 index bd104786..00000000 --- a/src/main/java/li/cil/oc2/client/manual/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.manual; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/model/package-info.java b/src/main/java/li/cil/oc2/client/model/package-info.java deleted file mode 100644 index 4ab66041..00000000 --- a/src/main/java/li/cil/oc2/client/model/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.model; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java deleted file mode 100644 index f6447fba..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.blockentity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/color/package-info.java b/src/main/java/li/cil/oc2/client/renderer/color/package-info.java deleted file mode 100644 index b08b3562..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/color/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.color; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java b/src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java deleted file mode 100644 index a5c06b5e..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.entity.model; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/entity/package-info.java b/src/main/java/li/cil/oc2/client/renderer/entity/package-info.java deleted file mode 100644 index b313dc7f..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/entity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.entity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/font/package-info.java b/src/main/java/li/cil/oc2/client/renderer/font/package-info.java deleted file mode 100644 index dd9ccdf3..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/font/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer.font; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/client/renderer/package-info.java b/src/main/java/li/cil/oc2/client/renderer/package-info.java deleted file mode 100644 index b523eaeb..00000000 --- a/src/main/java/li/cil/oc2/client/renderer/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.client.renderer; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/block/package-info.java b/src/main/java/li/cil/oc2/common/block/package-info.java deleted file mode 100644 index b2e6d494..00000000 --- a/src/main/java/li/cil/oc2/common/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/blockentity/package-info.java b/src/main/java/li/cil/oc2/common/blockentity/package-info.java deleted file mode 100644 index b2284550..00000000 --- a/src/main/java/li/cil/oc2/common/blockentity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.blockentity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java deleted file mode 100644 index 9d18d60e..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java +++ /dev/null @@ -1,8 +0,0 @@ -package li.cil.oc2.common.bus.device; - -import li.cil.oc2.common.bus.AbstractDeviceBusElement; - - -public class BlockDeviceBusElement extends AbstractDeviceBusElement { - -} diff --git a/src/main/java/li/cil/oc2/common/bus/device/data/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/data/package-info.java deleted file mode 100644 index 14b9d74a..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/data/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.data; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/package-info.java deleted file mode 100644 index c6a315b1..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java deleted file mode 100644 index 8a13946f..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java deleted file mode 100644 index 093cd2f9..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java deleted file mode 100644 index c16cf596..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java deleted file mode 100644 index 7bea9b40..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.provider.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java deleted file mode 100644 index ab99897f..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.rpc.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java deleted file mode 100644 index 48db9acd..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.rpc.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java deleted file mode 100644 index 799d6786..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.rpc; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/util/package-info.java deleted file mode 100644 index 1d3a4176..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java deleted file mode 100644 index 299a373f..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.vm.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java deleted file mode 100644 index 802bfe1e..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.vm.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java deleted file mode 100644 index d78998d9..00000000 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus.device.vm; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/bus/package-info.java b/src/main/java/li/cil/oc2/common/bus/package-info.java deleted file mode 100644 index 5c01aa7e..00000000 --- a/src/main/java/li/cil/oc2/common/bus/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.bus; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/capabilities/package-info.java b/src/main/java/li/cil/oc2/common/capabilities/package-info.java deleted file mode 100644 index 1083fb2c..00000000 --- a/src/main/java/li/cil/oc2/common/capabilities/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.capabilities; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/container/package-info.java b/src/main/java/li/cil/oc2/common/container/package-info.java deleted file mode 100644 index 9a3c9402..00000000 --- a/src/main/java/li/cil/oc2/common/container/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.container; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/energy/package-info.java b/src/main/java/li/cil/oc2/common/energy/package-info.java deleted file mode 100644 index d26d50ce..00000000 --- a/src/main/java/li/cil/oc2/common/energy/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.energy; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/entity/package-info.java b/src/main/java/li/cil/oc2/common/entity/package-info.java deleted file mode 100644 index 92a5fd21..00000000 --- a/src/main/java/li/cil/oc2/common/entity/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.entity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/entity/robot/package-info.java b/src/main/java/li/cil/oc2/common/entity/robot/package-info.java deleted file mode 100644 index 4c4d8f26..00000000 --- a/src/main/java/li/cil/oc2/common/entity/robot/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.entity.robot; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/ext/package-info.java b/src/main/java/li/cil/oc2/common/ext/package-info.java deleted file mode 100644 index e7fc99ec..00000000 --- a/src/main/java/li/cil/oc2/common/ext/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.ext; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/inet/NullLayer.java b/src/main/java/li/cil/oc2/common/inet/NullLayer.java deleted file mode 100644 index d1862d8d..00000000 --- a/src/main/java/li/cil/oc2/common/inet/NullLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package li.cil.oc2.common.inet; - -import li.cil.oc2.api.inet.layer.LinkLocalLayer; -import li.cil.oc2.api.inet.layer.NetworkLayer; -import li.cil.oc2.api.inet.layer.SessionLayer; -import li.cil.oc2.api.inet.layer.TransportLayer; - -public final class NullLayer implements LinkLocalLayer, NetworkLayer, TransportLayer, SessionLayer { - public static final NullLayer INSTANCE = new NullLayer(); - - private NullLayer() { - } -} diff --git a/src/main/java/li/cil/oc2/common/integration/jei/package-info.java b/src/main/java/li/cil/oc2/common/integration/jei/package-info.java deleted file mode 100644 index fdd08fd5..00000000 --- a/src/main/java/li/cil/oc2/common/integration/jei/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.integration.jei; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/integration/package-info.java b/src/main/java/li/cil/oc2/common/integration/package-info.java deleted file mode 100644 index a9b0fdf9..00000000 --- a/src/main/java/li/cil/oc2/common/integration/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.integration; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/item/crafting/package-info.java b/src/main/java/li/cil/oc2/common/item/crafting/package-info.java deleted file mode 100644 index b5f62d13..00000000 --- a/src/main/java/li/cil/oc2/common/item/crafting/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.item.crafting; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/item/package-info.java b/src/main/java/li/cil/oc2/common/item/package-info.java deleted file mode 100644 index 63a35021..00000000 --- a/src/main/java/li/cil/oc2/common/item/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/mixin/package-info.java b/src/main/java/li/cil/oc2/common/mixin/package-info.java deleted file mode 100644 index 1811d92a..00000000 --- a/src/main/java/li/cil/oc2/common/mixin/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.mixin; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/network/message/package-info.java b/src/main/java/li/cil/oc2/common/network/message/package-info.java deleted file mode 100644 index 2958dc13..00000000 --- a/src/main/java/li/cil/oc2/common/network/message/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.network.message; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/network/package-info.java b/src/main/java/li/cil/oc2/common/network/package-info.java deleted file mode 100644 index 452145b8..00000000 --- a/src/main/java/li/cil/oc2/common/network/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.network; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/package-info.java b/src/main/java/li/cil/oc2/common/package-info.java deleted file mode 100644 index 0670c71c..00000000 --- a/src/main/java/li/cil/oc2/common/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java b/src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java deleted file mode 100644 index 4ecb1685..00000000 --- a/src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.serialization.ceres; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/gson/package-info.java b/src/main/java/li/cil/oc2/common/serialization/gson/package-info.java deleted file mode 100644 index 1071e17e..00000000 --- a/src/main/java/li/cil/oc2/common/serialization/gson/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.serialization.gson; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/serialization/package-info.java b/src/main/java/li/cil/oc2/common/serialization/package-info.java deleted file mode 100644 index 50764906..00000000 --- a/src/main/java/li/cil/oc2/common/serialization/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.serialization; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/tags/package-info.java b/src/main/java/li/cil/oc2/common/tags/package-info.java deleted file mode 100644 index 8c8a0e5f..00000000 --- a/src/main/java/li/cil/oc2/common/tags/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.tags; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/util/package-info.java b/src/main/java/li/cil/oc2/common/util/package-info.java deleted file mode 100644 index 500f2929..00000000 --- a/src/main/java/li/cil/oc2/common/util/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.util; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/context/global/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/global/package-info.java deleted file mode 100644 index 55d4086b..00000000 --- a/src/main/java/li/cil/oc2/common/vm/context/global/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.context.global; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java deleted file mode 100644 index 1e0a9e06..00000000 --- a/src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.context.managed; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/context/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/package-info.java deleted file mode 100644 index f3b27499..00000000 --- a/src/main/java/li/cil/oc2/common/vm/context/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.context; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/fs/package-info.java b/src/main/java/li/cil/oc2/common/vm/fs/package-info.java deleted file mode 100644 index a94c4a31..00000000 --- a/src/main/java/li/cil/oc2/common/vm/fs/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm.fs; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/vm/package-info.java b/src/main/java/li/cil/oc2/common/vm/package-info.java deleted file mode 100644 index 780a7292..00000000 --- a/src/main/java/li/cil/oc2/common/vm/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package li.cil.oc2.common.vm; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/API.java b/src/main/java/li/cil/oc2r/api/API.java similarity index 78% rename from src/main/java/li/cil/oc2/api/API.java rename to src/main/java/li/cil/oc2r/api/API.java index cff37dfc..d2824560 100644 --- a/src/main/java/li/cil/oc2/api/API.java +++ b/src/main/java/li/cil/oc2r/api/API.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api; +package li.cil.oc2r.api; import com.google.gson.GsonBuilder; -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.rpc.RPCMethod; -import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.rpc.RPCMethod; +import li.cil.oc2r.api.imc.RPCMethodParameterTypeAdapter; import java.lang.reflect.Type; public final class API { - public static final String MOD_ID = "oc2"; + public static final String MOD_ID = "oc2r"; /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/api/README.md b/src/main/java/li/cil/oc2r/api/README.md similarity index 94% rename from src/main/java/li/cil/oc2/api/README.md rename to src/main/java/li/cil/oc2r/api/README.md index 3f47be16..14598a2e 100644 --- a/src/main/java/li/cil/oc2/api/README.md +++ b/src/main/java/li/cil/oc2r/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.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fml.ModList; -import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2r.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.oc2.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.Callback; import net.minecraft.world.level.block.entity.BlockEntity; class ModBlockEntity extends BlockEntity { @@ -235,8 +235,8 @@ soft dependency. Using `ObjectDevice`: ```java -import li.cil.oc2.api.bus.device.object.Callback; -import li.cil.oc2.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; import net.minecraft.world.level.block.entity.BlockEntity; class MyCalculatorDevice { @@ -264,14 +264,14 @@ class ModDeviceProvider extends ForgeRegistryEntry implemen Using the `RPCDevice` and `RPCMethods` interfaces directly: ```java -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; -import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; -import li.cil.oc2.api.bus.device.rpc.RPCMethod; -import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup; -import li.cil.oc2.api.bus.device.rpc.RPCParameter; -import li.cil.oc2.api.util.Invalidatable; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.rpc.RPCMethod; +import li.cil.oc2r.api.bus.device.rpc.RPCMethodGroup; +import li.cil.oc2r.api.bus.device.rpc.RPCParameter; +import li.cil.oc2r.api.util.Invalidatable; import net.minecraft.world.level.block.entity.FurnaceBlockEntity; import java.util.Collections; @@ -333,7 +333,7 @@ class ModDeviceProvider extends ForgeRegistryEntry implemen Shared device provider registration: ```java -import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/li/cil/oc2/api/bus/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java similarity index 96% rename from src/main/java/li/cil/oc2/api/bus/BlockDeviceBusElement.java rename to src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java index 29129e3f..b4c62709 100644 --- a/src/main/java/li/cil/oc2/api/bus/BlockDeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus; +package li.cil.oc2r.api.bus; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2/api/bus/DeviceBus.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/DeviceBus.java rename to src/main/java/li/cil/oc2r/api/bus/DeviceBus.java index cbbc90b6..075ccfd9 100644 --- a/src/main/java/li/cil/oc2/api/bus/DeviceBus.java +++ b/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus; +package li.cil.oc2r.api.bus; -import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.Device; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2/api/bus/DeviceBusController.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/DeviceBusController.java rename to src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java index 4c37b137..1f00442c 100644 --- a/src/main/java/li/cil/oc2/api/bus/DeviceBusController.java +++ b/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus; +package li.cil.oc2r.api.bus; -import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.Device; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2/api/bus/DeviceBusElement.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/DeviceBusElement.java rename to src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java index 53d11696..dfe7a813 100644 --- a/src/main/java/li/cil/oc2/api/bus/DeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus; +package li.cil.oc2r.api.bus; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; import net.minecraftforge.common.util.LazyOptional; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2/api/bus/device/Device.java b/src/main/java/li/cil/oc2r/api/bus/device/Device.java similarity index 92% rename from src/main/java/li/cil/oc2/api/bus/device/Device.java rename to src/main/java/li/cil/oc2r/api/bus/device/Device.java index 6a6b699b..b7a43d39 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/Device.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/Device.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.bus.DeviceBus; -import li.cil.oc2.api.bus.DeviceBusController; +import li.cil.oc2r.api.bus.DeviceBus; +import li.cil.oc2r.api.bus.DeviceBusController; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2/api/bus/device/DeviceType.java b/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/DeviceType.java rename to src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java index fbd949a0..e785a73b 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/DeviceType.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.core.Registry; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/li/cil/oc2/api/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java similarity index 96% rename from src/main/java/li/cil/oc2/api/bus/device/DeviceTypes.java rename to src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java index b21632b1..b4b9c4bc 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/DeviceTypes.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.API; +import li.cil.oc2r.api.API; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/li/cil/oc2/api/bus/device/ItemDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java similarity index 93% rename from src/main/java/li/cil/oc2/api/bus/device/ItemDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java index a9c2d999..a460d37a 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/ItemDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device; +package li.cil.oc2r.api.bus.device; -import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java b/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java rename to src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java index c796b4bd..3c6bae61 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.data; +package li.cil.oc2r.api.bus.device.data; import li.cil.sedna.api.device.BlockDevice; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java b/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java rename to src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java index ecfd0ab0..2aba37b8 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.data; +package li.cil.oc2r.api.bus.device.data; import li.cil.sedna.api.memory.MemoryMap; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java new file mode 100644 index 00000000..54007429 --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device.data; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/object/Callback.java b/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java similarity index 91% rename from src/main/java/li/cil/oc2/api/bus/device/object/Callback.java rename to src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java index ae350414..07986a82 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/object/Callback.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.object; +package li.cil.oc2r.api.bus.device.object; -import li.cil.oc2.api.bus.device.rpc.RPCMethod; +import li.cil.oc2r.api.bus.device.rpc.RPCMethod; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -17,7 +17,7 @@ import java.lang.annotation.Target; *

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

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

@@ -39,9 +39,9 @@ import net.minecraft.nbt.CompoundTag; * } * * - * @see li.cil.oc2.api.bus.device.rpc.RPCDevice - * @see li.cil.oc2.api.bus.device.object.ObjectDevice - * @see li.cil.oc2.api.bus.device.vm.VMDevice + * @see li.cil.oc2r.api.bus.device.rpc.RPCDevice + * @see li.cil.oc2r.api.bus.device.object.ObjectDevice + * @see li.cil.oc2r.api.bus.device.vm.VMDevice * @see BlockDeviceQuery */ public interface BlockDeviceProvider { diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java rename to src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java index 5781523a..ff014567 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.provider; +package li.cil.oc2r.api.bus.device.provider; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java similarity index 89% rename from src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java rename to src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java index b860fd6e..a53a92ed 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.provider; +package li.cil.oc2r.api.bus.device.provider; -import li.cil.oc2.api.bus.device.ItemDevice; -import li.cil.oc2.api.bus.device.rpc.RPCDevice; -import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2r.api.bus.device.ItemDevice; +import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2r.api.bus.device.vm.VMDevice; import net.minecraft.nbt.CompoundTag; import javax.annotation.Nullable; @@ -36,9 +36,9 @@ import java.util.Optional; * } * * - * @see li.cil.oc2.api.bus.device.rpc.RPCDevice - * @see li.cil.oc2.api.bus.device.object.ObjectDevice - * @see li.cil.oc2.api.bus.device.vm.VMDevice + * @see li.cil.oc2r.api.bus.device.rpc.RPCDevice + * @see li.cil.oc2r.api.bus.device.object.ObjectDevice + * @see li.cil.oc2r.api.bus.device.vm.VMDevice * @see ItemDeviceQuery */ public interface ItemDeviceProvider { diff --git a/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java similarity index 95% rename from src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java rename to src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java index 9bed31a5..4d29d709 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.provider; +package li.cil.oc2r.api.bus.device.provider; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java new file mode 100644 index 00000000..cb72d743 --- /dev/null +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: MIT */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2r.api.bus.device.provider; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/AbstractRPCMethod.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java similarity index 98% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/AbstractRPCMethod.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java index c6397ad8..b78ffebb 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/AbstractRPCMethod.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/IEventSink.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/IEventSink.java similarity index 85% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/IEventSink.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/IEventSink.java index 0dca1776..b33fbb36 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/IEventSink.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/IEventSink.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; import com.google.gson.JsonElement; import java.util.UUID; /** * This interface handles events coming from RPCEventSources. - * RPCDeviceBusAdapter implements this to relay events via the built in serial + * RPCDeviceBusAdapter implements this to relay events via the built in serial */ public interface IEventSink { diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java similarity index 92% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java index 68942d14..bbea5262 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; -import li.cil.oc2.api.bus.DeviceBus; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.DeviceBus; +import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; import java.util.List; @@ -47,8 +47,8 @@ import java.util.List; * * * @see ObjectDevice - * @see li.cil.oc2.api.bus.device.provider.BlockDeviceProvider - * @see li.cil.oc2.api.bus.device.provider.ItemDeviceProvider + * @see li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider + * @see li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider */ public interface RPCDevice extends Device { /** diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCEventSource.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCEventSource.java similarity index 80% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCEventSource.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCEventSource.java index fddb6b75..eac22b53 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCEventSource.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCEventSource.java @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; -import li.cil.oc2.api.bus.DeviceBus; -import li.cil.oc2.api.bus.device.Device; -import li.cil.oc2.api.bus.device.object.ObjectDevice; import java.util.*; /** diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCInvocation.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java similarity index 97% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCInvocation.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java index e4c0c6f9..4db63dc4 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCInvocation.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethod.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java similarity index 94% rename from src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethod.java rename to src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java index ac9b7a05..3adfd861 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethod.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2.api.bus.device.rpc; +package li.cil.oc2r.api.bus.device.rpc; -import li.cil.oc2.api.bus.device.object.ObjectDevice; +import li.cil.oc2r.api.bus.device.object.ObjectDevice; import javax.annotation.Nullable; import java.util.Collections; @@ -17,7 +17,7 @@ import java.util.Set; *

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

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

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

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

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

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