From 55d198660ff5ca3d308a35ea5792d897d348a539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 29 Dec 2020 18:49:59 +0100 Subject: [PATCH] Moved stuff to packages more closely mirroring vanilla layout. --- src/main/java/li/cil/oc2/OpenComputers.java | 9 ++++++++- src/main/java/li/cil/oc2/client/ClientSetup.java | 4 ++-- .../java/li/cil/oc2/common/{init => block}/Blocks.java | 6 +----- src/main/java/li/cil/oc2/common/block/BusCableBlock.java | 4 ++-- src/main/java/li/cil/oc2/common/block/ComputerBlock.java | 2 +- .../li/cil/oc2/common/block/RedstoneInterfaceBlock.java | 2 +- .../cil/oc2/common/block/entity/BusCableTileEntity.java | 1 - .../cil/oc2/common/block/entity/ComputerTileEntity.java | 1 - .../common/block/entity/RedstoneInterfaceTileEntity.java | 1 - .../oc2/common/{init => block/entity}/TileEntities.java | 6 ++---- .../cil/oc2/common/{init => bus/device}/DeviceTypes.java | 2 +- .../{init => bus/device/data}/BaseBlockDevices.java | 3 +-- .../oc2/common/{init => bus/device/data}/Firmwares.java | 3 +-- .../oc2/common/{init => bus/device}/package-info.java | 2 +- .../common/{init => bus/device/provider}/Providers.java | 2 +- .../provider/item/FlashMemoryItemDeviceProvider.java | 2 +- .../provider/item/HardDriveItemDeviceProvider.java | 2 +- .../device/provider/item/MemoryItemDeviceProvider.java | 2 +- .../item/RedstoneInterfaceCardItemDeviceProvider.java | 2 +- .../java/li/cil/oc2/common/bus/device/util/Devices.java | 2 +- .../li/cil/oc2/common/container/ComputerContainer.java | 3 +-- .../cil/oc2/common/{init => container}/Containers.java | 3 +-- .../java/li/cil/oc2/common/integration/Wrenches.java | 2 +- .../java/li/cil/oc2/common/item/BusInterfaceItem.java | 2 +- .../java/li/cil/oc2/common/item/FlashMemoryItem.java | 2 +- src/main/java/li/cil/oc2/common/item/HardDriveItem.java | 2 +- src/main/java/li/cil/oc2/common/item/ItemGroup.java | 5 ++--- .../java/li/cil/oc2/common/{init => item}/Items.java | 4 ++-- src/main/java/li/cil/oc2/data/BlockStates.java | 4 ++-- src/main/java/li/cil/oc2/data/ItemModels.java | 2 +- src/main/java/li/cil/oc2/data/LootTables.java | 2 +- 31 files changed, 41 insertions(+), 48 deletions(-) rename src/main/java/li/cil/oc2/common/{init => block}/Blocks.java (85%) rename src/main/java/li/cil/oc2/common/{init => block/entity}/TileEntities.java (90%) rename src/main/java/li/cil/oc2/common/{init => bus/device}/DeviceTypes.java (98%) rename src/main/java/li/cil/oc2/common/{init => bus/device/data}/BaseBlockDevices.java (92%) rename src/main/java/li/cil/oc2/common/{init => bus/device/data}/Firmwares.java (92%) rename src/main/java/li/cil/oc2/common/{init => bus/device}/package-info.java (80%) rename src/main/java/li/cil/oc2/common/{init => bus/device/provider}/Providers.java (98%) rename src/main/java/li/cil/oc2/common/{init => container}/Containers.java (92%) rename src/main/java/li/cil/oc2/common/{init => item}/Items.java (97%) diff --git a/src/main/java/li/cil/oc2/OpenComputers.java b/src/main/java/li/cil/oc2/OpenComputers.java index 77755d39..af3beea9 100644 --- a/src/main/java/li/cil/oc2/OpenComputers.java +++ b/src/main/java/li/cil/oc2/OpenComputers.java @@ -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; diff --git a/src/main/java/li/cil/oc2/client/ClientSetup.java b/src/main/java/li/cil/oc2/client/ClientSetup.java index 4ba692bd..2c2fcd43 100644 --- a/src/main/java/li/cil/oc2/client/ClientSetup.java +++ b/src/main/java/li/cil/oc2/client/ClientSetup.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/Blocks.java b/src/main/java/li/cil/oc2/common/block/Blocks.java similarity index 85% rename from src/main/java/li/cil/oc2/common/init/Blocks.java rename to src/main/java/li/cil/oc2/common/block/Blocks.java index aa2ead9a..0d95f8c3 100644 --- a/src/main/java/li/cil/oc2/common/init/Blocks.java +++ b/src/main/java/li/cil/oc2/common/block/Blocks.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java index 7a89badc..bfbc87c0 100644 --- a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java +++ b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java index 4657cfb4..357de840 100644 --- a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java +++ b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java index 3ec851f0..e52b0e64 100644 --- a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java +++ b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java @@ -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; 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 085fe9c6..f0d46912 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 @@ -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; 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 7f631a1d..97a70284 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 @@ -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; diff --git a/src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java b/src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java index 42cae4c7..cf9abed4 100644 --- a/src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java +++ b/src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/TileEntities.java b/src/main/java/li/cil/oc2/common/block/entity/TileEntities.java similarity index 90% rename from src/main/java/li/cil/oc2/common/init/TileEntities.java rename to src/main/java/li/cil/oc2/common/block/entity/TileEntities.java index a7777b4e..83d5c72a 100644 --- a/src/main/java/li/cil/oc2/common/init/TileEntities.java +++ b/src/main/java/li/cil/oc2/common/block/entity/TileEntities.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/DeviceTypes.java b/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java similarity index 98% rename from src/main/java/li/cil/oc2/common/init/DeviceTypes.java rename to src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java index 84a7bf5f..1bae67dd 100644 --- a/src/main/java/li/cil/oc2/common/init/DeviceTypes.java +++ b/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/BaseBlockDevices.java b/src/main/java/li/cil/oc2/common/bus/device/data/BaseBlockDevices.java similarity index 92% rename from src/main/java/li/cil/oc2/common/init/BaseBlockDevices.java rename to src/main/java/li/cil/oc2/common/bus/device/data/BaseBlockDevices.java index 7f6c8eca..8518d3c1 100644 --- a/src/main/java/li/cil/oc2/common/init/BaseBlockDevices.java +++ b/src/main/java/li/cil/oc2/common/bus/device/data/BaseBlockDevices.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/Firmwares.java b/src/main/java/li/cil/oc2/common/bus/device/data/Firmwares.java similarity index 92% rename from src/main/java/li/cil/oc2/common/init/Firmwares.java rename to src/main/java/li/cil/oc2/common/bus/device/data/Firmwares.java index ce3b0462..d557fdba 100644 --- a/src/main/java/li/cil/oc2/common/init/Firmwares.java +++ b/src/main/java/li/cil/oc2/common/bus/device/data/Firmwares.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/package-info.java similarity index 80% rename from src/main/java/li/cil/oc2/common/init/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/package-info.java index 3c1a7d4a..8e37ad75 100644 --- a/src/main/java/li/cil/oc2/common/init/package-info.java +++ b/src/main/java/li/cil/oc2/common/bus/device/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.common.init; +package li.cil.oc2.common.bus.device; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/init/Providers.java b/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java similarity index 98% rename from src/main/java/li/cil/oc2/common/init/Providers.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java index fc4a23cd..8aa80832 100644 --- a/src/main/java/li/cil/oc2/common/init/Providers.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java index 23e4f887..ab90a89a 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java index c02e4a9b..a266a47e 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java index 372e6aff..6f6f273b 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java index 59c3cb4b..afb0d1eb 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java b/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java index c4412a9e..984dcf09 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java +++ b/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/container/ComputerContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerContainer.java index 50bc61e5..71e5bc1b 100644 --- a/src/main/java/li/cil/oc2/common/container/ComputerContainer.java +++ b/src/main/java/li/cil/oc2/common/container/ComputerContainer.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/Containers.java b/src/main/java/li/cil/oc2/common/container/Containers.java similarity index 92% rename from src/main/java/li/cil/oc2/common/init/Containers.java rename to src/main/java/li/cil/oc2/common/container/Containers.java index ace15100..383ae459 100644 --- a/src/main/java/li/cil/oc2/common/init/Containers.java +++ b/src/main/java/li/cil/oc2/common/container/Containers.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/integration/Wrenches.java b/src/main/java/li/cil/oc2/common/integration/Wrenches.java index 8b8598cf..ac4c9adb 100644 --- a/src/main/java/li/cil/oc2/common/integration/Wrenches.java +++ b/src/main/java/li/cil/oc2/common/integration/Wrenches.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java b/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java index ebe260c6..56d2648d 100644 --- a/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java +++ b/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java index fdf4537a..48f48e7c 100644 --- a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java +++ b/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java b/src/main/java/li/cil/oc2/common/item/HardDriveItem.java index 607f149b..13761cad 100644 --- a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java +++ b/src/main/java/li/cil/oc2/common/item/HardDriveItem.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/item/ItemGroup.java b/src/main/java/li/cil/oc2/common/item/ItemGroup.java index f80e66fd..7bfca721 100644 --- a/src/main/java/li/cil/oc2/common/item/ItemGroup.java +++ b/src/main/java/li/cil/oc2/common/item/ItemGroup.java @@ -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; diff --git a/src/main/java/li/cil/oc2/common/init/Items.java b/src/main/java/li/cil/oc2/common/item/Items.java similarity index 97% rename from src/main/java/li/cil/oc2/common/init/Items.java rename to src/main/java/li/cil/oc2/common/item/Items.java index 66113f1f..71bd13b7 100644 --- a/src/main/java/li/cil/oc2/common/init/Items.java +++ b/src/main/java/li/cil/oc2/common/item/Items.java @@ -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; diff --git a/src/main/java/li/cil/oc2/data/BlockStates.java b/src/main/java/li/cil/oc2/data/BlockStates.java index 9be78756..65486a9a 100644 --- a/src/main/java/li/cil/oc2/data/BlockStates.java +++ b/src/main/java/li/cil/oc2/data/BlockStates.java @@ -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; diff --git a/src/main/java/li/cil/oc2/data/ItemModels.java b/src/main/java/li/cil/oc2/data/ItemModels.java index d5b611e4..cf35117e 100644 --- a/src/main/java/li/cil/oc2/data/ItemModels.java +++ b/src/main/java/li/cil/oc2/data/ItemModels.java @@ -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; diff --git a/src/main/java/li/cil/oc2/data/LootTables.java b/src/main/java/li/cil/oc2/data/LootTables.java index 13401a96..5d4d0bee 100644 --- a/src/main/java/li/cil/oc2/data/LootTables.java +++ b/src/main/java/li/cil/oc2/data/LootTables.java @@ -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;