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

Reduce number of packages a bit.

Browse Source
This commit is contained in:
Florian Nücke
2020-10-05 12:53:49 +02:00
parent 063b625c6c
commit c130828008
6 changed files with 6 additions and 20 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

@@ -1,8 +1,8 @@
package li.cil.oc2.common;
import li.cil.oc2.common.blobs.BlobStorage;
import li.cil.oc2.common.network.Network;
import li.cil.oc2.common.sandbox.Allocator;
import li.cil.oc2.common.vm.Allocator;
import li.cil.oc2.serialization.BlobStorage;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;

7
src/main/java/li/cil/oc2/common/blobs/package-info.java
View File

@@ -1,7 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package li.cil.oc2.common.blobs;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;

7
src/main/java/li/cil/oc2/common/sandbox/package-info.java
View File

@@ -1,7 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package li.cil.oc2.common.sandbox;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;

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

@@ -4,11 +4,11 @@ import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
import li.cil.ceres.api.Serialized;
import li.cil.oc2.OpenComputers;
import li.cil.oc2.client.gui.terminal.Terminal;
import li.cil.oc2.common.blobs.BlobStorage;
import li.cil.oc2.common.network.Network;
import li.cil.oc2.common.network.TerminalBlockOutputMessage;
import li.cil.oc2.common.sandbox.Allocator;
import li.cil.oc2.common.vm.Allocator;
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.BlockDevice;

2
src/main/java/li/cil/oc2/common/sandbox/Allocator.java → src/main/java/li/cil/oc2/common/vm/Allocator.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.sandbox;
package li.cil.oc2.common.vm;
import li.cil.oc2.Config;
import org.apache.logging.log4j.LogManager;

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

@@ -1,4 +1,4 @@
package li.cil.oc2.common.blobs;
package li.cil.oc2.serialization;
import com.google.common.collect.HashMultimap;
import net.minecraft.server.MinecraftServer;