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

Moved remaining top level stuff to common package.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-01 15:37:30 +01:00
parent 755cfc8f4f
commit aa9b96e341
23 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
View File

@@ -2,11 +2,11 @@ package li.cil.oc2.client.gui;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.systems.RenderSystem;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.client.gui.terminal.TerminalInput;
import li.cil.oc2.client.gui.widget.Sprite;
import li.cil.oc2.client.gui.widget.ToggleImageButton;
import li.cil.oc2.common.Constants;
import li.cil.oc2.common.network.Network;
import li.cil.oc2.common.network.message.ComputerPowerMessage;
import li.cil.oc2.common.network.message.TerminalBlockInputMessage;

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

@@ -1,4 +1,4 @@
package li.cil.oc2;
package li.cil.oc2.common;
public final class Config {
public static long maxAllocatedData = 512 * Constants.MEGABYTE;

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

@@ -1,4 +1,4 @@
package li.cil.oc2;
package li.cil.oc2.common;
public final class Constants {
public static final int KILOBYTE = 1024;

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

@@ -1,4 +1,4 @@
package li.cil.oc2;
package li.cil.oc2.common;
import li.cil.ceres.Ceres;
import li.cil.oc2.api.API;

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

@@ -1,7 +1,7 @@
package li.cil.oc2.common.block;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.Constants;
import net.minecraft.block.Block;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

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

@@ -3,12 +3,12 @@ package li.cil.oc2.common.bus;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import li.cil.ceres.api.Serialized;
import li.cil.oc2.Constants;
import li.cil.oc2.api.bus.DeviceBusController;
import li.cil.oc2.api.bus.device.Device;
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.RPCParameter;
import li.cil.oc2.common.Constants;
import li.cil.oc2.common.bus.device.rpc.RPCDeviceList;
import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters;
import li.cil.oc2.common.serialization.serializers.MessageJsonDeserializer;

2
src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java
View File

@@ -1,8 +1,8 @@
package li.cil.oc2.common.bus.device.item;
import li.cil.oc2.Config;
import li.cil.oc2.api.bus.device.ItemDevice;
import li.cil.oc2.api.bus.device.vm.*;
import li.cil.oc2.common.Config;
import li.cil.oc2.common.bus.device.util.IdentityProxy;
import li.cil.oc2.common.item.MemoryItem;
import li.cil.oc2.common.serialization.BlobStorage;

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java
View File

@@ -1,11 +1,11 @@
package li.cil.oc2.common.bus.device.provider.item;
import li.cil.oc2.Config;
import li.cil.oc2.api.bus.device.DeviceType;
import li.cil.oc2.api.bus.device.DeviceTypes;
import li.cil.oc2.api.bus.device.ItemDevice;
import li.cil.oc2.api.bus.device.data.Firmware;
import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
import li.cil.oc2.common.Config;
import li.cil.oc2.common.bus.device.item.ByteBufferFlashMemoryVMDevice;
import li.cil.oc2.common.bus.device.item.FirmwareFlashMemoryVMDevice;
import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider;

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java
View File

@@ -1,11 +1,11 @@
package li.cil.oc2.common.bus.device.provider.item;
import li.cil.oc2.Config;
import li.cil.oc2.api.bus.device.DeviceType;
import li.cil.oc2.api.bus.device.DeviceTypes;
import li.cil.oc2.api.bus.device.ItemDevice;
import li.cil.oc2.api.bus.device.data.BaseBlockDevice;
import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
import li.cil.oc2.common.Config;
import li.cil.oc2.common.bus.device.item.HardDriveVMDevice;
import li.cil.oc2.common.bus.device.item.SparseHardDriveVMDevice;
import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider;

2
src/main/java/li/cil/oc2/common/container/Containers.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.container;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.Constants;
import net.minecraft.inventory.container.ContainerType;
import net.minecraftforge.common.extensions.IForgeContainerType;
import net.minecraftforge.fml.RegistryObject;

2
src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java
View File

@@ -1,8 +1,8 @@
package li.cil.oc2.common.item;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.data.Firmware;
import li.cil.oc2.common.Constants;
import li.cil.oc2.common.bus.device.data.Firmwares;
import li.cil.oc2.common.bus.device.item.ByteBufferFlashMemoryVMDevice;
import li.cil.oc2.common.util.ItemStackUtils;

2
src/main/java/li/cil/oc2/common/item/HardDriveItem.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.item;
import li.cil.oc2.Constants;
import li.cil.oc2.api.bus.device.data.BaseBlockDevice;
import li.cil.oc2.common.Constants;
import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
import li.cil.oc2.common.util.ItemStackUtils;
import li.cil.oc2.common.util.NBTTagIds;

2
src/main/java/li/cil/oc2/common/item/ItemGroup.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.item;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.Constants;
import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
import li.cil.oc2.common.bus.device.data.Firmwares;
import net.minecraft.item.ItemStack;

2
src/main/java/li/cil/oc2/common/item/Items.java
View File

@@ -1,7 +1,7 @@
package li.cil.oc2.common.item;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.Constants;
import li.cil.oc2.common.block.Blocks;
import net.minecraft.block.Block;
import net.minecraft.item.BlockItem;

2
src/main/java/li/cil/oc2/common/item/MemoryItem.java
View File

@@ -1,6 +1,6 @@
package li.cil.oc2.common.item;
import li.cil.oc2.Constants;
import li.cil.oc2.common.Constants;
public final class MemoryItem extends AbstractStorageItem {
private static final int DEFAULT_CAPACITY = 2 * Constants.MEGABYTE;

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

@@ -1,7 +1,7 @@
package li.cil.oc2.common.serialization;
import com.google.common.collect.HashMultimap;
import li.cil.oc2.Constants;
import li.cil.oc2.common.Constants;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.storage.FolderName;
import org.apache.logging.log4j.LogManager;

2
src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
View File

@@ -2,7 +2,7 @@ package li.cil.oc2.common.tileentity;
import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
import li.cil.ceres.api.Serialized;
import li.cil.oc2.Constants;
import li.cil.oc2.common.Constants;
import li.cil.oc2.api.bus.DeviceBusController;
import li.cil.oc2.api.bus.DeviceBusElement;
import li.cil.oc2.api.bus.device.Device;

2
src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
View File

@@ -1,6 +1,6 @@
package li.cil.oc2.common.tileentity;
import li.cil.oc2.Constants;
import li.cil.oc2.common.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.block.Blocks;
import net.minecraft.block.Block;

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

@@ -13,8 +13,8 @@ import net.minecraft.util.text.TextFormatting;
import java.util.ArrayList;
import java.util.List;
import static li.cil.oc2.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
import static li.cil.oc2.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
import static li.cil.oc2.common.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
public final class TooltipUtils {
private static final ThreadLocal<List<ItemStack>> ITEM_STACKS = ThreadLocal.withInitial(ArrayList::new);

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

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

2
src/main/java/li/cil/oc2/data/ItemModels.java
View File

@@ -1,6 +1,6 @@
package li.cil.oc2.data;
import li.cil.oc2.Constants;
import li.cil.oc2.common.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.item.HardDriveItem;
import li.cil.oc2.common.item.Items;

4
src/main/java/li/cil/oc2/data/LootTables.java
View File

@@ -21,8 +21,8 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import static java.util.Objects.requireNonNull;
import static li.cil.oc2.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
import static li.cil.oc2.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
import static li.cil.oc2.common.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
public final class LootTables extends LootTableProvider {
public LootTables(final DataGenerator generator) {

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

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