From 62965b935699cf4f3e541ff46bb1c9f1feb5f621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 11 Dec 2020 18:23:17 +0100 Subject: [PATCH] One more device shuffle. --- src/main/java/li/cil/oc2/common/CommonSetup.java | 4 ++-- .../cil/oc2/common/block/entity/BusCableTileEntity.java | 2 +- .../cil/oc2/common/block/entity/ComputerTileEntity.java | 4 ++-- src/main/java/li/cil/oc2/common/bus/RPCAdapter.java | 8 ++++---- .../cil/oc2/{ => common}/serialization/BlobStorage.java | 2 +- .../oc2/{ => common}/serialization/NBTSerialization.java | 2 +- .../{ => common}/serialization/NBTToJsonConverter.java | 2 +- .../cil/oc2/{ => common}/serialization/package-info.java | 2 +- .../serialization/serializers/BitSetSerializer.java | 2 +- .../serializers/ItemStackJsonSerializer.java | 4 ++-- .../serialization/serializers/JsonArraySerializer.java | 2 +- .../serializers/MessageJsonDeserializer.java | 2 +- .../serializers/MethodInvocationJsonDeserializer.java | 2 +- .../RPCDeviceWithIdentifierJsonSerializer.java | 2 +- .../serializers/RPCMethodJsonSerializer.java | 2 +- .../java/li/cil/oc2/{ => common}/bus/DeviceBusTests.java | 3 +-- .../{ => common}/serialization/SerializationTests.java | 2 +- .../li/cil/oc2/{ => common}/vm/AbstractTestMethod.java | 2 +- .../java/li/cil/oc2/{ => common}/vm/RPCAdapterTests.java | 2 +- .../java/li/cil/oc2/{ => common}/vm/package-info.java | 2 +- 20 files changed, 26 insertions(+), 27 deletions(-) rename src/main/java/li/cil/oc2/{ => common}/serialization/BlobStorage.java (99%) rename src/main/java/li/cil/oc2/{ => common}/serialization/NBTSerialization.java (99%) rename src/main/java/li/cil/oc2/{ => common}/serialization/NBTToJsonConverter.java (98%) rename src/main/java/li/cil/oc2/{ => common}/serialization/package-info.java (79%) rename src/main/java/li/cil/oc2/{ => common}/serialization/serializers/BitSetSerializer.java (95%) rename src/main/java/li/cil/oc2/{ => common}/serialization/serializers/ItemStackJsonSerializer.java (86%) rename src/main/java/li/cil/oc2/{ => common}/serialization/serializers/JsonArraySerializer.java (95%) rename src/main/java/li/cil/oc2/{ => common}/serialization/serializers/MessageJsonDeserializer.java (95%) rename src/main/java/li/cil/oc2/{ => common}/serialization/serializers/MethodInvocationJsonDeserializer.java (94%) rename src/main/java/li/cil/oc2/{ => common}/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java (94%) rename src/main/java/li/cil/oc2/{ => common}/serialization/serializers/RPCMethodJsonSerializer.java (96%) rename src/test/java/li/cil/oc2/{ => common}/bus/DeviceBusTests.java (98%) rename src/test/java/li/cil/oc2/{ => common}/serialization/SerializationTests.java (99%) rename src/test/java/li/cil/oc2/{ => common}/vm/AbstractTestMethod.java (98%) rename src/test/java/li/cil/oc2/{ => common}/vm/RPCAdapterTests.java (99%) rename src/test/java/li/cil/oc2/{ => common}/vm/package-info.java (84%) diff --git a/src/main/java/li/cil/oc2/common/CommonSetup.java b/src/main/java/li/cil/oc2/common/CommonSetup.java index f17b46b2..29675159 100644 --- a/src/main/java/li/cil/oc2/common/CommonSetup.java +++ b/src/main/java/li/cil/oc2/common/CommonSetup.java @@ -4,9 +4,9 @@ import li.cil.oc2.common.bus.device.provider.Providers; import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; import li.cil.oc2.common.capabilities.Capabilities; import li.cil.oc2.common.network.Network; +import li.cil.oc2.common.serialization.BlobStorage; +import li.cil.oc2.common.serialization.serializers.ItemStackJsonSerializer; import li.cil.oc2.common.vm.Allocator; -import li.cil.oc2.serialization.BlobStorage; -import li.cil.oc2.serialization.serializers.ItemStackJsonSerializer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; diff --git a/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java b/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java index ef3be482..81cdad19 100644 --- a/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java +++ b/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java @@ -4,7 +4,7 @@ import li.cil.oc2.OpenComputers; import li.cil.oc2.common.block.BusCableBlock; import li.cil.oc2.common.bus.TileEntityDeviceBusElement; import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.serialization.NBTSerialization; +import li.cil.oc2.common.serialization.NBTSerialization; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.EnumProperty; diff --git a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java index 6fb08e4d..f6f173f2 100644 --- a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java +++ b/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java @@ -13,12 +13,12 @@ import li.cil.oc2.common.network.Network; import li.cil.oc2.common.network.message.ComputerBusStateMessage; import li.cil.oc2.common.network.message.ComputerRunStateMessage; import li.cil.oc2.common.network.message.TerminalBlockOutputMessage; +import li.cil.oc2.common.serialization.BlobStorage; +import li.cil.oc2.common.serialization.NBTSerialization; import li.cil.oc2.common.util.NBTTagIds; import li.cil.oc2.common.util.NBTUtils; import li.cil.oc2.common.vm.VirtualMachine; import li.cil.oc2.common.vm.VirtualMachineRunner; -import li.cil.oc2.serialization.BlobStorage; -import li.cil.oc2.serialization.NBTSerialization; import li.cil.sedna.api.Sizes; import li.cil.sedna.api.device.PhysicalMemory; import li.cil.sedna.buildroot.Buildroot; diff --git a/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java b/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java index 70306b2a..5cfbb9c5 100644 --- a/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java +++ b/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java @@ -10,10 +10,10 @@ import li.cil.oc2.api.bus.device.rpc.RPCMethod; import li.cil.oc2.api.bus.device.rpc.RPCParameter; import li.cil.oc2.common.bus.device.rpc.RPCDeviceList; import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; -import li.cil.oc2.serialization.serializers.MessageJsonDeserializer; -import li.cil.oc2.serialization.serializers.MethodInvocationJsonDeserializer; -import li.cil.oc2.serialization.serializers.RPCDeviceWithIdentifierJsonSerializer; -import li.cil.oc2.serialization.serializers.RPCMethodJsonSerializer; +import li.cil.oc2.common.serialization.serializers.MessageJsonDeserializer; +import li.cil.oc2.common.serialization.serializers.MethodInvocationJsonDeserializer; +import li.cil.oc2.common.serialization.serializers.RPCDeviceWithIdentifierJsonSerializer; +import li.cil.oc2.common.serialization.serializers.RPCMethodJsonSerializer; import li.cil.sedna.api.device.Steppable; import li.cil.sedna.api.device.serial.SerialDevice; diff --git a/src/main/java/li/cil/oc2/serialization/BlobStorage.java b/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java similarity index 99% rename from src/main/java/li/cil/oc2/serialization/BlobStorage.java rename to src/main/java/li/cil/oc2/common/serialization/BlobStorage.java index 8cbab8e8..fc3a9c4e 100644 --- a/src/main/java/li/cil/oc2/serialization/BlobStorage.java +++ b/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization; +package li.cil.oc2.common.serialization; import com.google.common.collect.HashMultimap; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/li/cil/oc2/serialization/NBTSerialization.java b/src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java similarity index 99% rename from src/main/java/li/cil/oc2/serialization/NBTSerialization.java rename to src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java index 14ab1893..68b68fb2 100644 --- a/src/main/java/li/cil/oc2/serialization/NBTSerialization.java +++ b/src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization; +package li.cil.oc2.common.serialization; import li.cil.ceres.Ceres; import li.cil.ceres.api.DeserializationVisitor; diff --git a/src/main/java/li/cil/oc2/serialization/NBTToJsonConverter.java b/src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java similarity index 98% rename from src/main/java/li/cil/oc2/serialization/NBTToJsonConverter.java rename to src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java index 4b7d0d3f..512e1359 100644 --- a/src/main/java/li/cil/oc2/serialization/NBTToJsonConverter.java +++ b/src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization; +package li.cil.oc2.common.serialization; import com.google.gson.*; import li.cil.oc2.common.util.NBTTagIds; diff --git a/src/main/java/li/cil/oc2/serialization/package-info.java b/src/main/java/li/cil/oc2/common/serialization/package-info.java similarity index 79% rename from src/main/java/li/cil/oc2/serialization/package-info.java rename to src/main/java/li/cil/oc2/common/serialization/package-info.java index b3a20a96..352f110b 100644 --- a/src/main/java/li/cil/oc2/serialization/package-info.java +++ b/src/main/java/li/cil/oc2/common/serialization/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.serialization; +package li.cil.oc2.common.serialization; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/serialization/serializers/BitSetSerializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java similarity index 95% rename from src/main/java/li/cil/oc2/serialization/serializers/BitSetSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java index e51b9e1c..03b7e8d0 100644 --- a/src/main/java/li/cil/oc2/serialization/serializers/BitSetSerializer.java +++ b/src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization.serializers; +package li.cil.oc2.common.serialization.serializers; import li.cil.ceres.api.*; diff --git a/src/main/java/li/cil/oc2/serialization/serializers/ItemStackJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/ItemStackJsonSerializer.java similarity index 86% rename from src/main/java/li/cil/oc2/serialization/serializers/ItemStackJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/serializers/ItemStackJsonSerializer.java index 5acd2d14..fc37da27 100644 --- a/src/main/java/li/cil/oc2/serialization/serializers/ItemStackJsonSerializer.java +++ b/src/main/java/li/cil/oc2/common/serialization/serializers/ItemStackJsonSerializer.java @@ -1,10 +1,10 @@ -package li.cil.oc2.serialization.serializers; +package li.cil.oc2.common.serialization.serializers; import com.google.gson.JsonElement; import com.google.gson.JsonNull; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import li.cil.oc2.serialization.NBTToJsonConverter; +import li.cil.oc2.common.serialization.NBTToJsonConverter; import net.minecraft.item.ItemStack; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/serialization/serializers/JsonArraySerializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/JsonArraySerializer.java similarity index 95% rename from src/main/java/li/cil/oc2/serialization/serializers/JsonArraySerializer.java rename to src/main/java/li/cil/oc2/common/serialization/serializers/JsonArraySerializer.java index d6590e13..462745f1 100644 --- a/src/main/java/li/cil/oc2/serialization/serializers/JsonArraySerializer.java +++ b/src/main/java/li/cil/oc2/common/serialization/serializers/JsonArraySerializer.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization.serializers; +package li.cil.oc2.common.serialization.serializers; import com.google.gson.JsonArray; import com.google.gson.JsonParser; diff --git a/src/main/java/li/cil/oc2/serialization/serializers/MessageJsonDeserializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/MessageJsonDeserializer.java similarity index 95% rename from src/main/java/li/cil/oc2/serialization/serializers/MessageJsonDeserializer.java rename to src/main/java/li/cil/oc2/common/serialization/serializers/MessageJsonDeserializer.java index 98e4a440..2ba361a2 100644 --- a/src/main/java/li/cil/oc2/serialization/serializers/MessageJsonDeserializer.java +++ b/src/main/java/li/cil/oc2/common/serialization/serializers/MessageJsonDeserializer.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization.serializers; +package li.cil.oc2.common.serialization.serializers; import com.google.gson.*; import li.cil.oc2.common.bus.RPCAdapter; diff --git a/src/main/java/li/cil/oc2/serialization/serializers/MethodInvocationJsonDeserializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/MethodInvocationJsonDeserializer.java similarity index 94% rename from src/main/java/li/cil/oc2/serialization/serializers/MethodInvocationJsonDeserializer.java rename to src/main/java/li/cil/oc2/common/serialization/serializers/MethodInvocationJsonDeserializer.java index 4f3472a0..7e252239 100644 --- a/src/main/java/li/cil/oc2/serialization/serializers/MethodInvocationJsonDeserializer.java +++ b/src/main/java/li/cil/oc2/common/serialization/serializers/MethodInvocationJsonDeserializer.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization.serializers; +package li.cil.oc2.common.serialization.serializers; import com.google.gson.*; import li.cil.oc2.common.bus.RPCAdapter; diff --git a/src/main/java/li/cil/oc2/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java similarity index 94% rename from src/main/java/li/cil/oc2/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java index b5dbbfac..a427a38e 100644 --- a/src/main/java/li/cil/oc2/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java +++ b/src/main/java/li/cil/oc2/common/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization.serializers; +package li.cil.oc2.common.serialization.serializers; import com.google.gson.*; import li.cil.oc2.api.bus.device.rpc.RPCMethod; diff --git a/src/main/java/li/cil/oc2/serialization/serializers/RPCMethodJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/RPCMethodJsonSerializer.java similarity index 96% rename from src/main/java/li/cil/oc2/serialization/serializers/RPCMethodJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/serializers/RPCMethodJsonSerializer.java index 6ae8e921..c6d521f8 100644 --- a/src/main/java/li/cil/oc2/serialization/serializers/RPCMethodJsonSerializer.java +++ b/src/main/java/li/cil/oc2/common/serialization/serializers/RPCMethodJsonSerializer.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization.serializers; +package li.cil.oc2.common.serialization.serializers; import com.google.gson.*; import li.cil.oc2.api.bus.device.rpc.RPCMethod; diff --git a/src/test/java/li/cil/oc2/bus/DeviceBusTests.java b/src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java similarity index 98% rename from src/test/java/li/cil/oc2/bus/DeviceBusTests.java rename to src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java index 97bc87e7..3b28ddc8 100644 --- a/src/test/java/li/cil/oc2/bus/DeviceBusTests.java +++ b/src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java @@ -1,8 +1,7 @@ -package li.cil.oc2.bus; +package li.cil.oc2.common.bus; import li.cil.oc2.api.bus.DeviceBusElement; import li.cil.oc2.api.bus.device.rpc.RPCDevice; -import li.cil.oc2.common.bus.TileEntityDeviceBusController; import li.cil.oc2.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/test/java/li/cil/oc2/serialization/SerializationTests.java b/src/test/java/li/cil/oc2/common/serialization/SerializationTests.java similarity index 99% rename from src/test/java/li/cil/oc2/serialization/SerializationTests.java rename to src/test/java/li/cil/oc2/common/serialization/SerializationTests.java index b8e3c39a..0623169c 100644 --- a/src/test/java/li/cil/oc2/serialization/SerializationTests.java +++ b/src/test/java/li/cil/oc2/common/serialization/SerializationTests.java @@ -1,4 +1,4 @@ -package li.cil.oc2.serialization; +package li.cil.oc2.common.serialization; import li.cil.ceres.api.Serialized; import net.minecraft.nbt.CompoundNBT; diff --git a/src/test/java/li/cil/oc2/vm/AbstractTestMethod.java b/src/test/java/li/cil/oc2/common/vm/AbstractTestMethod.java similarity index 98% rename from src/test/java/li/cil/oc2/vm/AbstractTestMethod.java rename to src/test/java/li/cil/oc2/common/vm/AbstractTestMethod.java index 75e8fc06..d5426277 100644 --- a/src/test/java/li/cil/oc2/vm/AbstractTestMethod.java +++ b/src/test/java/li/cil/oc2/common/vm/AbstractTestMethod.java @@ -1,4 +1,4 @@ -package li.cil.oc2.vm; +package li.cil.oc2.common.vm; import li.cil.oc2.api.bus.device.rpc.RPCMethod; import li.cil.oc2.api.bus.device.rpc.RPCParameter; diff --git a/src/test/java/li/cil/oc2/vm/RPCAdapterTests.java b/src/test/java/li/cil/oc2/common/vm/RPCAdapterTests.java similarity index 99% rename from src/test/java/li/cil/oc2/vm/RPCAdapterTests.java rename to src/test/java/li/cil/oc2/common/vm/RPCAdapterTests.java index 92d9719a..0903e1e1 100644 --- a/src/test/java/li/cil/oc2/vm/RPCAdapterTests.java +++ b/src/test/java/li/cil/oc2/common/vm/RPCAdapterTests.java @@ -1,4 +1,4 @@ -package li.cil.oc2.vm; +package li.cil.oc2.common.vm; import com.google.gson.*; import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue; diff --git a/src/test/java/li/cil/oc2/vm/package-info.java b/src/test/java/li/cil/oc2/common/vm/package-info.java similarity index 84% rename from src/test/java/li/cil/oc2/vm/package-info.java rename to src/test/java/li/cil/oc2/common/vm/package-info.java index 2e7ece1f..0c92df0a 100644 --- a/src/test/java/li/cil/oc2/vm/package-info.java +++ b/src/test/java/li/cil/oc2/common/vm/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.vm; +package li.cil.oc2.common.vm; import mcp.MethodsReturnNonnullByDefault;