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

Moved stuff to packages more closely mirroring vanilla layout.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-29 18:49:59 +01:00
parent eefcaa5773
commit 55d198660f
31 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/li/cil/oc2/OpenComputers.java
View File

@@ -4,7 +4,14 @@ import li.cil.ceres.Ceres;
import li.cil.oc2.api.API;
import li.cil.oc2.client.ClientSetup;
import li.cil.oc2.common.CommonSetup;
import li.cil.oc2.common.init.*;
import li.cil.oc2.common.block.Blocks;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.bus.device.DeviceTypes;
import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
import li.cil.oc2.common.bus.device.data.Firmwares;
import li.cil.oc2.common.bus.device.provider.Providers;
import li.cil.oc2.common.container.Containers;
import li.cil.oc2.common.item.Items;
import li.cil.sedna.devicetree.DeviceTreeRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

4
src/main/java/li/cil/oc2/client/ClientSetup.java
View File

@@ -2,8 +2,8 @@ package li.cil.oc2.client;
import li.cil.oc2.client.gui.ComputerContainerScreen;
import li.cil.oc2.client.render.tile.ComputerTileEntityRenderer;
import li.cil.oc2.common.init.Containers;
import li.cil.oc2.common.init.TileEntities;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.container.Containers;
import net.minecraft.client.gui.ScreenManager;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;

6
src/main/java/li/cil/oc2/common/init/Blocks.java → src/main/java/li/cil/oc2/common/block/Blocks.java
View File

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

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

@@ -2,10 +2,10 @@ package li.cil.oc2.common.block;
import com.google.common.collect.Maps;
import li.cil.oc2.common.block.entity.BusCableTileEntity;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.capabilities.Capabilities;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.init.TileEntities;
import li.cil.oc2.common.integration.Wrenches;
import li.cil.oc2.common.item.Items;
import li.cil.oc2.common.util.ItemStackUtils;
import li.cil.oc2.common.util.WorldUtils;
import net.minecraft.block.Block;

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

@@ -3,9 +3,9 @@ package li.cil.oc2.common.block;
import li.cil.oc2.api.bus.device.capabilities.RedstoneEmitter;
import li.cil.oc2.client.gui.TerminalScreen;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.block.entity.TileEntities;
import li.cil.oc2.common.capabilities.Capabilities;
import li.cil.oc2.common.container.ComputerContainer;
import li.cil.oc2.common.init.TileEntities;
import li.cil.oc2.common.integration.Wrenches;
import li.cil.oc2.common.util.TooltipUtils;
import net.minecraft.block.Block;

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

@@ -1,7 +1,7 @@
package li.cil.oc2.common.block;
import li.cil.oc2.common.block.entity.RedstoneInterfaceTileEntity;
import li.cil.oc2.common.init.TileEntities;
import li.cil.oc2.common.block.entity.TileEntities;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.HorizontalBlock;

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

@@ -3,7 +3,6 @@ package li.cil.oc2.common.block.entity;
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.common.init.TileEntities;
import li.cil.oc2.common.serialization.NBTSerialization;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;

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

@@ -21,7 +21,6 @@ import li.cil.oc2.common.bus.device.util.ItemDeviceInfo;
import li.cil.oc2.common.capabilities.Capabilities;
import li.cil.oc2.common.container.DeviceItemStackHandler;
import li.cil.oc2.common.container.TypedDeviceItemStackHandler;
import li.cil.oc2.common.init.TileEntities;
import li.cil.oc2.common.network.Network;
import li.cil.oc2.common.network.message.ComputerBootErrorMessage;
import li.cil.oc2.common.network.message.ComputerBusStateMessage;

1
src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java
View File

@@ -4,7 +4,6 @@ import li.cil.oc2.api.bus.device.object.Callback;
import li.cil.oc2.api.bus.device.object.DocumentedDevice;
import li.cil.oc2.api.bus.device.object.NamedDevice;
import li.cil.oc2.api.bus.device.object.Parameter;
import li.cil.oc2.common.init.TileEntities;
import li.cil.oc2.common.util.HorizontalBlockUtils;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;

6
src/main/java/li/cil/oc2/common/init/TileEntities.java → src/main/java/li/cil/oc2/common/block/entity/TileEntities.java
View File

@@ -1,10 +1,8 @@
package li.cil.oc2.common.init;
package li.cil.oc2.common.block.entity;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.block.entity.BusCableTileEntity;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.block.entity.RedstoneInterfaceTileEntity;
import li.cil.oc2.common.block.Blocks;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;

2
src/main/java/li/cil/oc2/common/init/DeviceTypes.java → src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.init;
package li.cil.oc2.common.bus.device;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.DeviceType;

3
src/main/java/li/cil/oc2/common/init/BaseBlockDevices.java → src/main/java/li/cil/oc2/common/bus/device/data/BaseBlockDevices.java
View File

@@ -1,8 +1,7 @@
package li.cil.oc2.common.init;
package li.cil.oc2.common.bus.device.data;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.data.BaseBlockDevice;
import li.cil.oc2.common.bus.device.data.BuildrootRootFileSystem;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;

3
src/main/java/li/cil/oc2/common/init/Firmwares.java → src/main/java/li/cil/oc2/common/bus/device/data/Firmwares.java
View File

@@ -1,8 +1,7 @@
package li.cil.oc2.common.init;
package li.cil.oc2.common.bus.device.data;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.data.Firmware;
import li.cil.oc2.common.bus.device.data.BuildrootFirmware;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;

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

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

2
src/main/java/li/cil/oc2/common/init/Providers.java → src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java
View File

@@ -1,4 +1,4 @@
package li.cil.oc2.common.init;
package li.cil.oc2.common.bus.device.provider;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider;

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

@@ -9,8 +9,8 @@ import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
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;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.item.FlashMemoryItem;
import li.cil.oc2.common.item.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.MathHelper;

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

@@ -9,8 +9,8 @@ import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
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;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.item.HardDriveItem;
import li.cil.oc2.common.item.Items;
import li.cil.sedna.api.device.BlockDevice;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.MathHelper;

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

@@ -6,7 +6,7 @@ import li.cil.oc2.api.bus.device.ItemDevice;
import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
import li.cil.oc2.common.bus.device.item.MemoryDevice;
import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.item.Items;
import java.util.Optional;

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

@@ -4,7 +4,7 @@ import li.cil.oc2.api.bus.device.ItemDevice;
import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
import li.cil.oc2.common.bus.device.item.RedstoneInterfaceCardItemDevice;
import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.item.Items;
import java.util.Optional;

2
src/main/java/li/cil/oc2/common/bus/device/util/Devices.java
View File

@@ -7,7 +7,7 @@ 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.provider.ItemDeviceProvider;
import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
import li.cil.oc2.common.init.Providers;
import li.cil.oc2.common.bus.device.provider.Providers;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;

3
src/main/java/li/cil/oc2/common/container/ComputerContainer.java
View File

@@ -1,9 +1,8 @@
package li.cil.oc2.common.container;
import li.cil.oc2.api.bus.device.DeviceTypes;
import li.cil.oc2.common.block.Blocks;
import li.cil.oc2.common.block.entity.ComputerTileEntity;
import li.cil.oc2.common.init.Blocks;
import li.cil.oc2.common.init.Containers;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.network.PacketBuffer;

3
src/main/java/li/cil/oc2/common/init/Containers.java → src/main/java/li/cil/oc2/common/container/Containers.java
View File

@@ -1,8 +1,7 @@
package li.cil.oc2.common.init;
package li.cil.oc2.common.container;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.container.ComputerContainer;
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/integration/Wrenches.java
View File

@@ -1,6 +1,6 @@
package li.cil.oc2.common.integration;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.item.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

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

@@ -1,7 +1,7 @@
package li.cil.oc2.common.item;
import li.cil.oc2.common.block.Blocks;
import li.cil.oc2.common.block.BusCableBlock;
import li.cil.oc2.common.init.Blocks;
import net.minecraft.block.BlockState;
import net.minecraft.item.Item;
import net.minecraft.item.ItemUseContext;

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

@@ -3,8 +3,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.bus.device.data.Firmwares;
import li.cil.oc2.common.bus.device.item.ByteBufferFlashMemoryVMDevice;
import li.cil.oc2.common.init.Firmwares;
import li.cil.oc2.common.util.ItemStackUtils;
import li.cil.oc2.common.util.NBTTagIds;
import net.minecraft.item.ItemStack;

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

@@ -2,7 +2,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.init.BaseBlockDevices;
import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
import li.cil.oc2.common.util.ItemStackUtils;
import li.cil.oc2.common.util.NBTTagIds;
import net.minecraft.item.ItemStack;

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

@@ -2,9 +2,8 @@ package li.cil.oc2.common.item;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.init.BaseBlockDevices;
import li.cil.oc2.common.init.Firmwares;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
import li.cil.oc2.common.bus.device.data.Firmwares;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;

4
src/main/java/li/cil/oc2/common/init/Items.java → src/main/java/li/cil/oc2/common/item/Items.java
View File

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

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

@@ -2,9 +2,9 @@ package li.cil.oc2.data;
import com.google.common.collect.Maps;
import li.cil.oc2.api.API;
import li.cil.oc2.common.block.Blocks;
import li.cil.oc2.common.block.BusCableBlock;
import li.cil.oc2.common.init.Blocks;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.item.Items;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.data.DataGenerator;

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

@@ -2,8 +2,8 @@ package li.cil.oc2.data;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.common.init.Items;
import li.cil.oc2.common.item.HardDriveItem;
import li.cil.oc2.common.item.Items;
import li.cil.oc2.common.item.MemoryItem;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.Item;

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

@@ -2,7 +2,7 @@ package li.cil.oc2.data;
import com.mojang.datafixers.util.Pair;
import li.cil.oc2.api.API;
import li.cil.oc2.common.init.Blocks;
import li.cil.oc2.common.block.Blocks;
import net.minecraft.block.Block;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.LootTableProvider;