Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One more device shuffle.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-11 18:23:17 +01:00
parent c6980fba77
commit 62965b9356
20 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/li/cil/oc2/common/CommonSetup.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java
View File

@@ -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;

4
src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
View File

@@ -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;

8
src/main/java/li/cil/oc2/common/bus/RPCAdapter.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/BlobStorage.java → src/main/java/li/cil/oc2/common/serialization/BlobStorage.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/NBTSerialization.java → src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/NBTToJsonConverter.java → src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/package-info.java → src/main/java/li/cil/oc2/common/serialization/package-info.java
View File

@@ -1,6 +1,6 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package li.cil.oc2.serialization;
package li.cil.oc2.common.serialization;
import mcp.MethodsReturnNonnullByDefault;

2
src/main/java/li/cil/oc2/serialization/serializers/BitSetSerializer.java → src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.serialization.serializers;
package li.cil.oc2.common.serialization.serializers;
import li.cil.ceres.api.*;

4
src/main/java/li/cil/oc2/serialization/serializers/ItemStackJsonSerializer.java → src/main/java/li/cil/oc2/common/serialization/serializers/ItemStackJsonSerializer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/serializers/JsonArraySerializer.java → src/main/java/li/cil/oc2/common/serialization/serializers/JsonArraySerializer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/serializers/MessageJsonDeserializer.java → src/main/java/li/cil/oc2/common/serialization/serializers/MessageJsonDeserializer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/serializers/MethodInvocationJsonDeserializer.java → src/main/java/li/cil/oc2/common/serialization/serializers/MethodInvocationJsonDeserializer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java → src/main/java/li/cil/oc2/common/serialization/serializers/RPCDeviceWithIdentifierJsonSerializer.java
View File

@@ -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;

2
src/main/java/li/cil/oc2/serialization/serializers/RPCMethodJsonSerializer.java → src/main/java/li/cil/oc2/common/serialization/serializers/RPCMethodJsonSerializer.java
View File

@@ -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;

3
src/test/java/li/cil/oc2/bus/DeviceBusTests.java → src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java
View File

@@ -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;

2
src/test/java/li/cil/oc2/serialization/SerializationTests.java → src/test/java/li/cil/oc2/common/serialization/SerializationTests.java
View File

@@ -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;

2
src/test/java/li/cil/oc2/vm/AbstractTestMethod.java → src/test/java/li/cil/oc2/common/vm/AbstractTestMethod.java
View File

@@ -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;

2
src/test/java/li/cil/oc2/vm/RPCAdapterTests.java → src/test/java/li/cil/oc2/common/vm/RPCAdapterTests.java
View File

@@ -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;

2
src/test/java/li/cil/oc2/vm/package-info.java → src/test/java/li/cil/oc2/common/vm/package-info.java
View File

@@ -1,6 +1,6 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package li.cil.oc2.vm;
package li.cil.oc2.common.vm;
import mcp.MethodsReturnNonnullByDefault;