diff --git a/src/main/java/dan200/computercraft/ComputerCraft.java b/src/main/java/dan200/computercraft/ComputerCraft.java index c71cc4eb2..136751fed 100644 --- a/src/main/java/dan200/computercraft/ComputerCraft.java +++ b/src/main/java/dan200/computercraft/ComputerCraft.java @@ -43,12 +43,12 @@ import dan200.computercraft.shared.media.items.ItemPrintout; import dan200.computercraft.shared.media.items.ItemTreasureDisk; import dan200.computercraft.shared.network.ComputerCraftPacket; import dan200.computercraft.shared.network.PacketHandler; -import dan200.computercraft.shared.peripheral.common.BlockCable; +import dan200.computercraft.shared.peripheral.modem.wired.BlockCable; import dan200.computercraft.shared.peripheral.common.BlockPeripheral; -import dan200.computercraft.shared.peripheral.common.BlockWiredModemFull; +import dan200.computercraft.shared.peripheral.modem.wired.BlockWiredModemFull; import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive; -import dan200.computercraft.shared.peripheral.modem.BlockAdvancedModem; -import dan200.computercraft.shared.peripheral.modem.WirelessNetwork; +import dan200.computercraft.shared.peripheral.modem.wireless.BlockAdvancedModem; +import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork; import dan200.computercraft.shared.peripheral.printer.TilePrinter; import dan200.computercraft.shared.pocket.items.ItemPocketComputer; import dan200.computercraft.shared.pocket.peripherals.PocketModem; diff --git a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java index d875487e4..91cac5d9c 100644 --- a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java +++ b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java @@ -20,7 +20,7 @@ import dan200.computercraft.shared.media.items.ItemDiskLegacy; import dan200.computercraft.shared.media.items.ItemPrintout; import dan200.computercraft.shared.network.ComputerCraftPacket; import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive; -import dan200.computercraft.shared.peripheral.modem.TileCable; +import dan200.computercraft.shared.peripheral.modem.wired.TileCable; import dan200.computercraft.shared.peripheral.monitor.ClientMonitor; import dan200.computercraft.shared.peripheral.monitor.TileMonitor; import dan200.computercraft.shared.peripheral.printer.TilePrinter; diff --git a/src/main/java/dan200/computercraft/client/render/RenderOverlayCable.java b/src/main/java/dan200/computercraft/client/render/RenderOverlayCable.java index 138ad3fff..87c208fe2 100644 --- a/src/main/java/dan200/computercraft/client/render/RenderOverlayCable.java +++ b/src/main/java/dan200/computercraft/client/render/RenderOverlayCable.java @@ -2,8 +2,8 @@ package dan200.computercraft.client.render; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; -import dan200.computercraft.shared.peripheral.common.BlockCable; -import dan200.computercraft.shared.peripheral.modem.TileCable; +import dan200.computercraft.shared.peripheral.modem.wired.BlockCable; +import dan200.computercraft.shared.peripheral.modem.wired.TileCable; import dan200.computercraft.shared.util.WorldUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/dan200/computercraft/client/render/TileEntityCableRenderer.java b/src/main/java/dan200/computercraft/client/render/TileEntityCableRenderer.java index 7aaee1c14..2d20924c1 100644 --- a/src/main/java/dan200/computercraft/client/render/TileEntityCableRenderer.java +++ b/src/main/java/dan200/computercraft/client/render/TileEntityCableRenderer.java @@ -2,9 +2,9 @@ package dan200.computercraft.client.render; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; -import dan200.computercraft.shared.peripheral.common.BlockCable; -import dan200.computercraft.shared.peripheral.common.BlockCableModemVariant; -import dan200.computercraft.shared.peripheral.modem.TileCable; +import dan200.computercraft.shared.peripheral.modem.wired.BlockCable; +import dan200.computercraft.shared.peripheral.modem.wired.BlockCableModemVariant; +import dan200.computercraft.shared.peripheral.modem.wired.TileCable; import dan200.computercraft.shared.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/common/BlockPeripheral.java index e95c22461..a2ff07371 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/common/BlockPeripheral.java @@ -9,7 +9,7 @@ package dan200.computercraft.shared.peripheral.common; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive; -import dan200.computercraft.shared.peripheral.modem.TileWirelessModem; +import dan200.computercraft.shared.peripheral.modem.wireless.TileWirelessModem; import dan200.computercraft.shared.peripheral.monitor.TileMonitor; import dan200.computercraft.shared.peripheral.printer.TilePrinter; import dan200.computercraft.shared.peripheral.speaker.TileSpeaker; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/PeripheralItemFactory.java b/src/main/java/dan200/computercraft/shared/peripheral/common/PeripheralItemFactory.java index 22a8cc352..61de6649c 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/PeripheralItemFactory.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/common/PeripheralItemFactory.java @@ -8,6 +8,8 @@ package dan200.computercraft.shared.peripheral.common; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; +import dan200.computercraft.shared.peripheral.modem.wired.ItemCable; +import dan200.computercraft.shared.peripheral.modem.wireless.ItemAdvancedModem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java similarity index 97% rename from src/main/java/dan200/computercraft/shared/peripheral/common/BlockCable.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java index fba595cb6..21d3dc884 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java @@ -1,15 +1,17 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.common; +package dan200.computercraft.shared.peripheral.modem.wired; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.common.TileGeneric; import dan200.computercraft.shared.peripheral.PeripheralType; -import dan200.computercraft.shared.peripheral.modem.TileCable; +import dan200.computercraft.shared.peripheral.common.BlockPeripheralBase; +import dan200.computercraft.shared.peripheral.common.PeripheralItemFactory; +import dan200.computercraft.shared.peripheral.common.TilePeripheralBase; import dan200.computercraft.shared.util.WorldUtil; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockCableCableVariant.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCableCableVariant.java similarity index 63% rename from src/main/java/dan200/computercraft/shared/peripheral/common/BlockCableCableVariant.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCableCableVariant.java index e8c66ec06..310a81199 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockCableCableVariant.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCableCableVariant.java @@ -1,4 +1,10 @@ -package dan200.computercraft.shared.peripheral.common; +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.shared.peripheral.modem.wired; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockCableModemVariant.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCableModemVariant.java similarity index 95% rename from src/main/java/dan200/computercraft/shared/peripheral/common/BlockCableModemVariant.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCableModemVariant.java index 2f3653468..ac6a31840 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockCableModemVariant.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCableModemVariant.java @@ -1,10 +1,10 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.common; +package dan200.computercraft.shared.peripheral.modem.wired; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockWiredModemFull.java similarity index 90% rename from src/main/java/dan200/computercraft/shared/peripheral/common/BlockWiredModemFull.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockWiredModemFull.java index ae3631083..c31b5a82a 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/BlockWiredModemFull.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockWiredModemFull.java @@ -1,14 +1,15 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.common; +package dan200.computercraft.shared.peripheral.modem.wired; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; -import dan200.computercraft.shared.peripheral.modem.TileWiredModemFull; +import dan200.computercraft.shared.peripheral.common.BlockPeripheralBase; +import dan200.computercraft.shared.peripheral.common.TilePeripheralBase; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/ItemCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemCable.java similarity index 96% rename from src/main/java/dan200/computercraft/shared/peripheral/common/ItemCable.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemCable.java index 67e305e70..ba0cd8da3 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/ItemCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemCable.java @@ -1,14 +1,15 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.common; +package dan200.computercraft.shared.peripheral.modem.wired; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; -import dan200.computercraft.shared.peripheral.modem.TileCable; +import dan200.computercraft.shared.peripheral.common.ItemPeripheralBase; +import dan200.computercraft.shared.peripheral.common.PeripheralItemFactory; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/ItemWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemWiredModemFull.java similarity index 52% rename from src/main/java/dan200/computercraft/shared/peripheral/common/ItemWiredModemFull.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemWiredModemFull.java index 11e8a399d..0bf172c6c 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/ItemWiredModemFull.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemWiredModemFull.java @@ -1,6 +1,13 @@ -package dan200.computercraft.shared.peripheral.common; +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.shared.peripheral.modem.wired; import dan200.computercraft.shared.peripheral.PeripheralType; +import dan200.computercraft.shared.peripheral.common.ItemPeripheralBase; import net.minecraft.block.Block; public class ItemWiredModemFull extends ItemPeripheralBase diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java similarity index 98% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java index 577047548..e5ac47150 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java @@ -1,10 +1,10 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.modem; +package dan200.computercraft.shared.peripheral.modem.wired; import com.google.common.base.Objects; import dan200.computercraft.ComputerCraft; @@ -14,9 +14,10 @@ import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.shared.command.CommandCopy; import dan200.computercraft.shared.common.BlockGeneric; import dan200.computercraft.shared.peripheral.PeripheralType; -import dan200.computercraft.shared.peripheral.common.BlockCable; -import dan200.computercraft.shared.peripheral.common.BlockCableModemVariant; import dan200.computercraft.shared.peripheral.common.PeripheralItemFactory; +import dan200.computercraft.shared.peripheral.modem.ModemPeripheral; +import dan200.computercraft.shared.peripheral.modem.ModemState; +import dan200.computercraft.shared.peripheral.modem.TileModemBase; import dan200.computercraft.shared.wired.CapabilityWiredElement; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java similarity index 98% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/TileWiredModemFull.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java index 336d5d19f..f8a0db3ab 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWiredModemFull.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java @@ -1,10 +1,10 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.modem; +package dan200.computercraft.shared.peripheral.modem.wired; import com.google.common.base.Objects; import dan200.computercraft.ComputerCraft; @@ -12,8 +12,8 @@ import dan200.computercraft.api.network.wired.IWiredElement; import dan200.computercraft.api.network.wired.IWiredNode; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.shared.command.CommandCopy; -import dan200.computercraft.shared.peripheral.common.BlockCable; import dan200.computercraft.shared.peripheral.common.TilePeripheralBase; +import dan200.computercraft.shared.peripheral.modem.ModemState; import dan200.computercraft.shared.wired.CapabilityWiredElement; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemElement.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemElement.java similarity index 86% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemElement.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemElement.java index 105494b6a..369e4d8c9 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemElement.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemElement.java @@ -1,4 +1,10 @@ -package dan200.computercraft.shared.peripheral.modem; +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.shared.peripheral.modem.wired; import dan200.computercraft.api.network.wired.IWiredElement; import dan200.computercraft.api.network.wired.IWiredNetworkChange; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemLocalPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemLocalPeripheral.java similarity index 94% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemLocalPeripheral.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemLocalPeripheral.java index 60e1256cd..22f23cc24 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemLocalPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemLocalPeripheral.java @@ -1,4 +1,10 @@ -package dan200.computercraft.shared.peripheral.modem; +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.shared.peripheral.modem.wired; import dan200.computercraft.ComputerCraft; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java similarity index 97% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemPeripheral.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java index 31f89a535..aa378b859 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/WiredModemPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java @@ -1,4 +1,10 @@ -package dan200.computercraft.shared.peripheral.modem; +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.shared.peripheral.modem.wired; import com.google.common.collect.ImmutableMap; import dan200.computercraft.api.filesystem.IMount; @@ -12,6 +18,8 @@ import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.core.computer.Computer; import dan200.computercraft.core.computer.IComputerOwned; +import dan200.computercraft.shared.peripheral.modem.ModemPeripheral; +import dan200.computercraft.shared.peripheral.modem.ModemState; import net.minecraft.world.World; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/BlockAdvancedModem.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockAdvancedModem.java similarity index 96% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/BlockAdvancedModem.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockAdvancedModem.java index 4533ac81f..d7f16a258 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/BlockAdvancedModem.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockAdvancedModem.java @@ -1,10 +1,10 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.modem; +package dan200.computercraft.shared.peripheral.modem.wireless; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/ItemAdvancedModem.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/ItemAdvancedModem.java similarity index 85% rename from src/main/java/dan200/computercraft/shared/peripheral/common/ItemAdvancedModem.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/ItemAdvancedModem.java index 2e99252fb..4f1c4b13b 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/ItemAdvancedModem.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/ItemAdvancedModem.java @@ -1,13 +1,15 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.common; +package dan200.computercraft.shared.peripheral.modem.wireless; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.peripheral.PeripheralType; +import dan200.computercraft.shared.peripheral.common.ItemPeripheralBase; +import dan200.computercraft.shared.peripheral.common.PeripheralItemFactory; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileAdvancedModem.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileAdvancedModem.java similarity index 88% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/TileAdvancedModem.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileAdvancedModem.java index 0446cc323..d547be22d 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileAdvancedModem.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileAdvancedModem.java @@ -1,12 +1,15 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.modem; +package dan200.computercraft.shared.peripheral.modem.wireless; import dan200.computercraft.api.peripheral.IPeripheral; +import dan200.computercraft.shared.peripheral.modem.ModemPeripheral; +import dan200.computercraft.shared.peripheral.modem.ModemState; +import dan200.computercraft.shared.peripheral.modem.TileModemBase; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWirelessModem.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java similarity index 93% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/TileWirelessModem.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java index 27b512f10..8c9aa825c 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWirelessModem.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java @@ -1,16 +1,19 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.modem; +package dan200.computercraft.shared.peripheral.modem.wireless; import dan200.computercraft.ComputerCraft; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.shared.peripheral.PeripheralType; import dan200.computercraft.shared.peripheral.common.BlockPeripheral; import dan200.computercraft.shared.peripheral.common.BlockPeripheralVariant; +import dan200.computercraft.shared.peripheral.modem.ModemPeripheral; +import dan200.computercraft.shared.peripheral.modem.ModemState; +import dan200.computercraft.shared.peripheral.modem.TileModemBase; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java similarity index 88% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java index 34a5b433c..e15501598 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java @@ -1,13 +1,15 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.modem; +package dan200.computercraft.shared.peripheral.modem.wireless; import dan200.computercraft.ComputerCraft; import dan200.computercraft.api.network.IPacketNetwork; +import dan200.computercraft.shared.peripheral.modem.ModemPeripheral; +import dan200.computercraft.shared.peripheral.modem.ModemState; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessNetwork.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java similarity index 95% rename from src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessNetwork.java rename to src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java index 5596fab23..c94a1132c 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessNetwork.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java @@ -1,10 +1,10 @@ /* * This file is part of ComputerCraft - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. + * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission. * Send enquiries to dratcliffe@gmail.com */ -package dan200.computercraft.shared.peripheral.modem; +package dan200.computercraft.shared.peripheral.modem.wireless; import com.google.common.base.Preconditions; import dan200.computercraft.api.network.IPacketNetwork; diff --git a/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java b/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java index bb17bacb5..c5d3a4dfd 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java @@ -7,7 +7,7 @@ package dan200.computercraft.shared.pocket.peripherals; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.shared.peripheral.modem.ModemState; -import dan200.computercraft.shared.peripheral.modem.WirelessModemPeripheral; +import dan200.computercraft.shared.peripheral.modem.wireless.WirelessModemPeripheral; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; diff --git a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java index e34ffebb5..7c90d8d23 100644 --- a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java +++ b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java @@ -38,7 +38,11 @@ import dan200.computercraft.shared.peripheral.commandblock.CommandBlockPeriphera import dan200.computercraft.shared.peripheral.common.*; import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive; import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive; -import dan200.computercraft.shared.peripheral.modem.*; +import dan200.computercraft.shared.peripheral.modem.wired.*; +import dan200.computercraft.shared.peripheral.modem.wireless.BlockAdvancedModem; +import dan200.computercraft.shared.peripheral.modem.wireless.ItemAdvancedModem; +import dan200.computercraft.shared.peripheral.modem.wireless.TileAdvancedModem; +import dan200.computercraft.shared.peripheral.modem.wireless.TileWirelessModem; import dan200.computercraft.shared.peripheral.monitor.TileMonitor; import dan200.computercraft.shared.peripheral.printer.ContainerPrinter; import dan200.computercraft.shared.peripheral.printer.TilePrinter; diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java index 6c045eaab..b36e20a27 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java @@ -11,7 +11,7 @@ import dan200.computercraft.api.turtle.*; import dan200.computercraft.shared.peripheral.PeripheralType; import dan200.computercraft.shared.peripheral.common.PeripheralItemFactory; import dan200.computercraft.shared.peripheral.modem.ModemState; -import dan200.computercraft.shared.peripheral.modem.WirelessModemPeripheral; +import dan200.computercraft.shared.peripheral.modem.wireless.WirelessModemPeripheral; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelManager;