diff --git a/src/main/scala/li/cil/oc/Blocks.scala b/src/main/scala/li/cil/oc/Blocks.scala index 77baf351f..d6fefbb33 100644 --- a/src/main/scala/li/cil/oc/Blocks.scala +++ b/src/main/scala/li/cil/oc/Blocks.scala @@ -3,7 +3,8 @@ package li.cil.oc import cpw.mods.fml.common.registry.GameRegistry import li.cil.oc.common.block._ import li.cil.oc.common.recipe.Recipes -import li.cil.oc.common.{Tier, tileentity} +import li.cil.oc.common.Tier +import li.cil.oc.common.tileentity object Blocks { var robotProxy: RobotProxy = _ diff --git a/src/main/scala/li/cil/oc/Items.scala b/src/main/scala/li/cil/oc/Items.scala index b503b172e..56be598fc 100644 --- a/src/main/scala/li/cil/oc/Items.scala +++ b/src/main/scala/li/cil/oc/Items.scala @@ -1,15 +1,20 @@ package li.cil.oc import cpw.mods.fml.common.registry.GameRegistry -import li.cil.oc.api.detail.{ItemAPI, ItemInfo} +import li.cil.oc.api.detail.ItemAPI +import li.cil.oc.api.detail.ItemInfo import li.cil.oc.common.recipe.Recipes -import li.cil.oc.common.{Loot, Tier, item} +import li.cil.oc.common.Loot +import li.cil.oc.common.Tier +import li.cil.oc.common.item import li.cil.oc.util.Color import li.cil.oc.util.mods.Mods import net.minecraft.block.Block import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.{Item, ItemBlock, ItemStack} +import net.minecraft.item.Item +import net.minecraft.item.ItemBlock +import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/Localization.scala b/src/main/scala/li/cil/oc/Localization.scala index 9223ceece..cbe5a2103 100644 --- a/src/main/scala/li/cil/oc/Localization.scala +++ b/src/main/scala/li/cil/oc/Localization.scala @@ -1,7 +1,9 @@ package li.cil.oc import cpw.mods.fml.common.event.FMLFingerprintViolationEvent -import net.minecraft.util.{ChatComponentText, ChatComponentTranslation, StatCollector} +import net.minecraft.util.ChatComponentText +import net.minecraft.util.ChatComponentTranslation +import net.minecraft.util.StatCollector object Localization { private def resolveKey(key: String) = if (StatCollector.canTranslate(Settings.namespace + key)) Settings.namespace + key else key diff --git a/src/main/scala/li/cil/oc/OpenComputers.scala b/src/main/scala/li/cil/oc/OpenComputers.scala index 313ad312f..56e5d4199 100644 --- a/src/main/scala/li/cil/oc/OpenComputers.scala +++ b/src/main/scala/li/cil/oc/OpenComputers.scala @@ -4,7 +4,8 @@ import cpw.mods.fml.common.Mod.EventHandler import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent import cpw.mods.fml.common.event._ import cpw.mods.fml.common.network.FMLEventChannel -import cpw.mods.fml.common.{Mod, SidedProxy} +import cpw.mods.fml.common.Mod +import cpw.mods.fml.common.SidedProxy import li.cil.oc.common.Proxy import li.cil.oc.common.template.AssemblerTemplates import li.cil.oc.server.CommandHandler diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index b8453d88e..876780855 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -1,18 +1,21 @@ package li.cil.oc import java.io._ -import java.net.{Inet4Address, InetAddress} +import java.net.Inet4Address +import java.net.InetAddress import com.google.common.net.InetAddresses import com.typesafe.config._ import cpw.mods.fml.common.Loader -import cpw.mods.fml.common.versioning.{DefaultArtifactVersion, VersionRange} +import cpw.mods.fml.common.versioning.DefaultArtifactVersion +import cpw.mods.fml.common.versioning.VersionRange import li.cil.oc.api.component.TextBuffer.ColorDepth import li.cil.oc.util.mods.Mods import org.apache.commons.lang3.StringEscapeUtils import scala.collection.convert.WrapAsScala._ -import scala.io.{Codec, Source} +import scala.io.Codec +import scala.io.Source class Settings(config: Config) { // ----------------------------------------------------------------------- // diff --git a/src/main/scala/li/cil/oc/client/GuiHandler.scala b/src/main/scala/li/cil/oc/client/GuiHandler.scala index b7d96e8e0..e105972ca 100644 --- a/src/main/scala/li/cil/oc/client/GuiHandler.scala +++ b/src/main/scala/li/cil/oc/client/GuiHandler.scala @@ -3,8 +3,13 @@ package li.cil.oc.client import li.cil.oc.api.component.TextBuffer import li.cil.oc.common.inventory.ServerInventory import li.cil.oc.common.item.Tablet -import li.cil.oc.common.{GuiType, item, tileentity, GuiHandler => CommonGuiHandler} -import li.cil.oc.{Items, Localization, Settings} +import li.cil.oc.common.GuiType +import li.cil.oc.common.item +import li.cil.oc.common.tileentity +import li.cil.oc.common.{GuiHandler => CommonGuiHandler} +import li.cil.oc.Items +import li.cil.oc.Localization +import li.cil.oc.Settings import net.minecraft.client.Minecraft import net.minecraft.entity.player.EntityPlayer import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/client/PacketHandler.scala b/src/main/scala/li/cil/oc/client/PacketHandler.scala index 2d5891022..b6c939502 100644 --- a/src/main/scala/li/cil/oc/client/PacketHandler.scala +++ b/src/main/scala/li/cil/oc/client/PacketHandler.scala @@ -10,7 +10,8 @@ import li.cil.oc.api.network.ManagedEnvironment import li.cil.oc.client.renderer.PetRenderer import li.cil.oc.common.tileentity._ import li.cil.oc.common.tileentity.traits._ -import li.cil.oc.common.{PacketType, PacketHandler => CommonPacketHandler} +import li.cil.oc.common.PacketType +import li.cil.oc.common.{PacketHandler => CommonPacketHandler} import li.cil.oc.util.Audio import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiScreen diff --git a/src/main/scala/li/cil/oc/client/PacketSender.scala b/src/main/scala/li/cil/oc/client/PacketSender.scala index d7ed4a099..5be961d61 100644 --- a/src/main/scala/li/cil/oc/client/PacketSender.scala +++ b/src/main/scala/li/cil/oc/client/PacketSender.scala @@ -3,7 +3,9 @@ package li.cil.oc.client import li.cil.oc.Settings import li.cil.oc.common.tileentity._ import li.cil.oc.common.tileentity.traits.Computer -import li.cil.oc.common.{CompressedPacketBuilder, PacketType, SimplePacketBuilder} +import li.cil.oc.common.CompressedPacketBuilder +import li.cil.oc.common.PacketType +import li.cil.oc.common.SimplePacketBuilder import net.minecraft.client.Minecraft import net.minecraft.client.audio.PositionedSoundRecord import net.minecraft.util.ResourceLocation diff --git a/src/main/scala/li/cil/oc/client/Proxy.scala b/src/main/scala/li/cil/oc/client/Proxy.scala index f8e6c9d07..c7d929a38 100644 --- a/src/main/scala/li/cil/oc/client/Proxy.scala +++ b/src/main/scala/li/cil/oc/client/Proxy.scala @@ -1,18 +1,26 @@ package li.cil.oc.client -import cpw.mods.fml.client.registry.{ClientRegistry, RenderingRegistry} +import cpw.mods.fml.client.registry.ClientRegistry +import cpw.mods.fml.client.registry.RenderingRegistry import cpw.mods.fml.common.FMLCommonHandler -import cpw.mods.fml.common.event.{FMLInitializationEvent, FMLPreInitializationEvent} +import cpw.mods.fml.common.event.FMLInitializationEvent +import cpw.mods.fml.common.event.FMLPreInitializationEvent import cpw.mods.fml.common.network.NetworkRegistry import li.cil.oc.client.renderer.block.BlockRenderer import li.cil.oc.client.renderer.item.ItemRenderer import li.cil.oc.client.renderer.tileentity._ -import li.cil.oc.client.renderer.{PetRenderer, TextBufferRenderCache, WirelessNetworkDebugRenderer} +import li.cil.oc.client.renderer.PetRenderer +import li.cil.oc.client.renderer.TextBufferRenderCache +import li.cil.oc.client.renderer.WirelessNetworkDebugRenderer import li.cil.oc.common.component.TextBuffer import li.cil.oc.common.tileentity.ServerRack -import li.cil.oc.common.{tileentity, Proxy => CommonProxy} +import li.cil.oc.common.tileentity +import li.cil.oc.common.{Proxy => CommonProxy} import li.cil.oc.util.Audio -import li.cil.oc.{Items, OpenComputers, Settings, client} +import li.cil.oc.Items +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.client import net.minecraftforge.client.MinecraftForgeClient import net.minecraftforge.common.MinecraftForge diff --git a/src/main/scala/li/cil/oc/client/Sound.scala b/src/main/scala/li/cil/oc/client/Sound.scala index 40882f3c6..eb1de250b 100644 --- a/src/main/scala/li/cil/oc/client/Sound.scala +++ b/src/main/scala/li/cil/oc/client/Sound.scala @@ -1,19 +1,28 @@ package li.cil.oc.client -import java.net.{MalformedURLException, URL, URLConnection, URLStreamHandler} -import java.util.{Timer, TimerTask, UUID} +import java.net.MalformedURLException +import java.net.URL +import java.net.URLConnection +import java.net.URLStreamHandler +import java.util.Timer +import java.util.TimerTask +import java.util.UUID import cpw.mods.fml.client.FMLClientHandler import cpw.mods.fml.common.eventhandler.SubscribeEvent import cpw.mods.fml.relauncher.ReflectionHelper -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.Minecraft -import net.minecraft.client.audio.{SoundCategory, SoundManager, SoundPoolEntry} +import net.minecraft.client.audio.SoundCategory +import net.minecraft.client.audio.SoundManager +import net.minecraft.client.audio.SoundPoolEntry import net.minecraft.tileentity.TileEntity import net.minecraft.util.ResourceLocation import net.minecraftforge.client.event.sound.SoundLoadEvent import net.minecraftforge.event.world.WorldEvent -import paulscode.sound.{SoundSystem, SoundSystemConfig} +import paulscode.sound.SoundSystem +import paulscode.sound.SoundSystemConfig import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/client/Textures.scala b/src/main/scala/li/cil/oc/client/Textures.scala index 02dcf35d7..0f4460ebf 100644 --- a/src/main/scala/li/cil/oc/client/Textures.scala +++ b/src/main/scala/li/cil/oc/client/Textures.scala @@ -2,7 +2,8 @@ package li.cil.oc.client import li.cil.oc.Settings import net.minecraft.client.renderer.texture.TextureManager -import net.minecraft.util.{IIcon, ResourceLocation} +import net.minecraft.util.IIcon +import net.minecraft.util.ResourceLocation object Textures { val fontAntiAliased = new ResourceLocation(Settings.resourceDomain, "textures/font/chars.png") diff --git a/src/main/scala/li/cil/oc/client/gui/Case.scala b/src/main/scala/li/cil/oc/client/gui/Case.scala index 9b1026217..00909f2b5 100644 --- a/src/main/scala/li/cil/oc/client/gui/Case.scala +++ b/src/main/scala/li/cil/oc/client/gui/Case.scala @@ -3,8 +3,10 @@ package li.cil.oc.client.gui import java.util import li.cil.oc.Localization -import li.cil.oc.client.{Textures, PacketSender => ClientPacketSender} -import li.cil.oc.common.{container, tileentity} +import li.cil.oc.client.Textures +import li.cil.oc.client.{PacketSender => ClientPacketSender} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity import net.minecraft.client.gui.GuiButton import net.minecraft.entity.player.InventoryPlayer import org.lwjgl.opengl.GL11 diff --git a/src/main/scala/li/cil/oc/client/gui/Charger.scala b/src/main/scala/li/cil/oc/client/gui/Charger.scala index a70493bb9..506f58b3c 100644 --- a/src/main/scala/li/cil/oc/client/gui/Charger.scala +++ b/src/main/scala/li/cil/oc/client/gui/Charger.scala @@ -1,7 +1,8 @@ package li.cil.oc.client.gui import li.cil.oc.Localization -import li.cil.oc.common.{container, tileentity} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity import net.minecraft.entity.player.InventoryPlayer class Charger(playerInventory: InventoryPlayer, val charger: tileentity.Charger) extends DynamicGuiContainer(new container.Charger(playerInventory, charger)) { diff --git a/src/main/scala/li/cil/oc/client/gui/CustomGuiContainer.scala b/src/main/scala/li/cil/oc/client/gui/CustomGuiContainer.scala index dcee35ead..fbc6c3afc 100644 --- a/src/main/scala/li/cil/oc/client/gui/CustomGuiContainer.scala +++ b/src/main/scala/li/cil/oc/client/gui/CustomGuiContainer.scala @@ -7,7 +7,8 @@ import net.minecraft.client.gui.FontRenderer import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.client.renderer.RenderHelper import net.minecraft.inventory.Container -import org.lwjgl.opengl.{GL11, GL12} +import org.lwjgl.opengl.GL11 +import org.lwjgl.opengl.GL12 import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/client/gui/Disassembler.scala b/src/main/scala/li/cil/oc/client/gui/Disassembler.scala index ab2c40289..bf671334b 100644 --- a/src/main/scala/li/cil/oc/client/gui/Disassembler.scala +++ b/src/main/scala/li/cil/oc/client/gui/Disassembler.scala @@ -3,7 +3,8 @@ package li.cil.oc.client.gui import li.cil.oc.Localization import li.cil.oc.client.Textures import li.cil.oc.client.gui.widget.ProgressBar -import li.cil.oc.common.{container, tileentity} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity import net.minecraft.entity.player.InventoryPlayer import org.lwjgl.opengl.GL11 diff --git a/src/main/scala/li/cil/oc/client/gui/DiskDrive.scala b/src/main/scala/li/cil/oc/client/gui/DiskDrive.scala index bd4b239ef..87afa86b4 100644 --- a/src/main/scala/li/cil/oc/client/gui/DiskDrive.scala +++ b/src/main/scala/li/cil/oc/client/gui/DiskDrive.scala @@ -1,7 +1,8 @@ package li.cil.oc.client.gui import li.cil.oc.Localization -import li.cil.oc.common.{container, tileentity} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity import net.minecraft.entity.player.InventoryPlayer class DiskDrive(playerInventory: InventoryPlayer, val drive: tileentity.DiskDrive) extends DynamicGuiContainer(new container.DiskDrive(playerInventory, drive)) { diff --git a/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala index 8136e3f9b..2fc764a85 100644 --- a/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala +++ b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala @@ -1,13 +1,16 @@ package li.cil.oc.client.gui import li.cil.oc.client.Textures -import li.cil.oc.common.container.{ComponentSlot, Player} +import li.cil.oc.common.container.ComponentSlot +import li.cil.oc.common.container.Player import li.cil.oc.util.RenderState import li.cil.oc.util.mods.NEI -import li.cil.oc.{Localization, common} +import li.cil.oc.Localization +import li.cil.oc.common import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.texture.TextureMap -import net.minecraft.inventory.{Container, Slot} +import net.minecraft.inventory.Container +import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack import net.minecraft.util.IIcon import org.lwjgl.opengl.GL11 diff --git a/src/main/scala/li/cil/oc/client/gui/Icons.scala b/src/main/scala/li/cil/oc/client/gui/Icons.scala index 5a3d9b6a8..7c9ea3adc 100644 --- a/src/main/scala/li/cil/oc/client/gui/Icons.scala +++ b/src/main/scala/li/cil/oc/client/gui/Icons.scala @@ -2,7 +2,8 @@ package li.cil.oc.client.gui import cpw.mods.fml.common.eventhandler.SubscribeEvent import li.cil.oc.Settings -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import net.minecraft.util.IIcon import net.minecraftforge.client.event.TextureStitchEvent @@ -24,9 +25,9 @@ object Icons { byTier += Tier.None -> iconRegister.registerIcon(Settings.resourceDomain + ":icons/na") for (tier <- Tier.One to Tier.Three) { byTier += tier -> iconRegister.registerIcon(Settings.resourceDomain + ":icons/tier" + tier) + } } } - } def get(slotType: String) = bySlotType.get(slotType).orNull diff --git a/src/main/scala/li/cil/oc/client/gui/ImageButton.scala b/src/main/scala/li/cil/oc/client/gui/ImageButton.scala index bb72d6947..cd8fd06cf 100644 --- a/src/main/scala/li/cil/oc/client/gui/ImageButton.scala +++ b/src/main/scala/li/cil/oc/client/gui/ImageButton.scala @@ -1,6 +1,7 @@ package li.cil.oc.client.gui -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiButton import net.minecraft.client.renderer.Tessellator diff --git a/src/main/scala/li/cil/oc/client/gui/Robot.scala b/src/main/scala/li/cil/oc/client/gui/Robot.scala index 0037e963a..a6bfedcb9 100644 --- a/src/main/scala/li/cil/oc/client/gui/Robot.scala +++ b/src/main/scala/li/cil/oc/client/gui/Robot.scala @@ -5,17 +5,22 @@ import java.util import li.cil.oc.client.gui.widget.ProgressBar import li.cil.oc.client.renderer.TextBufferRenderCache import li.cil.oc.client.renderer.gui.BufferRenderer -import li.cil.oc.client.{Textures, PacketSender => ClientPacketSender} -import li.cil.oc.common.{container, tileentity} +import li.cil.oc.client.Textures +import li.cil.oc.client.{PacketSender => ClientPacketSender} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity import li.cil.oc.server.driver import li.cil.oc.util.RenderState -import li.cil.oc.{Localization, Settings, api} +import li.cil.oc.Localization +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiButton import net.minecraft.client.renderer.Tessellator import net.minecraft.entity.player.InventoryPlayer import net.minecraft.inventory.Slot -import org.lwjgl.input.{Keyboard, Mouse} +import org.lwjgl.input.Keyboard +import org.lwjgl.input.Mouse import org.lwjgl.opengl.GL11 class Robot(playerInventory: InventoryPlayer, val robot: tileentity.Robot) extends DynamicGuiContainer(new container.Robot(playerInventory, robot)) with TextBuffer { @@ -51,8 +56,11 @@ class Robot(playerInventory: InventoryPlayer, val robot: tileentity.Robot) exten private val maxBufferHeight = 140.0 private def bufferWidth = math.min(maxBufferWidth, TextBufferRenderCache.renderer.charRenderWidth * Settings.screenResolutionsByTier(0)._1) + private def bufferHeight = math.min(maxBufferHeight, TextBufferRenderCache.renderer.charRenderHeight * Settings.screenResolutionsByTier(0)._2) + override protected def bufferX = (8 + (maxBufferWidth - bufferWidth) / 2).toInt + override protected def bufferY = (8 + (maxBufferHeight - bufferHeight) / 2).toInt private val inventoryX = 169 diff --git a/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala b/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala index 9ff5b0a78..0b707817b 100644 --- a/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala +++ b/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala @@ -4,10 +4,12 @@ import java.util import li.cil.oc.Localization import li.cil.oc.client.gui.widget.ProgressBar -import li.cil.oc.client.{Textures, PacketSender => ClientPacketSender} +import li.cil.oc.client.Textures +import li.cil.oc.client.{PacketSender => ClientPacketSender} import li.cil.oc.common.container.ComponentSlot import li.cil.oc.common.template.AssemblerTemplates -import li.cil.oc.common.{container, tileentity} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity import net.minecraft.client.gui.GuiButton import net.minecraft.entity.player.InventoryPlayer import org.lwjgl.opengl.GL11 diff --git a/src/main/scala/li/cil/oc/client/gui/ServerRack.scala b/src/main/scala/li/cil/oc/client/gui/ServerRack.scala index b9f734adf..424b9feb0 100644 --- a/src/main/scala/li/cil/oc/client/gui/ServerRack.scala +++ b/src/main/scala/li/cil/oc/client/gui/ServerRack.scala @@ -2,10 +2,14 @@ package li.cil.oc.client.gui import java.util -import li.cil.oc.client.{Textures, PacketSender => ClientPacketSender} -import li.cil.oc.common.{container, tileentity} -import li.cil.oc.{Localization, Settings} -import net.minecraft.client.gui.{GuiButton, GuiScreen} +import li.cil.oc.client.Textures +import li.cil.oc.client.{PacketSender => ClientPacketSender} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity +import li.cil.oc.Localization +import li.cil.oc.Settings +import net.minecraft.client.gui.GuiButton +import net.minecraft.client.gui.GuiScreen import net.minecraft.client.renderer.Tessellator import net.minecraft.entity.player.InventoryPlayer import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/client/gui/Switch.scala b/src/main/scala/li/cil/oc/client/gui/Switch.scala index 06709158f..c15b274a8 100644 --- a/src/main/scala/li/cil/oc/client/gui/Switch.scala +++ b/src/main/scala/li/cil/oc/client/gui/Switch.scala @@ -3,7 +3,8 @@ package li.cil.oc.client.gui import java.text.DecimalFormat import li.cil.oc.Localization -import li.cil.oc.common.{container, tileentity} +import li.cil.oc.common.container +import li.cil.oc.common.tileentity import net.minecraft.entity.player.InventoryPlayer class Switch(playerInventory: InventoryPlayer, val switch: tileentity.Switch) extends DynamicGuiContainer(new container.Switch(playerInventory, switch)) { diff --git a/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala b/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala index 6ead080a7..9ce48986f 100644 --- a/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala +++ b/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala @@ -2,7 +2,8 @@ package li.cil.oc.client.gui import li.cil.oc.api import li.cil.oc.client.renderer.gui.BufferRenderer -import li.cil.oc.client.{KeyBindings, Textures} +import li.cil.oc.client.KeyBindings +import li.cil.oc.client.Textures import li.cil.oc.util.RenderState import li.cil.oc.util.mods.NEI import net.minecraft.client.Minecraft diff --git a/src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala index 84469859f..52388f872 100644 --- a/src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala @@ -1,9 +1,11 @@ package li.cil.oc.client.renderer -import java.util.concurrent.{Callable, TimeUnit} +import java.util.concurrent.Callable +import java.util.concurrent.TimeUnit import com.google.common.cache.CacheBuilder -import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent} +import cpw.mods.fml.common.eventhandler.EventPriority +import cpw.mods.fml.common.eventhandler.SubscribeEvent import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent import li.cil.oc.api.event.RobotRenderEvent import li.cil.oc.client.renderer.tileentity.RobotRenderer @@ -11,7 +13,8 @@ import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.entity.Entity import net.minecraftforge.client.event.RenderPlayerEvent -import org.lwjgl.opengl.{GL11, GL12} +import org.lwjgl.opengl.GL11 +import org.lwjgl.opengl.GL12 import scala.collection.convert.WrapAsScala._ import scala.collection.mutable @@ -20,9 +23,9 @@ object PetRenderer { val hidden = mutable.Set.empty[String] private val entitledPlayers = Map( - "Kethtar" -> (0.3, 0.9, 0.6), - "Jodarion" -> (1.0, 0.0, 0.0), - "DaKaTotal" -> (0.5, 0.7, 1.0) + "Kethtar" ->(0.3, 0.9, 0.6), + "Jodarion" ->(1.0, 0.0, 0.0), + "DaKaTotal" ->(0.5, 0.7, 1.0) ) private val petLocations = com.google.common.cache.CacheBuilder.newBuilder(). diff --git a/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala b/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala index 0f2c60d90..8bb168164 100644 --- a/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala +++ b/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala @@ -1,8 +1,11 @@ package li.cil.oc.client.renderer -import java.util.concurrent.{Callable, TimeUnit} +import java.util.concurrent.Callable +import java.util.concurrent.TimeUnit -import com.google.common.cache.{CacheBuilder, RemovalListener, RemovalNotification} +import com.google.common.cache.CacheBuilder +import com.google.common.cache.RemovalListener +import com.google.common.cache.RemovalNotification import cpw.mods.fml.common.eventhandler.SubscribeEvent import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent import li.cil.oc.Settings diff --git a/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala index 690974b1e..20e5aa567 100644 --- a/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala @@ -9,7 +9,8 @@ import li.cil.oc.common.block._ import li.cil.oc.common.tileentity import li.cil.oc.util.RenderState import net.minecraft.block.Block -import net.minecraft.client.renderer.{RenderBlocks, Tessellator} +import net.minecraft.client.renderer.RenderBlocks +import net.minecraft.client.renderer.Tessellator import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala index e4144ef04..7f9d65583 100644 --- a/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala @@ -2,9 +2,12 @@ package li.cil.oc.client.renderer.font import li.cil.oc.Settings import li.cil.oc.client.renderer.font.DynamicFontRenderer.CharTexture -import li.cil.oc.util.{FontUtil, RenderState} +import li.cil.oc.util.FontUtil +import li.cil.oc.util.RenderState import net.minecraft.client.Minecraft -import net.minecraft.client.resources.{IReloadableResourceManager, IResourceManager, IResourceManagerReloadListener} +import net.minecraft.client.resources.IReloadableResourceManager +import net.minecraft.client.resources.IResourceManager +import net.minecraft.client.resources.IResourceManagerReloadListener import org.lwjgl.BufferUtils import org.lwjgl.opengl._ diff --git a/src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala index 3c514eb06..06012e3ac 100644 --- a/src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala @@ -2,7 +2,8 @@ package li.cil.oc.client.renderer.font import com.google.common.base.Charsets import li.cil.oc.client.Textures -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.Minecraft import net.minecraft.util.ResourceLocation import org.lwjgl.opengl.GL11 diff --git a/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala index 1af78d002..da62b471b 100644 --- a/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala @@ -1,7 +1,9 @@ package li.cil.oc.client.renderer.font import li.cil.oc.Settings -import li.cil.oc.util.{PackedColor, RenderState, TextBuffer} +import li.cil.oc.util.PackedColor +import li.cil.oc.util.RenderState +import li.cil.oc.util.TextBuffer import org.lwjgl.opengl.GL11 /** diff --git a/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala index 00f693bcb..b2f768210 100644 --- a/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala @@ -4,14 +4,18 @@ import li.cil.oc.api.detail.ItemInfo import li.cil.oc.client.Textures import li.cil.oc.server.driver.item.Item import li.cil.oc.util.RenderState -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.client.Minecraft import net.minecraft.client.gui.ScaledResolution -import net.minecraft.client.renderer.entity.{RenderItem, RenderManager} +import net.minecraft.client.renderer.entity.RenderItem +import net.minecraft.client.renderer.entity.RenderManager import net.minecraft.item.ItemStack -import net.minecraft.util.{AxisAlignedBB, EnumChatFormatting} +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.EnumChatFormatting import net.minecraftforge.client.IItemRenderer -import net.minecraftforge.client.IItemRenderer.{ItemRenderType, ItemRendererHelper} +import net.minecraftforge.client.IItemRenderer.ItemRenderType +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper import org.lwjgl.opengl.GL11 import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala index e1d623dbc..7a880641a 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala @@ -3,7 +3,8 @@ package li.cil.oc.client.renderer.tileentity import li.cil.oc.common.tileentity.DiskDrive import li.cil.oc.util.RenderState import net.minecraft.client.renderer.OpenGlHelper -import net.minecraft.client.renderer.entity.{RenderItem, RenderManager} +import net.minecraft.client.renderer.entity.RenderItem +import net.minecraft.client.renderer.entity.RenderManager import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer import net.minecraft.entity.item.EntityItem import net.minecraft.tileentity.TileEntity diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala index de5d43562..989dc8a97 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala @@ -1,9 +1,12 @@ package li.cil.oc.client.renderer.tileentity import java.nio.IntBuffer -import java.util.concurrent.{Callable, TimeUnit} +import java.util.concurrent.Callable +import java.util.concurrent.TimeUnit -import com.google.common.cache.{CacheBuilder, RemovalListener, RemovalNotification} +import com.google.common.cache.CacheBuilder +import com.google.common.cache.RemovalListener +import com.google.common.cache.RemovalNotification import cpw.mods.fml.common.eventhandler.SubscribeEvent import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent import li.cil.oc.Settings @@ -14,7 +17,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.BufferUtils -import org.lwjgl.opengl.{GL11, GL15} +import org.lwjgl.opengl.GL11 +import org.lwjgl.opengl.GL15 import scala.util.Random diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala index 1c28c149b..8eb9335c1 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala @@ -5,12 +5,16 @@ import li.cil.oc.api.event.RobotRenderEvent import li.cil.oc.client.Textures import li.cil.oc.common.tileentity import li.cil.oc.util.RenderState -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.block.Block import net.minecraft.client.Minecraft -import net.minecraft.client.renderer.entity.{RenderManager, RendererLivingEntity} +import net.minecraft.client.renderer.entity.RenderManager +import net.minecraft.client.renderer.entity.RendererLivingEntity import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer -import net.minecraft.client.renderer.{GLAllocation, RenderBlocks, Tessellator} +import net.minecraft.client.renderer.GLAllocation +import net.minecraft.client.renderer.RenderBlocks +import net.minecraft.client.renderer.Tessellator import net.minecraft.init.Items import net.minecraft.item.ItemBlock import net.minecraft.tileentity.TileEntity @@ -21,7 +25,8 @@ import net.minecraftforge.client.IItemRenderer.ItemRendererHelper._ import net.minecraftforge.client.MinecraftForgeClient import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection -import org.lwjgl.opengl.{GL11, GL12} +import org.lwjgl.opengl.GL11 +import org.lwjgl.opengl.GL12 object RobotRenderer extends TileEntitySpecialRenderer { private val displayList = GLAllocation.generateDisplayLists(2) diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala index 7af3b1641..0964f754a 100644 --- a/src/main/scala/li/cil/oc/common/EventHandler.scala +++ b/src/main/scala/li/cil/oc/common/EventHandler.scala @@ -13,7 +13,9 @@ import li.cil.oc.client.{PacketSender => ClientPacketSender} import li.cil.oc.common.tileentity.traits.power import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.mods.Mods -import li.cil.oc.util.{LuaStateFactory, SideTracker, mods} +import li.cil.oc.util.LuaStateFactory +import li.cil.oc.util.SideTracker +import li.cil.oc.util.mods import net.minecraft.client.Minecraft import net.minecraft.entity.player.EntityPlayerMP import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/Loot.scala b/src/main/scala/li/cil/oc/common/Loot.scala index d6805cc57..44d946785 100644 --- a/src/main/scala/li/cil/oc/common/Loot.scala +++ b/src/main/scala/li/cil/oc/common/Loot.scala @@ -6,12 +6,15 @@ import java.util.Random import cpw.mods.fml.common.eventhandler.SubscribeEvent import li.cil.oc.common.recipe.Recipes import li.cil.oc.util.Color -import li.cil.oc.{OpenComputers, Settings, api} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.WeightedRandomChestContent -import net.minecraftforge.common.{ChestGenHooks, DimensionManager} +import net.minecraftforge.common.ChestGenHooks +import net.minecraftforge.common.DimensionManager import net.minecraftforge.event.world.WorldEvent import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/common/PacketBuilder.scala b/src/main/scala/li/cil/oc/common/PacketBuilder.scala index 1751937a6..a595b7ee3 100644 --- a/src/main/scala/li/cil/oc/common/PacketBuilder.scala +++ b/src/main/scala/li/cil/oc/common/PacketBuilder.scala @@ -1,6 +1,8 @@ package li.cil.oc.common -import java.io.{ByteArrayOutputStream, DataOutputStream, OutputStream} +import java.io.ByteArrayOutputStream +import java.io.DataOutputStream +import java.io.OutputStream import java.util.zip.GZIPOutputStream import cpw.mods.fml.common.FMLCommonHandler @@ -10,7 +12,8 @@ import li.cil.oc.OpenComputers import li.cil.oc.api.driver.EnvironmentHost import net.minecraft.entity.player.EntityPlayerMP import net.minecraft.item.ItemStack -import net.minecraft.nbt.{CompressedStreamTools, NBTTagCompound} +import net.minecraft.nbt.CompressedStreamTools +import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/PacketHandler.scala b/src/main/scala/li/cil/oc/common/PacketHandler.scala index 6948880d8..5f1757fd5 100644 --- a/src/main/scala/li/cil/oc/common/PacketHandler.scala +++ b/src/main/scala/li/cil/oc/common/PacketHandler.scala @@ -1,17 +1,21 @@ package li.cil.oc.common -import java.io.{DataInputStream, InputStream} +import java.io.DataInputStream +import java.io.InputStream import java.util.zip.GZIPInputStream -import io.netty.buffer.{ByteBuf, ByteBufInputStream} -import li.cil.oc.{Blocks, OpenComputers} +import io.netty.buffer.ByteBuf +import io.netty.buffer.ByteBufInputStream +import li.cil.oc.Blocks +import li.cil.oc.OpenComputers import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.CompressedStreamTools import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import scala.reflect.{ClassTag, classTag} +import scala.reflect.ClassTag +import scala.reflect.classTag abstract class PacketHandler { /** Top level dispatcher based on packet type. */ diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala index 462b169cb..634aaa90a 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -10,16 +10,20 @@ import li.cil.oc.common.event._ import li.cil.oc.common.item.Tablet import li.cil.oc.common.multipart.MultiPart import li.cil.oc.common.recipe.Recipes -import li.cil.oc.common.template.{RobotTemplate, TabletTemplate} +import li.cil.oc.common.template.RobotTemplate +import li.cil.oc.common.template.TabletTemplate import li.cil.oc.server.machine.luac.NativeLuaArchitecture import li.cil.oc.server.machine.luaj.LuaJLuaArchitecture import li.cil.oc.server.network.WirelessNetwork -import li.cil.oc.server.{machine, _} +import li.cil.oc.server.machine +import li.cil.oc.server._ import li.cil.oc.util.LuaStateFactory -import li.cil.oc.util.mods.{ComputerCraft, Mods} +import li.cil.oc.util.mods.ComputerCraft +import li.cil.oc.util.mods.Mods import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound -import net.minecraftforge.common.{ForgeChunkManager, MinecraftForge} +import net.minecraftforge.common.ForgeChunkManager +import net.minecraftforge.common.MinecraftForge import net.minecraftforge.oredict.OreDictionary import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/common/SaveHandler.scala b/src/main/scala/li/cil/oc/common/SaveHandler.scala index 0e5cd9608..93c63ed56 100644 --- a/src/main/scala/li/cil/oc/common/SaveHandler.scala +++ b/src/main/scala/li/cil/oc/common/SaveHandler.scala @@ -5,15 +5,21 @@ import java.io._ import java.nio.file._ import java.nio.file.attribute.BasicFileAttributes -import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent} +import cpw.mods.fml.common.eventhandler.EventPriority +import cpw.mods.fml.common.eventhandler.SubscribeEvent import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.machine.MachineHost -import li.cil.oc.{OpenComputers, Settings} -import net.minecraft.nbt.{CompressedStreamTools, NBTTagCompound} -import net.minecraft.world.{ChunkCoordIntPair, World} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import net.minecraft.nbt.CompressedStreamTools +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.world.ChunkCoordIntPair +import net.minecraft.world.World import net.minecraftforge.common.DimensionManager -import net.minecraftforge.event.world.{ChunkDataEvent, WorldEvent} -import org.apache.commons.lang3.{JavaVersion, SystemUtils} +import net.minecraftforge.event.world.ChunkDataEvent +import net.minecraftforge.event.world.WorldEvent +import org.apache.commons.lang3.JavaVersion +import org.apache.commons.lang3.SystemUtils import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala index 0417bc561..56c457b63 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -4,10 +4,13 @@ import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper import li.cil.oc.common.asm.template.SimpleComponentImpl import li.cil.oc.util.mods.Mods import li.cil.oc.util.mods.Mods.Mod -import net.minecraft.launchwrapper.{IClassTransformer, LaunchClassLoader} +import net.minecraft.launchwrapper.IClassTransformer +import net.minecraft.launchwrapper.LaunchClassLoader import org.apache.logging.log4j.LogManager import org.objectweb.asm.tree._ -import org.objectweb.asm.{ClassReader, ClassWriter, Opcodes} +import org.objectweb.asm.ClassReader +import org.objectweb.asm.ClassWriter +import org.objectweb.asm.Opcodes import scala.collection.convert.WrapAsJava._ import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/common/block/Adapter.scala b/src/main/scala/li/cil/oc/common/block/Adapter.scala index 7e690db24..10e4749d6 100644 --- a/src/main/scala/li/cil/oc/common/block/Adapter.scala +++ b/src/main/scala/li/cil/oc/common/block/Adapter.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.block import li.cil.oc.common.tileentity import net.minecraft.block.Block -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Adapter extends SimpleBlock { diff --git a/src/main/scala/li/cil/oc/common/block/Assembler.scala b/src/main/scala/li/cil/oc/common/block/Assembler.scala index 03c4eed62..f595553de 100644 --- a/src/main/scala/li/cil/oc/common/block/Assembler.scala +++ b/src/main/scala/li/cil/oc/common/block/Assembler.scala @@ -1,11 +1,14 @@ package li.cil.oc.common.block import li.cil.oc.client.Textures -import li.cil.oc.common.{GuiType, tileentity} -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Assembler extends SimpleBlock with traits.SpecialBlock with traits.PowerAcceptor { diff --git a/src/main/scala/li/cil/oc/common/block/Cable.scala b/src/main/scala/li/cil/oc/common/block/Cable.scala index 6dfd6bfaa..0d3bcac6c 100644 --- a/src/main/scala/li/cil/oc/common/block/Cable.scala +++ b/src/main/scala/li/cil/oc/common/block/Cable.scala @@ -1,8 +1,12 @@ package li.cil.oc.common.block import codechicken.lib.vec.Cuboid6 -import codechicken.multipart.{JNormalOcclusion, NormalOcclusionTest, TFacePart, TileMultipart} -import cpw.mods.fml.relauncher.{Side, SideOnly} +import codechicken.multipart.JNormalOcclusion +import codechicken.multipart.NormalOcclusionTest +import codechicken.multipart.TFacePart +import codechicken.multipart.TileMultipart +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings import li.cil.oc.api.network.Environment import li.cil.oc.api.tileentity.SidedEnvironment @@ -15,7 +19,8 @@ import net.minecraft.block.Block import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.tileentity.TileEntity import net.minecraft.util.AxisAlignedBB -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Cable extends SimpleBlock with traits.SpecialBlock { diff --git a/src/main/scala/li/cil/oc/common/block/Case.scala b/src/main/scala/li/cil/oc/common/block/Case.scala index 7a20227ac..484bf5a13 100644 --- a/src/main/scala/li/cil/oc/common/block/Case.scala +++ b/src/main/scala/li/cil/oc/common/block/Case.scala @@ -2,16 +2,22 @@ package li.cil.oc.common.block import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.common.{GuiType, tileentity} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity import li.cil.oc.util.mods.BuildCraft -import li.cil.oc.util.{Color, Tooltip} -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.util.Color +import li.cil.oc.util.Tooltip +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.{EnumRarity, ItemStack} +import net.minecraft.item.EnumRarity +import net.minecraft.item.ItemStack import net.minecraft.util.IIcon -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Case(val tier: Int) extends RedstoneAware with traits.PowerAcceptor { diff --git a/src/main/scala/li/cil/oc/common/block/Charger.scala b/src/main/scala/li/cil/oc/common/block/Charger.scala index 1b65ef806..fbe791594 100644 --- a/src/main/scala/li/cil/oc/common/block/Charger.scala +++ b/src/main/scala/li/cil/oc/common/block/Charger.scala @@ -1,14 +1,17 @@ package li.cil.oc.common.block import li.cil.oc.client.Textures -import li.cil.oc.common.{GuiType, tileentity} +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity import li.cil.oc.server.PacketSender import li.cil.oc.util.mods.BuildCraft -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.block.Block import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Charger extends RedstoneAware { diff --git a/src/main/scala/li/cil/oc/common/block/Disassembler.scala b/src/main/scala/li/cil/oc/common/block/Disassembler.scala index f653c3a26..a30e16c01 100644 --- a/src/main/scala/li/cil/oc/common/block/Disassembler.scala +++ b/src/main/scala/li/cil/oc/common/block/Disassembler.scala @@ -1,9 +1,11 @@ package li.cil.oc.common.block import li.cil.oc.client.Textures -import li.cil.oc.common.{GuiType, tileentity} +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity import li.cil.oc.util.Tooltip -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/block/DiskDrive.scala b/src/main/scala/li/cil/oc/common/block/DiskDrive.scala index bd495d23a..fa8c2429f 100644 --- a/src/main/scala/li/cil/oc/common/block/DiskDrive.scala +++ b/src/main/scala/li/cil/oc/common/block/DiskDrive.scala @@ -1,7 +1,8 @@ package li.cil.oc.common.block import li.cil.oc.OpenComputers -import li.cil.oc.common.{GuiType, tileentity} +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity import li.cil.oc.util.Tooltip import li.cil.oc.util.mods.Mods import net.minecraft.entity.player.EntityPlayer diff --git a/src/main/scala/li/cil/oc/common/block/Hologram.scala b/src/main/scala/li/cil/oc/common/block/Hologram.scala index ca5816de4..9626277df 100644 --- a/src/main/scala/li/cil/oc/common/block/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/block/Hologram.scala @@ -2,12 +2,15 @@ package li.cil.oc.common.block import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.tileentity import li.cil.oc.util.Tooltip import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.{EnumRarity, ItemStack} -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.item.EnumRarity +import net.minecraft.item.ItemStack +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Hologram(val tier: Int) extends SimpleBlock with traits.SpecialBlock { diff --git a/src/main/scala/li/cil/oc/common/block/Item.scala b/src/main/scala/li/cil/oc/common/block/Item.scala index 3d235686c..39eeb69a8 100644 --- a/src/main/scala/li/cil/oc/common/block/Item.scala +++ b/src/main/scala/li/cil/oc/common/block/Item.scala @@ -4,11 +4,15 @@ import java.util import li.cil.oc.client.KeyBindings import li.cil.oc.common.tileentity -import li.cil.oc.util.{ItemCosts, ItemUtils} -import li.cil.oc.{Settings, api} +import li.cil.oc.util.ItemCosts +import li.cil.oc.util.ItemUtils +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.{EnumRarity, ItemBlock, ItemStack} +import net.minecraft.item.EnumRarity +import net.minecraft.item.ItemBlock +import net.minecraft.item.ItemStack import net.minecraft.util.StatCollector import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/block/Keyboard.scala b/src/main/scala/li/cil/oc/common/block/Keyboard.scala index 6a0df766d..cd9467458 100644 --- a/src/main/scala/li/cil/oc/common/block/Keyboard.scala +++ b/src/main/scala/li/cil/oc/common/block/Keyboard.scala @@ -6,7 +6,8 @@ import li.cil.oc.api import li.cil.oc.common.tileentity import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 diff --git a/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala index dfed4c6e8..d0c438db2 100644 --- a/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala +++ b/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala @@ -4,10 +4,12 @@ import cpw.mods.fml.common.Optional import li.cil.oc.common.tileentity import li.cil.oc.util.mods.Mods import net.minecraft.block.Block -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType -import powercrystals.minefactoryreloaded.api.rednet.{IRedNetNetworkContainer, IRedNetOmniNode} +import powercrystals.minefactoryreloaded.api.rednet.IRedNetNetworkContainer +import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode @Optional.Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IConnectableRedNet", modid = Mods.IDs.MineFactoryReloaded) abstract class RedstoneAware extends SimpleBlock with IRedNetOmniNode { diff --git a/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala b/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala index a99637766..088e1c941 100644 --- a/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala +++ b/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala @@ -2,14 +2,18 @@ package li.cil.oc.common.block import java.util.Random -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.tileentity -import li.cil.oc.{Blocks, Settings} +import li.cil.oc.Blocks +import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.EnumRarity -import net.minecraft.util.{IIcon, MovingObjectPosition} -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.util.IIcon +import net.minecraft.util.MovingObjectPosition +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class RobotAfterimage extends SimpleBlock with traits.SpecialBlock { diff --git a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala index ae2831340..ec10153aa 100644 --- a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala +++ b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala @@ -2,19 +2,30 @@ package li.cil.oc.common.block import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.client.KeyBindings -import li.cil.oc.common.{GuiType, tileentity} +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity import li.cil.oc.server.PacketSender import li.cil.oc.server.component.robot -import li.cil.oc.util.{ItemUtils, Tooltip} -import li.cil.oc.{Blocks, OpenComputers, Settings} +import li.cil.oc.util.ItemUtils +import li.cil.oc.util.Tooltip +import li.cil.oc.Blocks +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer -import net.minecraft.entity.{Entity, EntityLivingBase} -import net.minecraft.item.{EnumRarity, ItemStack} -import net.minecraft.util.{AxisAlignedBB, IIcon, MovingObjectPosition, Vec3} -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.entity.Entity +import net.minecraft.entity.EntityLivingBase +import net.minecraft.item.EnumRarity +import net.minecraft.item.ItemStack +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.IIcon +import net.minecraft.util.MovingObjectPosition +import net.minecraft.util.Vec3 +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class RobotProxy extends RedstoneAware with traits.SpecialBlock { diff --git a/src/main/scala/li/cil/oc/common/block/Screen.scala b/src/main/scala/li/cil/oc/common/block/Screen.scala index b7ee293dc..20ffb41ee 100644 --- a/src/main/scala/li/cil/oc/common/block/Screen.scala +++ b/src/main/scala/li/cil/oc/common/block/Screen.scala @@ -2,18 +2,26 @@ package li.cil.oc.common.block import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.common.{GuiType, tileentity} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity import li.cil.oc.util.mods.BuildCraft -import li.cil.oc.util.{Color, PackedColor, Tooltip} -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.util.Color +import li.cil.oc.util.PackedColor +import li.cil.oc.util.Tooltip +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.projectile.EntityArrow -import net.minecraft.entity.{Entity, EntityLivingBase} -import net.minecraft.item.{EnumRarity, ItemStack} +import net.minecraft.entity.Entity +import net.minecraft.entity.EntityLivingBase +import net.minecraft.item.EnumRarity +import net.minecraft.item.ItemStack import net.minecraft.util.IIcon -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Screen(val tier: Int) extends RedstoneAware { @@ -38,43 +46,69 @@ class Screen(val tier: Int) extends RedstoneAware { var b, b2, bbl, bbl2, bbm, bbm2, bbr, bbr2, bhb, bhb2, bhm, bhm2, bht, bht2, bml, bmm, bmr, btl, btm, btr, bvb, bvb2, bvm, bvt, f, f2, fbl, fbl2, fbm, fbm2, fbr, fbr2, fhb, fhb2, fhm, fhm2, fht, fht2, fml, fmm, fmr, ftl, ftm, ftr, fvb, fvb2, fvm, fvt = null: IIcon def fh = Array(fht, fhm, fhb) + def fv = Array(fvt, fvm, fvb) + def bh = Array(bht, bhm, bhb) + def bv = Array(bvt, bvm, bvb) def fth = Array(ftl, ftm, ftr) + def fmh = Array(fml, fmm, fmr) + def fbh = Array(fbl, fbm, fbr) + def bth = Array(btl, btm, btr) + def bmh = Array(bml, bmm, bmr) + def bbh = Array(bbl, bbm, bbr) def ftv = Array(ftl, fml, fbl) + def fmv = Array(ftm, fmm, fbm) + def fbv = Array(ftr, fmr, fbr) + def btv = Array(btl, bml, bbl) + def bmv = Array(btm, bmm, bbm) + def bbv = Array(btr, bmr, bbr) def fh2 = Array(fht2, fhm2, fhb2) + def fv2 = Array(fvt, fvm, fvb2) + def bh2 = Array(bht2, bhm2, bhb2) + def bv2 = Array(bvt, bvm, bvb2) + def fbh2 = Array(fbl2, fbm2, fbr2) + def bbh2 = Array(bbl2, bbm2, bbr2) def fud = Icons.fh2 ++ Icons.fv2 ++ Icons.fth ++ Icons.fmh ++ Icons.fbh2 + def bud = Icons.bh2.reverse ++ Icons.bv2 ++ Icons.bth.reverse ++ Icons.bmh.reverse ++ Icons.bbh2.reverse + def fsn = Icons.fh ++ Icons.fv ++ Icons.fth ++ Icons.fmh ++ Icons.fbh + def few = Icons.fv ++ Icons.fh ++ Icons.ftv ++ Icons.fmv ++ Icons.fbv + def bsn = Icons.bh ++ Icons.bv ++ Icons.bth ++ Icons.bmh ++ Icons.bbh + def bew = Icons.bv ++ Icons.bh ++ Icons.btv ++ Icons.bmv ++ Icons.bbv def sud = Array(Icons.bvt, Icons.bvm, Icons.bvb2) + def sse = Array(Icons.bhb2, Icons.bhm2, Icons.bht2) + def snw = Array(Icons.bht2, Icons.bhm2, Icons.bhb2) def th = Array(Icons.bhb, Icons.bhm, Icons.bht) + def tv = Array(Icons.bvb, Icons.bvm, Icons.bvt) } diff --git a/src/main/scala/li/cil/oc/common/block/ServerRack.scala b/src/main/scala/li/cil/oc/common/block/ServerRack.scala index cf86255e5..1d799797f 100644 --- a/src/main/scala/li/cil/oc/common/block/ServerRack.scala +++ b/src/main/scala/li/cil/oc/common/block/ServerRack.scala @@ -1,12 +1,15 @@ package li.cil.oc.common.block -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.OpenComputers import li.cil.oc.client.Textures -import li.cil.oc.common.{GuiType, tileentity} +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class ServerRack extends RedstoneAware with traits.SpecialBlock with traits.PowerAcceptor { diff --git a/src/main/scala/li/cil/oc/common/block/SimpleBlock.scala b/src/main/scala/li/cil/oc/common/block/SimpleBlock.scala index 05d33454a..ee2a1a62b 100644 --- a/src/main/scala/li/cil/oc/common/block/SimpleBlock.scala +++ b/src/main/scala/li/cil/oc/common/block/SimpleBlock.scala @@ -2,20 +2,30 @@ package li.cil.oc.common.block import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.tileentity -import li.cil.oc.common.tileentity.traits.{Colored, Inventory, Rotatable} -import li.cil.oc.util.{Color, Tooltip} -import li.cil.oc.{CreativeTab, Settings} +import li.cil.oc.common.tileentity.traits.Colored +import li.cil.oc.common.tileentity.traits.Inventory +import li.cil.oc.common.tileentity.traits.Rotatable +import li.cil.oc.util.Color +import li.cil.oc.util.Tooltip +import li.cil.oc.CreativeTab +import li.cil.oc.Settings import net.minecraft.block.Block import net.minecraft.block.material.Material import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.player.EntityPlayer -import net.minecraft.entity.{Entity, EnumCreatureType} -import net.minecraft.item.{EnumRarity, ItemStack} -import net.minecraft.util.{AxisAlignedBB, IIcon, Vec3} -import net.minecraft.world.{IBlockAccess, World} +import net.minecraft.entity.Entity +import net.minecraft.entity.EnumCreatureType +import net.minecraft.item.EnumRarity +import net.minecraft.item.ItemStack +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.IIcon +import net.minecraft.util.Vec3 +import net.minecraft.world.IBlockAccess +import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class SimpleBlock(material: Material = Material.iron) extends Block(material) { diff --git a/src/main/scala/li/cil/oc/common/block/Switch.scala b/src/main/scala/li/cil/oc/common/block/Switch.scala index e02a60ca7..e62be37b2 100644 --- a/src/main/scala/li/cil/oc/common/block/Switch.scala +++ b/src/main/scala/li/cil/oc/common/block/Switch.scala @@ -1,8 +1,10 @@ package li.cil.oc.common.block import li.cil.oc.client.Textures -import li.cil.oc.common.{GuiType, tileentity} -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.common.GuiType +import li.cil.oc.common.tileentity +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.entity.player.EntityPlayer import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/common/component/Screen.scala b/src/main/scala/li/cil/oc/common/component/Screen.scala index 53ac19b88..e77afdbf9 100644 --- a/src/main/scala/li/cil/oc/common/component/Screen.scala +++ b/src/main/scala/li/cil/oc/common/component/Screen.scala @@ -1,6 +1,8 @@ package li.cil.oc.common.component -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.common.tileentity import li.cil.oc.server.{PacketSender => ServerPacketSender} diff --git a/src/main/scala/li/cil/oc/common/component/Terminal.scala b/src/main/scala/li/cil/oc/common/component/Terminal.scala index fcef3f8da..beaf3d412 100644 --- a/src/main/scala/li/cil/oc/common/component/Terminal.scala +++ b/src/main/scala/li/cil/oc/common/component/Terminal.scala @@ -1,11 +1,17 @@ package li.cil.oc.common.component -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.component.Keyboard.UsabilityChecker -import li.cil.oc.api.network.{Component, Node, Visibility} -import li.cil.oc.common.{item, tileentity} +import li.cil.oc.api.network.Component +import li.cil.oc.api.network.Node +import li.cil.oc.api.network.Visibility +import li.cil.oc.common.item +import li.cil.oc.common.tileentity import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{Items, Settings, api} +import li.cil.oc.Items +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT diff --git a/src/main/scala/li/cil/oc/common/component/TextBuffer.scala b/src/main/scala/li/cil/oc/common/component/TextBuffer.scala index 75d17548a..d8b1387cf 100644 --- a/src/main/scala/li/cil/oc/common/component/TextBuffer.scala +++ b/src/main/scala/li/cil/oc/common/component/TextBuffer.scala @@ -4,6 +4,8 @@ import com.google.common.base.Strings import cpw.mods.fml.common.eventhandler.SubscribeEvent import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.Settings +import li.cil.oc.api import li.cil.oc.api.component.TextBuffer.ColorDepth import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.machine.Arguments @@ -18,11 +20,9 @@ import li.cil.oc.common._ import li.cil.oc.server.component.Keyboard import li.cil.oc.server.{ComponentTracker => ServerComponentTracker} import li.cil.oc.server.{PacketSender => ServerPacketSender} +import li.cil.oc.util import li.cil.oc.util.PackedColor import li.cil.oc.util.SideTracker -import li.cil.oc.Settings -import li.cil.oc.api -import li.cil.oc.util import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.event.world.ChunkEvent diff --git a/src/main/scala/li/cil/oc/common/container/Case.scala b/src/main/scala/li/cil/oc/common/container/Case.scala index 2161ce719..872a90159 100644 --- a/src/main/scala/li/cil/oc/common/container/Case.scala +++ b/src/main/scala/li/cil/oc/common/container/Case.scala @@ -1,7 +1,9 @@ package li.cil.oc.common.container -import li.cil.oc.common.{InventorySlots, tileentity} -import net.minecraft.entity.player.{EntityPlayer, InventoryPlayer} +import li.cil.oc.common.InventorySlots +import li.cil.oc.common.tileentity +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.entity.player.InventoryPlayer class Case(playerInventory: InventoryPlayer, computer: tileentity.Case) extends Player(playerInventory, computer) { for (i <- 0 to (if (computer.tier >= 2) 2 else 1)) { diff --git a/src/main/scala/li/cil/oc/common/container/ComponentSlot.scala b/src/main/scala/li/cil/oc/common/container/ComponentSlot.scala index c46c905a3..4881be624 100644 --- a/src/main/scala/li/cil/oc/common/container/ComponentSlot.scala +++ b/src/main/scala/li/cil/oc/common/container/ComponentSlot.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.container -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.Slot diff --git a/src/main/scala/li/cil/oc/common/container/Disassembler.scala b/src/main/scala/li/cil/oc/common/container/Disassembler.scala index d19765760..cb0ce02e2 100644 --- a/src/main/scala/li/cil/oc/common/container/Disassembler.scala +++ b/src/main/scala/li/cil/oc/common/container/Disassembler.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.container -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.tileentity import li.cil.oc.util.SideTracker import net.minecraft.entity.player.InventoryPlayer diff --git a/src/main/scala/li/cil/oc/common/container/DiskDrive.scala b/src/main/scala/li/cil/oc/common/container/DiskDrive.scala index 94b049f3a..90855ae0b 100644 --- a/src/main/scala/li/cil/oc/common/container/DiskDrive.scala +++ b/src/main/scala/li/cil/oc/common/container/DiskDrive.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.container -import li.cil.oc.common.{Slot, tileentity} +import li.cil.oc.common.Slot +import li.cil.oc.common.tileentity import net.minecraft.entity.player.InventoryPlayer class DiskDrive(playerInventory: InventoryPlayer, drive: tileentity.DiskDrive) extends Player(playerInventory, drive) { diff --git a/src/main/scala/li/cil/oc/common/container/DynamicComponentSlot.scala b/src/main/scala/li/cil/oc/common/container/DynamicComponentSlot.scala index 068a963ec..81c8e1291 100644 --- a/src/main/scala/li/cil/oc/common/container/DynamicComponentSlot.scala +++ b/src/main/scala/li/cil/oc/common/container/DynamicComponentSlot.scala @@ -5,7 +5,8 @@ import li.cil.oc.common import li.cil.oc.common.InventorySlots.InventorySlot import li.cil.oc.util.SideTracker import net.minecraft.entity.player.EntityPlayer -import net.minecraft.inventory.{IInventory, Slot} +import net.minecraft.inventory.IInventory +import net.minecraft.inventory.Slot class DynamicComponentSlot(val container: Player, inventory: IInventory, index: Int, x: Int, y: Int, val info: DynamicComponentSlot => InventorySlot, val containerTierGetter: () => Int) extends Slot(inventory, index, x, y) with ComponentSlot { override def tier = { diff --git a/src/main/scala/li/cil/oc/common/container/Player.scala b/src/main/scala/li/cil/oc/common/container/Player.scala index b9b9a966e..1c8d16aa6 100644 --- a/src/main/scala/li/cil/oc/common/container/Player.scala +++ b/src/main/scala/li/cil/oc/common/container/Player.scala @@ -4,8 +4,12 @@ import li.cil.oc.common import li.cil.oc.common.InventorySlots.InventorySlot import li.cil.oc.common.Tier import li.cil.oc.util.SideTracker -import net.minecraft.entity.player.{EntityPlayer, InventoryPlayer} -import net.minecraft.inventory.{Container, ICrafting, IInventory, Slot} +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.entity.player.InventoryPlayer +import net.minecraft.inventory.Container +import net.minecraft.inventory.ICrafting +import net.minecraft.inventory.IInventory +import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/common/container/Robot.scala b/src/main/scala/li/cil/oc/common/container/Robot.scala index be2c9400a..486b3f1d9 100644 --- a/src/main/scala/li/cil/oc/common/container/Robot.scala +++ b/src/main/scala/li/cil/oc/common/container/Robot.scala @@ -1,10 +1,12 @@ package li.cil.oc.common.container -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.client.gui.Icons import li.cil.oc.common.tileentity import li.cil.oc.util.SideTracker -import li.cil.oc.{api, common} +import li.cil.oc.api +import li.cil.oc.common import net.minecraft.entity.player.InventoryPlayer import net.minecraft.inventory.IInventory diff --git a/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala b/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala index 075b9a1e6..fd1c3b115 100644 --- a/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala +++ b/src/main/scala/li/cil/oc/common/container/RobotAssembler.scala @@ -1,12 +1,14 @@ package li.cil.oc.common.container -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.client.gui.Icons import li.cil.oc.common.InventorySlots.InventorySlot import li.cil.oc.common.template.AssemblerTemplates import li.cil.oc.common.tileentity import li.cil.oc.util.SideTracker -import li.cil.oc.{Settings, common} +import li.cil.oc.Settings +import li.cil.oc.common import net.minecraft.entity.player.InventoryPlayer class RobotAssembler(playerInventory: InventoryPlayer, val assembler: tileentity.RobotAssembler) extends Player(playerInventory, assembler) { diff --git a/src/main/scala/li/cil/oc/common/container/Server.scala b/src/main/scala/li/cil/oc/common/container/Server.scala index 4466f38c8..f503ea139 100644 --- a/src/main/scala/li/cil/oc/common/container/Server.scala +++ b/src/main/scala/li/cil/oc/common/container/Server.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.container import li.cil.oc.common.InventorySlots import li.cil.oc.common.inventory.ServerInventory -import net.minecraft.entity.player.{EntityPlayer, InventoryPlayer} +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.entity.player.InventoryPlayer class Server(playerInventory: InventoryPlayer, serverInventory: ServerInventory) extends Player(playerInventory, serverInventory) { for (i <- 0 to 1) { diff --git a/src/main/scala/li/cil/oc/common/container/ServerRack.scala b/src/main/scala/li/cil/oc/common/container/ServerRack.scala index b354d34e5..73ea8bacb 100644 --- a/src/main/scala/li/cil/oc/common/container/ServerRack.scala +++ b/src/main/scala/li/cil/oc/common/container/ServerRack.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.container -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.tileentity import li.cil.oc.util.SideTracker import net.minecraft.entity.player.InventoryPlayer diff --git a/src/main/scala/li/cil/oc/common/container/StaticComponentSlot.scala b/src/main/scala/li/cil/oc/common/container/StaticComponentSlot.scala index a629061a0..0155308b4 100644 --- a/src/main/scala/li/cil/oc/common/container/StaticComponentSlot.scala +++ b/src/main/scala/li/cil/oc/common/container/StaticComponentSlot.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.container import li.cil.oc.client.gui.Icons import li.cil.oc.common -import net.minecraft.inventory.{IInventory, Slot} +import net.minecraft.inventory.IInventory +import net.minecraft.inventory.Slot class StaticComponentSlot(val container: Player, inventory: IInventory, index: Int, x: Int, y: Int, val slot: String, val tier: Int) extends Slot(inventory, index, x, y) with ComponentSlot { setBackgroundIcon(Icons.get(slot)) diff --git a/src/main/scala/li/cil/oc/common/container/Switch.scala b/src/main/scala/li/cil/oc/common/container/Switch.scala index 1bf953bb8..c90cc8d39 100644 --- a/src/main/scala/li/cil/oc/common/container/Switch.scala +++ b/src/main/scala/li/cil/oc/common/container/Switch.scala @@ -1,7 +1,8 @@ package li.cil.oc.common.container import cpw.mods.fml.common.FMLCommonHandler -import li.cil.oc.common.{Slot, tileentity} +import li.cil.oc.common.Slot +import li.cil.oc.common.tileentity import net.minecraft.entity.player.InventoryPlayer class Switch(playerInventory: InventoryPlayer, switch: tileentity.Switch) extends Player(playerInventory, switch) { diff --git a/src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala b/src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala index 39d9963c3..68cc18409 100644 --- a/src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala +++ b/src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala @@ -5,9 +5,11 @@ import java.util import cpw.mods.fml.common.eventhandler.SubscribeEvent import li.cil.oc.api.event.RobotMoveEvent import li.cil.oc.server.component.UpgradeChunkloader -import net.minecraft.world.{ChunkCoordIntPair, World} +import net.minecraft.world.ChunkCoordIntPair +import net.minecraft.world.World import net.minecraftforge.common.ForgeChunkManager -import net.minecraftforge.common.ForgeChunkManager.{LoadingCallback, Ticket} +import net.minecraftforge.common.ForgeChunkManager.LoadingCallback +import net.minecraftforge.common.ForgeChunkManager.Ticket import net.minecraftforge.event.world.WorldEvent import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/common/event/ExperienceUpgradeHandler.scala b/src/main/scala/li/cil/oc/common/event/ExperienceUpgradeHandler.scala index e7058ced6..a08d505cc 100644 --- a/src/main/scala/li/cil/oc/common/event/ExperienceUpgradeHandler.scala +++ b/src/main/scala/li/cil/oc/common/event/ExperienceUpgradeHandler.scala @@ -4,7 +4,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent import li.cil.oc.api.event._ import li.cil.oc.api.tileentity.Robot import li.cil.oc.server.component -import li.cil.oc.{Localization, Settings} +import li.cil.oc.Localization +import li.cil.oc.Settings import org.lwjgl.opengl.GL11 object ExperienceUpgradeHandler { diff --git a/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala index 8eda31041..7e51cee38 100644 --- a/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala +++ b/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala @@ -1,9 +1,12 @@ package li.cil.oc.common.inventory import li.cil.oc.OpenComputers -import li.cil.oc.api.driver.{EnvironmentHost, Item => ItemDriver} -import li.cil.oc.api.network.{ManagedEnvironment, Node} -import li.cil.oc.api.{Driver, network} +import li.cil.oc.api.driver.EnvironmentHost +import li.cil.oc.api.driver.{Item => ItemDriver} +import li.cil.oc.api.network.ManagedEnvironment +import li.cil.oc.api.network.Node +import li.cil.oc.api.Driver +import li.cil.oc.api.network import li.cil.oc.server.driver.item.Item import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala index 7a6de7e8c..9afc96cad 100644 --- a/src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala +++ b/src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.inventory import li.cil.oc.Settings import net.minecraft.item.ItemStack -import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList import net.minecraftforge.common.util.Constants.NBT trait ItemStackInventory extends Inventory { diff --git a/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala index f4ab91956..942452f76 100644 --- a/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala +++ b/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala @@ -1,7 +1,8 @@ package li.cil.oc.common.inventory import li.cil.oc.api.Driver -import li.cil.oc.common.{InventorySlots, tileentity} +import li.cil.oc.common.InventorySlots +import li.cil.oc.common.tileentity import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/item/Analyzer.scala b/src/main/scala/li/cil/oc/common/item/Analyzer.scala index f2901e8b4..7ec1fd278 100644 --- a/src/main/scala/li/cil/oc/common/item/Analyzer.scala +++ b/src/main/scala/li/cil/oc/common/item/Analyzer.scala @@ -2,9 +2,11 @@ package li.cil.oc.common.item import li.cil.oc.Localization import li.cil.oc.api.network._ -import li.cil.oc.api.tileentity.{Analyzable, SidedEnvironment} +import li.cil.oc.api.tileentity.Analyzable +import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.server.PacketSender -import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP} +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.entity.player.EntityPlayerMP import net.minecraft.item.ItemStack import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/item/Delegate.scala b/src/main/scala/li/cil/oc/common/item/Delegate.scala index ceb51c84e..2ec4a2275 100644 --- a/src/main/scala/li/cil/oc/common/item/Delegate.scala +++ b/src/main/scala/li/cil/oc/common/item/Delegate.scala @@ -2,10 +2,15 @@ package li.cil.oc.common.item import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.client.KeyBindings -import li.cil.oc.util.{ItemCosts, Rarity, Tooltip} -import li.cil.oc.{Localization, Settings, api} +import li.cil.oc.util.ItemCosts +import li.cil.oc.util.Rarity +import li.cil.oc.util.Tooltip +import li.cil.oc.Localization +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/item/Delegator.scala b/src/main/scala/li/cil/oc/common/item/Delegator.scala index 3cde921ef..a37d5cf14 100644 --- a/src/main/scala/li/cil/oc/common/item/Delegator.scala +++ b/src/main/scala/li/cil/oc/common/item/Delegator.scala @@ -3,15 +3,20 @@ package li.cil.oc.common.item import java.util import java.util.Random -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.tileentity -import li.cil.oc.{CreativeTab, OpenComputers} +import li.cil.oc.CreativeTab +import li.cil.oc.OpenComputers import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.{EnumRarity, Item, ItemStack} -import net.minecraft.util.{IIcon, WeightedRandomChestContent} +import net.minecraft.item.EnumRarity +import net.minecraft.item.Item +import net.minecraft.item.ItemStack +import net.minecraft.util.IIcon +import net.minecraft.util.WeightedRandomChestContent import net.minecraft.world.World import net.minecraftforge.common.ChestGenHooks diff --git a/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala b/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala index 3fa51ddc4..c857158e5 100644 --- a/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala +++ b/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.item import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings import li.cil.oc.util.Color import net.minecraft.entity.player.EntityPlayer diff --git a/src/main/scala/li/cil/oc/common/item/ItemTier.scala b/src/main/scala/li/cil/oc/common/item/ItemTier.scala index a8b48ce8e..aa6eb4f86 100644 --- a/src/main/scala/li/cil/oc/common/item/ItemTier.scala +++ b/src/main/scala/li/cil/oc/common/item/ItemTier.scala @@ -2,12 +2,14 @@ package li.cil.oc.common.item import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Localization import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack -trait ItemTier extends Delegate { self: Delegate => +trait ItemTier extends Delegate { + self: Delegate => @SideOnly(Side.CLIENT) override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) { super.tooltipLines(stack, player, tooltip, advanced) diff --git a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala index b5ddef923..f8b23e792 100644 --- a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala +++ b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala @@ -4,7 +4,9 @@ import java.util import li.cil.oc.common.Tier import li.cil.oc.util.Tooltip -import li.cil.oc.util.mods.{BundledRedstone, Mods, WirelessRedstone} +import li.cil.oc.util.mods.BundledRedstone +import li.cil.oc.util.mods.Mods +import li.cil.oc.util.mods.WirelessRedstone import net.minecraft.item.ItemStack class RedstoneCard(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { @@ -20,12 +22,12 @@ class RedstoneCard(val parent: Delegator, val tier: Int) extends Delegate with I if (Mods.ProjectRedTransmission.isAvailable) { tooltip.addAll(Tooltip.get(super.unlocalizedName + ".ProjectRed")) } - if (Mods.RedLogic.isAvailable) { + if (Mods.RedLogic.isAvailable) { tooltip.addAll(Tooltip.get(super.unlocalizedName + ".RedLogic")) - } - if (Mods.MineFactoryReloaded.isAvailable) { + } + if (Mods.MineFactoryReloaded.isAvailable) { tooltip.addAll(Tooltip.get(super.unlocalizedName + ".RedNet")) - } + } if (Mods.WirelessRedstoneCBE.isAvailable) { tooltip.addAll(Tooltip.get(super.unlocalizedName + ".WirelessCBE")) } diff --git a/src/main/scala/li/cil/oc/common/item/Server.scala b/src/main/scala/li/cil/oc/common/item/Server.scala index b35a15eb7..032ff1263 100644 --- a/src/main/scala/li/cil/oc/common/item/Server.scala +++ b/src/main/scala/li/cil/oc/common/item/Server.scala @@ -3,9 +3,12 @@ package li.cil.oc.common.item import java.util import li.cil.oc.common.inventory.ServerInventory -import li.cil.oc.common.{GuiType, Tier} -import li.cil.oc.util.{Rarity, Tooltip} -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.common.GuiType +import li.cil.oc.common.Tier +import li.cil.oc.util.Rarity +import li.cil.oc.util.Tooltip +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/common/item/Tablet.scala b/src/main/scala/li/cil/oc/common/item/Tablet.scala index 80e5d2f58..dda2d0efe 100644 --- a/src/main/scala/li/cil/oc/common/item/Tablet.scala +++ b/src/main/scala/li/cil/oc/common/item/Tablet.scala @@ -1,24 +1,38 @@ package li.cil.oc.common.item import java.util.UUID -import java.util.concurrent.{Callable, TimeUnit} +import java.util.concurrent.Callable +import java.util.concurrent.TimeUnit -import com.google.common.cache.{CacheBuilder, RemovalListener, RemovalNotification} +import com.google.common.cache.CacheBuilder +import com.google.common.cache.RemovalListener +import com.google.common.cache.RemovalNotification import cpw.mods.fml.common.eventhandler.SubscribeEvent -import cpw.mods.fml.common.gameevent.TickEvent.{ClientTickEvent, ServerTickEvent} -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.api.driver.{EnvironmentHost, Processor} -import li.cil.oc.api.machine.{Architecture, MachineHost} -import li.cil.oc.api.network.{Message, Node} +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent +import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.api.driver.EnvironmentHost +import li.cil.oc.api.driver.Processor +import li.cil.oc.api.machine.Architecture +import li.cil.oc.api.machine.MachineHost +import li.cil.oc.api.network.Message +import li.cil.oc.api.network.Node import li.cil.oc.api.tileentity.Rotatable -import li.cil.oc.api.{Driver, Machine} +import li.cil.oc.api.Driver +import li.cil.oc.api.Machine import li.cil.oc.common.inventory.ComponentInventory -import li.cil.oc.common.{GuiType, Slot} +import li.cil.oc.common.GuiType +import li.cil.oc.common.Slot import li.cil.oc.server.component import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ItemUtils.TabletData -import li.cil.oc.util.{ItemUtils, RotationHelper} -import li.cil.oc.{Localization, OpenComputers, Settings, api} +import li.cil.oc.util.ItemUtils +import li.cil.oc.util.RotationHelper +import li.cil.oc.Localization +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/item/Terminal.scala b/src/main/scala/li/cil/oc/common/item/Terminal.scala index 24e432058..f56d9dda7 100644 --- a/src/main/scala/li/cil/oc/common/item/Terminal.scala +++ b/src/main/scala/li/cil/oc/common/item/Terminal.scala @@ -3,10 +3,14 @@ package li.cil.oc.common.item import java.util import java.util.UUID -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.common.{GuiType, Tier, tileentity} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.common.GuiType +import li.cil.oc.common.Tier +import li.cil.oc.common.tileentity import li.cil.oc.server.{PacketSender => ServerPacketSender} -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala b/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala index c5c38438b..5a2d3c053 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.item import java.util -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala b/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala index d0e6986b6..78383dcce 100644 --- a/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala +++ b/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala @@ -3,7 +3,8 @@ package li.cil.oc.common.launch import java.util import cpw.mods.fml.relauncher.IFMLLoadingPlugin -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.{MCVersion, TransformerExclusions} +import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion +import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions import li.cil.oc.common.asm.ClassTransformer @TransformerExclusions(Array("li.cil.oc.common.asm")) diff --git a/src/main/scala/li/cil/oc/common/multipart/CablePart.scala b/src/main/scala/li/cil/oc/common/multipart/CablePart.scala index cf51da339..c5e0ae389 100644 --- a/src/main/scala/li/cil/oc/common/multipart/CablePart.scala +++ b/src/main/scala/li/cil/oc/common/multipart/CablePart.scala @@ -1,21 +1,31 @@ package li.cil.oc.common.multipart -import codechicken.lib.data.{MCDataInput, MCDataOutput} -import codechicken.lib.vec.{Cuboid6, Vector3} +import codechicken.lib.data.MCDataInput +import codechicken.lib.data.MCDataOutput +import codechicken.lib.vec.Cuboid6 +import codechicken.lib.vec.Vector3 import codechicken.multipart._ -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.api.network.{Message, Node, Visibility} -import li.cil.oc.api.{Items, network} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.api.network.Message +import li.cil.oc.api.network.Node +import li.cil.oc.api.network.Visibility +import li.cil.oc.api.Items +import li.cil.oc.api.network import li.cil.oc.common.block.Cable import li.cil.oc.common.tileentity import li.cil.oc.util.Color import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{Settings, api, client, common} +import li.cil.oc.Settings +import li.cil.oc.api +import li.cil.oc.client +import li.cil.oc.common import net.minecraft.client.renderer.RenderBlocks import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound -import net.minecraft.util.{AxisAlignedBB, MovingObjectPosition} +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.MovingObjectPosition import scala.collection.convert.WrapAsJava import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/common/multipart/EventHandler.scala b/src/main/scala/li/cil/oc/common/multipart/EventHandler.scala index d4f155b7a..12f6e4d57 100644 --- a/src/main/scala/li/cil/oc/common/multipart/EventHandler.scala +++ b/src/main/scala/li/cil/oc/common/multipart/EventHandler.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.multipart import codechicken.lib.packet.PacketCustom import codechicken.lib.raytracer.RayTracer -import codechicken.lib.vec.{BlockCoord, Vector3} +import codechicken.lib.vec.BlockCoord +import codechicken.lib.vec.Vector3 import codechicken.multipart.TileMultipart import cpw.mods.fml.common.eventhandler.SubscribeEvent import li.cil.oc.api.Items @@ -14,7 +15,8 @@ import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement import net.minecraft.util.MovingObjectPosition import net.minecraftforge.common.MinecraftForge import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action -import net.minecraftforge.event.entity.player.{PlayerDestroyItemEvent, PlayerInteractEvent} +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent +import net.minecraftforge.event.entity.player.PlayerInteractEvent object EventHandler { private var currentlyPlacing = false diff --git a/src/main/scala/li/cil/oc/common/multipart/MultiPart.scala b/src/main/scala/li/cil/oc/common/multipart/MultiPart.scala index 6b40de835..477465c83 100644 --- a/src/main/scala/li/cil/oc/common/multipart/MultiPart.scala +++ b/src/main/scala/li/cil/oc/common/multipart/MultiPart.scala @@ -3,8 +3,10 @@ package li.cil.oc.common.multipart import java.util import codechicken.lib.vec.BlockCoord -import codechicken.multipart.MultiPartRegistry.{IPartConverter, IPartFactory} -import codechicken.multipart.{MultiPartRegistry, TMultiPart} +import codechicken.multipart.MultiPartRegistry.IPartConverter +import codechicken.multipart.MultiPartRegistry.IPartFactory +import codechicken.multipart.MultiPartRegistry +import codechicken.multipart.TMultiPart import li.cil.oc.Settings import li.cil.oc.api.Items import li.cil.oc.common.tileentity.Cable diff --git a/src/main/scala/li/cil/oc/common/multipart/SimpleBlockPart.scala b/src/main/scala/li/cil/oc/common/multipart/SimpleBlockPart.scala index c59ac526a..8ab356b67 100644 --- a/src/main/scala/li/cil/oc/common/multipart/SimpleBlockPart.scala +++ b/src/main/scala/li/cil/oc/common/multipart/SimpleBlockPart.scala @@ -1,7 +1,9 @@ package li.cil.oc.common.multipart -import codechicken.multipart.{TIconHitEffects, TMultiPart} -import cpw.mods.fml.relauncher.{Side, SideOnly} +import codechicken.multipart.TIconHitEffects +import codechicken.multipart.TMultiPart +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.common.block.SimpleBlock import net.minecraft.entity.Entity import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala b/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala index c40347429..8af1f5f68 100644 --- a/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala +++ b/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala @@ -3,8 +3,10 @@ package li.cil.oc.common.recipe import java.util.UUID import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.{Color, SideTracker} -import li.cil.oc.{Settings, api} +import li.cil.oc.util.Color +import li.cil.oc.util.SideTracker +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.inventory.InventoryCrafting import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala index 52cc59b43..0eac76faf 100644 --- a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala +++ b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.recipe -import java.io.{File, FileReader} +import java.io.File +import java.io.FileReader import com.typesafe.config._ import cpw.mods.fml.common.Loader @@ -11,9 +12,12 @@ import li.cil.oc.util.Color import li.cil.oc.util.mods.GregTech import net.minecraft.block.Block import net.minecraft.item.crafting.FurnaceRecipes -import net.minecraft.item.{ItemBlock, Item, ItemStack} +import net.minecraft.item.Item +import net.minecraft.item.ItemBlock +import net.minecraft.item.ItemStack import net.minecraftforge.oredict.RecipeSorter.Category -import net.minecraftforge.oredict.{OreDictionary, RecipeSorter} +import net.minecraftforge.oredict.OreDictionary +import net.minecraftforge.oredict.RecipeSorter import org.apache.commons.io.FileUtils import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/common/template/AssemblerTemplates.scala b/src/main/scala/li/cil/oc/common/template/AssemblerTemplates.scala index 5d03b0d67..0e3ec40c1 100644 --- a/src/main/scala/li/cil/oc/common/template/AssemblerTemplates.scala +++ b/src/main/scala/li/cil/oc/common/template/AssemblerTemplates.scala @@ -1,10 +1,13 @@ package li.cil.oc.common.template -import java.lang.reflect.{Method, Modifier} +import java.lang.reflect.Method +import java.lang.reflect.Modifier -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{OpenComputers, api} +import li.cil.oc.OpenComputers +import li.cil.oc.api import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala b/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala index 7078bc748..d6c3533a7 100644 --- a/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala +++ b/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala @@ -1,13 +1,17 @@ package li.cil.oc.common.template import cpw.mods.fml.common.event.FMLInterModComms -import li.cil.oc.common.{Slot, Tier, tileentity} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier +import li.cil.oc.common.tileentity import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ItemUtils -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack -import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList object RobotTemplate extends Template { override protected def hostClass = classOf[tileentity.Robot] diff --git a/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala b/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala index 4286440f2..c0e75cdc9 100644 --- a/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala +++ b/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala @@ -2,14 +2,17 @@ package li.cil.oc.common.template import cpw.mods.fml.common.event.FMLInterModComms import li.cil.oc.common.item.TabletWrapper -import li.cil.oc.{Settings, api} -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.driver.item import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ItemUtils +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack -import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/common/template/Template.scala b/src/main/scala/li/cil/oc/common/template/Template.scala index 9040675f6..eccb2144d 100644 --- a/src/main/scala/li/cil/oc/common/template/Template.scala +++ b/src/main/scala/li/cil/oc/common/template/Template.scala @@ -1,8 +1,11 @@ package li.cil.oc.common.template import li.cil.oc.api.driver._ -import li.cil.oc.common.{Slot, Tier} -import li.cil.oc.{Localization, Settings, api} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier +import li.cil.oc.Localization +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack import net.minecraft.util.IChatComponent diff --git a/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala b/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala index e2614408d..3c39a95f3 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala @@ -1,10 +1,14 @@ package li.cil.oc.common.tileentity -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.mods.Mods -import li.cil.oc.{Localization, Settings, api} +import li.cil.oc.Localization +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT diff --git a/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala b/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala index 517ca920a..45c9c0453 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala @@ -2,9 +2,11 @@ package li.cil.oc.common.tileentity import li.cil.oc.api.network._ import li.cil.oc.api.tileentity.Analyzable -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.player.EntityPlayer -import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/Cable.scala b/src/main/scala/li/cil/oc/common/tileentity/Cable.scala index 302aa5653..a8307453d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Cable.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Cable.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.tileentity import li.cil.oc.api.network.Visibility import li.cil.oc.util.Color -import li.cil.oc.{api, common} +import li.cil.oc.api +import li.cil.oc.common class Cable extends traits.Environment with traits.NotAnalyzable with traits.ImmibisMicroblock with traits.Colored { val node = api.Network.newNode(this, Visibility.None).create() diff --git a/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala b/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala index fb1309a78..f5c057fea 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala @@ -1,7 +1,9 @@ package li.cil.oc.common.tileentity -import li.cil.oc.api.network.{Node, Visibility} -import li.cil.oc.{Settings, api} +import li.cil.oc.api.network.Node +import li.cil.oc.api.network.Visibility +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraftforge.common.util.ForgeDirection class Capacitor extends traits.Environment { diff --git a/src/main/scala/li/cil/oc/common/tileentity/Case.scala b/src/main/scala/li/cil/oc/common/tileentity/Case.scala index e0df55a4e..f83462286 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Case.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Case.scala @@ -1,16 +1,19 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network.Connector -import li.cil.oc.api.{Driver, driver} -import li.cil.oc.common.{InventorySlots, Slot, Tier} +import li.cil.oc.api.Driver +import li.cil.oc.api.driver +import li.cil.oc.common.InventorySlots +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.util.Color -import li.cil.oc.{Settings, common} -import net.minecraft.client.Minecraft +import li.cil.oc.Settings +import li.cil.oc.common import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound -import net.minecraft.server.MinecraftServer import net.minecraftforge.common.util.ForgeDirection class Case(var tier: Int) extends traits.PowerAcceptor with traits.Computer with traits.Colored { diff --git a/src/main/scala/li/cil/oc/common/tileentity/Charger.scala b/src/main/scala/li/cil/oc/common/tileentity/Charger.scala index a9ff7fe28..7e82e61fd 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Charger.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Charger.scala @@ -1,14 +1,19 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.Driver -import li.cil.oc.api.network.{Component, Node, Visibility} +import li.cil.oc.api.network.Component +import li.cil.oc.api.network.Node +import li.cil.oc.api.network.Visibility import li.cil.oc.api.tileentity.Analyzable import li.cil.oc.common.Slot import li.cil.oc.common.item.Tablet import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ItemUtils -import li.cil.oc.{Localization, Settings, api} +import li.cil.oc.Localization +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala b/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala index 5e28f0678..c73315172 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala @@ -1,19 +1,28 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network.Visibility import li.cil.oc.common.Tier import li.cil.oc.common.inventory.ServerInventory import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.{InventoryUtils, ItemUtils} -import li.cil.oc.{OpenComputers, Settings, api} -import net.minecraft.item.crafting.{CraftingManager, IRecipe, ShapedRecipes, ShapelessRecipes} -import net.minecraft.item.{ItemBucket, ItemStack} +import li.cil.oc.util.InventoryUtils +import li.cil.oc.util.ItemUtils +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api +import net.minecraft.item.crafting.CraftingManager +import net.minecraft.item.crafting.IRecipe +import net.minecraft.item.crafting.ShapedRecipes +import net.minecraft.item.crafting.ShapelessRecipes +import net.minecraft.item.ItemBucket +import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.ForgeDirection -import net.minecraftforge.oredict.{ShapedOreRecipe, ShapelessOreRecipe} +import net.minecraftforge.oredict.ShapedOreRecipe +import net.minecraftforge.oredict.ShapelessOreRecipe import scala.collection.convert.WrapAsScala._ import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala b/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala index 32dc47149..15446ad6d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala @@ -1,11 +1,14 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api import li.cil.oc.api.Driver -import li.cil.oc.api.network.{Component, Visibility} +import li.cil.oc.api.network.Component +import li.cil.oc.api.network.Visibility import li.cil.oc.api.tileentity.Analyzable -import li.cil.oc.common.{Slot, Sound} +import li.cil.oc.common.Slot +import li.cil.oc.common.Sound import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ import net.minecraft.entity.player.EntityPlayer diff --git a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala index 74f0285b2..208be51e2 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala @@ -1,16 +1,23 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ -import li.cil.oc.api.tileentity.{Analyzable, SidedEnvironment} +import li.cil.oc.api.tileentity.Analyzable +import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.common.SaveHandler import li.cil.oc.server.{PacketSender => ServerPacketSender} -import li.cil.oc.util.mods.{Mods, Waila} -import li.cil.oc.{Settings, api} +import li.cil.oc.util.mods.Mods +import li.cil.oc.util.mods.Waila +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound -import net.minecraft.util.{AxisAlignedBB, Vec3} +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.Vec3 import net.minecraftforge.common.util.ForgeDirection class Hologram(var tier: Int) extends traits.Environment with SidedEnvironment with Analyzable with traits.Rotatable { diff --git a/src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala b/src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala index c702c29ff..06dda1836 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala @@ -1,9 +1,12 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.api.tileentity.{Analyzable, SidedEnvironment} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.api.tileentity.Analyzable +import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala b/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala index 9637f3bf6..248bbbd2f 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala @@ -1,12 +1,16 @@ package li.cil.oc.common.tileentity -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network.Visibility -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.EntityLivingBase import net.minecraft.nbt.NBTTagCompound import net.minecraft.potion.Potion -import net.minecraft.util.{AxisAlignedBB, Vec3} +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.Vec3 import scala.collection.convert.WrapAsScala._ import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala b/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala index 154a49c28..28e5a90aa 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala @@ -1,8 +1,10 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network._ -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraftforge.common.util.ForgeDirection class PowerConverter extends traits.PowerAcceptor with traits.Environment with traits.NotAnalyzable { diff --git a/src/main/scala/li/cil/oc/common/tileentity/PowerDistributor.scala b/src/main/scala/li/cil/oc/common/tileentity/PowerDistributor.scala index 740bf6f64..3508e8d2d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/PowerDistributor.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/PowerDistributor.scala @@ -1,9 +1,11 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network._ import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala b/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala index 5490f645b..fb1fbfe2b 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala @@ -2,7 +2,8 @@ package li.cil.oc.common.tileentity import li.cil.oc.Settings import li.cil.oc.api.network.Visibility -import li.cil.oc.common.tileentity.traits.{BundledRedstoneAware, Environment} +import li.cil.oc.common.tileentity.traits.BundledRedstoneAware +import li.cil.oc.common.tileentity.traits.Environment import li.cil.oc.server.component import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.mods.BundledRedstone diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala index e86c3a4df..1d7612034 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala @@ -2,19 +2,25 @@ package li.cil.oc.common.tileentity import java.util.UUID -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc._ -import li.cil.oc.api.event.{RobotAnalyzeEvent, RobotMoveEvent} +import li.cil.oc.api.event.RobotAnalyzeEvent +import li.cil.oc.api.event.RobotMoveEvent import li.cil.oc.api.network._ -import li.cil.oc.api.{Driver, tileentity} +import li.cil.oc.api.Driver +import li.cil.oc.api.tileentity import li.cil.oc.client.gui -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component.robot import li.cil.oc.server.component.robot.Inventory -import li.cil.oc.server.{driver, PacketSender => ServerPacketSender} +import li.cil.oc.server.driver +import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ItemUtils -import net.minecraft.block.{Block, BlockLiquid} +import net.minecraft.block.Block +import net.minecraft.block.BlockLiquid import net.minecraft.client.Minecraft import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala b/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala index 67ea4368a..5652f0588 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala @@ -1,13 +1,17 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.common.template.AssemblerTemplates import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala index 19ca2b87d..87ac87544 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala @@ -1,9 +1,12 @@ package li.cil.oc.common.tileentity import cpw.mods.fml.common.Optional -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ import li.cil.oc.api.tileentity import li.cil.oc.util.mods.Mods @@ -14,7 +17,9 @@ import net.minecraft.inventory.ISidedInventory import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection -import net.minecraftforge.fluids.{Fluid, FluidStack, IFluidHandler} +import net.minecraftforge.fluids.Fluid +import net.minecraftforge.fluids.FluidStack +import net.minecraftforge.fluids.IFluidHandler class RobotProxy(val robot: Robot) extends traits.Computer with traits.PowerInformation with tileentity.Robot with ISidedInventory with IFluidHandler { def this() = this(new Robot()) diff --git a/src/main/scala/li/cil/oc/common/tileentity/Screen.scala b/src/main/scala/li/cil/oc/common/tileentity/Screen.scala index 39b7b3049..2b27f48a4 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Screen.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Screen.scala @@ -1,9 +1,11 @@ package li.cil.oc.common.tileentity -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings import li.cil.oc.api.network._ -import li.cil.oc.api.tileentity.{Analyzable, SidedEnvironment} +import li.cil.oc.api.tileentity.Analyzable +import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.util.Color import net.minecraft.client.Minecraft import net.minecraft.entity.Entity diff --git a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala index 4cba531de..26075404b 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala @@ -4,19 +4,24 @@ import com.google.common.base.Strings import cpw.mods.fml.common.Optional import cpw.mods.fml.common.Optional.Method import cpw.mods.fml.common.eventhandler.SubscribeEvent -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc._ import li.cil.oc.api.Network import li.cil.oc.api.network._ import li.cil.oc.api.tileentity.Analyzable import li.cil.oc.client.Sound import li.cil.oc.common.Tier -import li.cil.oc.server.{component, driver, PacketSender => ServerPacketSender} +import li.cil.oc.server.component +import li.cil.oc.server.driver +import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.{Mods, Waila} +import li.cil.oc.util.mods.Mods +import li.cil.oc.util.mods.Waila import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack -import net.minecraft.nbt.{NBTTagCompound, NBTTagString} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagString import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.event.world.WorldEvent diff --git a/src/main/scala/li/cil/oc/common/tileentity/Switch.scala b/src/main/scala/li/cil/oc/common/tileentity/Switch.scala index 5b1d5d214..a57f91f87 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Switch.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Switch.scala @@ -3,13 +3,19 @@ package li.cil.oc.common.tileentity import com.google.common.base.Charsets import cpw.mods.fml.common.Optional import dan200.computercraft.api.lua.ILuaContext -import dan200.computercraft.api.peripheral.{IComputerAccess, IPeripheral} +import dan200.computercraft.api.peripheral.IComputerAccess +import dan200.computercraft.api.peripheral.IPeripheral import li.cil.oc.api.Driver -import li.cil.oc.api.network.{Message, Packet} -import li.cil.oc.common.{InventorySlots, Slot, item} +import li.cil.oc.api.network.Message +import li.cil.oc.api.network.Packet +import li.cil.oc.common.InventorySlots +import li.cil.oc.common.Slot +import li.cil.oc.common.item import li.cil.oc.server.PacketSender import li.cil.oc.util.mods.Mods -import li.cil.oc.{Items, Settings, api} +import li.cil.oc.Items +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala index 983d16c32..e34bf0ca2 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala @@ -1,14 +1,18 @@ package li.cil.oc.common.tileentity.traits import cpw.mods.fml.common.Optional -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network import li.cil.oc.api.network.ManagedEnvironment -import li.cil.oc.server.{component, PacketSender => ServerPacketSender} -import li.cil.oc.util.mods.{Mods, StargateTech2} +import li.cil.oc.server.component +import li.cil.oc.server.{PacketSender => ServerPacketSender} +import li.cil.oc.util.mods.Mods +import li.cil.oc.util.mods.StargateTech2 import net.minecraft.nbt.NBTTagCompound import stargatetech2.api.StargateTechAPI -import stargatetech2.api.bus.{IBusDevice, IBusInterface} +import stargatetech2.api.bus.IBusDevice +import stargatetech2.api.bus.IBusInterface // IMPORTANT: for some reason that is beyond me we cannot implement the // IBusDevice here directly, since we'll get an error if the interface is not diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala index e48f7e4cd..1da732f4d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala @@ -3,9 +3,13 @@ package li.cil.oc.common.tileentity.traits import cpw.mods.fml.common.Optional import li.cil.oc.Settings import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.{Mods, ProjectRed} -import mods.immibis.redlogic.api.wiring.{IBundledEmitter, IBundledUpdatable, IInsulatedRedstoneWire} -import mrtjp.projectred.api.{IBundledTile, ProjectRedAPI} +import li.cil.oc.util.mods.Mods +import li.cil.oc.util.mods.ProjectRed +import mods.immibis.redlogic.api.wiring.IBundledEmitter +import mods.immibis.redlogic.api.wiring.IBundledUpdatable +import mods.immibis.redlogic.api.wiring.IInsulatedRedstoneWire +import mrtjp.projectred.api.IBundledTile +import mrtjp.projectred.api.ProjectRedAPI import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Colored.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Colored.scala index 719d12856..8718080f4 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Colored.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Colored.scala @@ -1,8 +1,10 @@ package li.cil.oc.common.tileentity.traits -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.server.PacketSender -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound trait Colored extends TileEntity with api.tileentity.Colored { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/ComponentInventory.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/ComponentInventory.scala index 9b32f0106..df36348af 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/ComponentInventory.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/ComponentInventory.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.tileentity.traits -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network.Node import li.cil.oc.common.inventory import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala index 4c02ffeed..00a177246 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala @@ -1,21 +1,28 @@ package li.cil.oc.common.tileentity.traits import cpw.mods.fml.common.Optional -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.driver.Processor -import li.cil.oc.api.machine.{Architecture, MachineHost} +import li.cil.oc.api.machine.Architecture +import li.cil.oc.api.machine.MachineHost import li.cil.oc.api.network.Node import li.cil.oc.api.tileentity.Analyzable -import li.cil.oc.api.{Driver, Machine} +import li.cil.oc.api.Driver +import li.cil.oc.api.Machine import li.cil.oc.client.Sound import li.cil.oc.common.Slot import li.cil.oc.common.tileentity.RobotProxy -import li.cil.oc.server.{driver, PacketSender => ServerPacketSender} +import li.cil.oc.server.driver +import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.util.mods.{Mods, Waila} -import li.cil.oc.{Localization, Settings} +import li.cil.oc.util.mods.Mods +import li.cil.oc.util.mods.Waila +import li.cil.oc.Localization +import li.cil.oc.Settings import net.minecraft.entity.player.EntityPlayer -import net.minecraft.nbt.{NBTTagCompound, NBTTagString} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagString import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.ForgeDirection import stargatetech2.api.bus.IBusDevice diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala index 4d39c2ad0..68d8c7e3e 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala @@ -3,7 +3,8 @@ package li.cil.oc.common.tileentity.traits import li.cil.oc.Settings import li.cil.oc.api.network.Connector import li.cil.oc.api.tileentity.SidedEnvironment -import li.cil.oc.api.{driver, network} +import li.cil.oc.api.driver +import li.cil.oc.api.network import li.cil.oc.common.EventHandler import li.cil.oc.util.ExtendedNBT._ import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala index 8ce237b9d..552c8f2b5 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala @@ -1,12 +1,14 @@ package li.cil.oc.common.tileentity.traits -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.api.network._ import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.common.tileentity.traits import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.MovingAverage -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/PowerInformation.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/PowerInformation.scala index 08af1e7ec..017688bf9 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/PowerInformation.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/PowerInformation.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.tileentity.traits -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.server.{PacketSender => ServerPacketSender} import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala index 3ed9837a9..b4d2bcc60 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala @@ -1,11 +1,15 @@ package li.cil.oc.common.tileentity.traits import cpw.mods.fml.common.Optional -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.util.mods.Mods -import mods.immibis.redlogic.api.wiring.{IConnectable, IRedstoneEmitter, IRedstoneUpdatable, IWire} +import mods.immibis.redlogic.api.wiring.IConnectable +import mods.immibis.redlogic.api.wiring.IRedstoneEmitter +import mods.immibis.redlogic.api.wiring.IRedstoneUpdatable +import mods.immibis.redlogic.api.wiring.IWire import net.minecraft.init.Blocks import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala index 7dd19abf4..9178af29d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala @@ -1,8 +1,10 @@ package li.cil.oc.common.tileentity.traits -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.{Settings, api} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.server.{PacketSender => ServerPacketSender} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.entity.Entity import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala index 1a7595ead..b58ac044d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala @@ -1,7 +1,9 @@ package li.cil.oc.common.tileentity.traits -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.{Settings, api} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound trait TextBuffer extends Environment { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala index b0585b05e..1a6bf8487 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala @@ -1,9 +1,11 @@ package li.cil.oc.common.tileentity.traits -import cpw.mods.fml.relauncher.{Side, SideOnly} -import li.cil.oc.{Settings, OpenComputers} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.client.Sound import li.cil.oc.util.SideTracker +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.NetworkManager import net.minecraft.network.play.server.S35PacketUpdateTileEntity diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala index fd6ebce58..2e7fde2ff 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala @@ -3,10 +3,13 @@ package li.cil.oc.common.tileentity.traits.power import java.util import appeng.api.AEApi -import appeng.api.config.{Actionable, PowerMultiplier} +import appeng.api.config.Actionable +import appeng.api.config.PowerMultiplier import appeng.api.networking._ import appeng.api.networking.energy.IEnergyGrid -import appeng.api.util.{AECableType, AEColor, DimensionalCoord} +import appeng.api.util.AECableType +import appeng.api.util.AEColor +import appeng.api.util.DimensionalCoord import cpw.mods.fml.common.Optional import li.cil.oc.Settings import li.cil.oc.common.EventHandler diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala index f62663a6b..f15f31984 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala @@ -1,10 +1,12 @@ package li.cil.oc.common.tileentity.traits.power -import buildcraft.api.power.{IPowerReceptor, PowerHandler} +import buildcraft.api.power.IPowerReceptor +import buildcraft.api.power.PowerHandler import cpw.mods.fml.common.Optional import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.mods.Mods -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala index c41e94505..356eba69f 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala @@ -1,6 +1,7 @@ package li.cil.oc.common.tileentity.traits.power -import cpw.mods.fml.relauncher.{Side, SideOnly} +import cpw.mods.fml.relauncher.Side +import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Settings import li.cil.oc.api.network.Connector import li.cil.oc.common.tileentity.traits.TileEntity diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala index 50ac2cc95..054f04ec1 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala @@ -1,9 +1,12 @@ package li.cil.oc.common.tileentity.traits.power import cpw.mods.fml.common.Optional -import factorization.api.{Charge, Coord, IChargeConductor} +import factorization.api.Charge +import factorization.api.Coord +import factorization.api.IChargeConductor import li.cil.oc.util.mods.Mods -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraftforge.common.util.ForgeDirection trait Factorization extends Common { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala index 5adbb7574..f97c63ea9 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala @@ -5,7 +5,8 @@ import cpw.mods.fml.common.eventhandler.Event import ic2classic.api.Direction import li.cil.oc.common.EventHandler import li.cil.oc.util.mods.Mods -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala index b66ca4e16..267999af1 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala @@ -4,7 +4,8 @@ import cpw.mods.fml.common.Optional import cpw.mods.fml.common.eventhandler.Event import li.cil.oc.common.EventHandler import li.cil.oc.util.mods.Mods -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala index 795c7412d..4a7c22be3 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala @@ -1,12 +1,14 @@ package li.cil.oc.common.tileentity.traits.power import cpw.mods.fml.common.Optional -import li.cil.oc.{OpenComputers, Settings} import li.cil.oc.common.EventHandler import li.cil.oc.util.mods.Mods +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraftforge.common.util.ForgeDirection import universalelectricity.api.core.grid.electric.IEnergyNode -import universalelectricity.api.core.grid.{INode, INodeProvider} +import universalelectricity.api.core.grid.INode +import universalelectricity.api.core.grid.INodeProvider import universalelectricity.core.grid.node.NodeEnergy trait UniversalElectricity extends Common { diff --git a/src/main/scala/li/cil/oc/server/CommandHandler.scala b/src/main/scala/li/cil/oc/server/CommandHandler.scala index d4213720b..18c7dce3c 100644 --- a/src/main/scala/li/cil/oc/server/CommandHandler.scala +++ b/src/main/scala/li/cil/oc/server/CommandHandler.scala @@ -2,7 +2,8 @@ package li.cil.oc.server import cpw.mods.fml.common.event.FMLServerStartingEvent import li.cil.oc.Settings -import net.minecraft.command.{CommandBase, ICommandSender} +import net.minecraft.command.CommandBase +import net.minecraft.command.ICommandSender import scala.collection.convert.wrapAsJava._ import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/server/PacketHandler.scala b/src/main/scala/li/cil/oc/server/PacketHandler.scala index ea2e794bc..57ec0ec68 100644 --- a/src/main/scala/li/cil/oc/server/PacketHandler.scala +++ b/src/main/scala/li/cil/oc/server/PacketHandler.scala @@ -6,10 +6,15 @@ import li.cil.oc.api.machine.Machine import li.cil.oc.common.component.TextBuffer import li.cil.oc.common.multipart.EventHandler import li.cil.oc.common.tileentity._ -import li.cil.oc.common.tileentity.traits.{Computer, TileEntity} -import li.cil.oc.common.{PacketType, PacketHandler => CommonPacketHandler} -import li.cil.oc.{Localization, Settings, api} -import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP} +import li.cil.oc.common.tileentity.traits.Computer +import li.cil.oc.common.tileentity.traits.TileEntity +import li.cil.oc.common.PacketType +import li.cil.oc.common.{PacketHandler => CommonPacketHandler} +import li.cil.oc.Localization +import li.cil.oc.Settings +import li.cil.oc.api +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.entity.player.EntityPlayerMP import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.NetHandlerPlayServer import net.minecraftforge.common.DimensionManager diff --git a/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala b/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala index c3555d804..b6b2b2ebc 100644 --- a/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala +++ b/src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala @@ -1,6 +1,8 @@ package li.cil.oc.server.component -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.common.tileentity.traits.BundledRedstoneAware trait RedstoneBundled extends Redstone[BundledRedstoneAware] { diff --git a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala b/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala index a2b26a842..d2c520b85 100644 --- a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala +++ b/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala @@ -1,9 +1,12 @@ package li.cil.oc.server.component import codechicken.lib.vec.Vector3 -import codechicken.wirelessredstone.core.{WirelessReceivingDevice, WirelessTransmittingDevice} +import codechicken.wirelessredstone.core.WirelessReceivingDevice +import codechicken.wirelessredstone.core.WirelessTransmittingDevice import cpw.mods.fml.common.Optional -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ import li.cil.oc.common.EventHandler import li.cil.oc.common.tileentity.traits.RedstoneAware diff --git a/src/main/scala/li/cil/oc/server/component/Server.scala b/src/main/scala/li/cil/oc/server/component/Server.scala index 071215ba4..bff01dd59 100644 --- a/src/main/scala/li/cil/oc/server/component/Server.scala +++ b/src/main/scala/li/cil/oc/server/component/Server.scala @@ -1,12 +1,19 @@ package li.cil.oc.server.component import li.cil.oc.Items +import li.cil.oc.api.Driver +import li.cil.oc.api.Machine +import li.cil.oc.api.driver import li.cil.oc.api.driver.Processor -import li.cil.oc.api.machine.{Architecture, MachineHost} -import li.cil.oc.api.network.{Message, Node} -import li.cil.oc.api.{Driver, Machine, driver} -import li.cil.oc.common.inventory.{ComponentInventory, ServerInventory} -import li.cil.oc.common.{Slot, item, tileentity} +import li.cil.oc.api.machine.Architecture +import li.cil.oc.api.machine.MachineHost +import li.cil.oc.api.network.Message +import li.cil.oc.api.network.Node +import li.cil.oc.common.Slot +import li.cil.oc.common.inventory.ComponentInventory +import li.cil.oc.common.inventory.ServerInventory +import li.cil.oc.common.item +import li.cil.oc.common.tileentity import li.cil.oc.util.ExtendedNBT._ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala index b9a4361cf..b1837c135 100644 --- a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala +++ b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala @@ -4,9 +4,12 @@ import java.io._ import li.cil.oc.api.Network import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound import scala.language.implicitConversions diff --git a/src/main/scala/li/cil/oc/server/component/robot/FakeNetworkManager.scala b/src/main/scala/li/cil/oc/server/component/robot/FakeNetworkManager.scala index 8469b26c2..28ebfb07b 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/FakeNetworkManager.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/FakeNetworkManager.scala @@ -1,7 +1,9 @@ package li.cil.oc.server.component.robot -import io.netty.util.concurrent.{Future, GenericFutureListener} -import net.minecraft.network.{NetworkManager, Packet} +import io.netty.util.concurrent.Future +import io.netty.util.concurrent.GenericFutureListener +import net.minecraft.network.NetworkManager +import net.minecraft.network.Packet object FakeNetworkManager extends NetworkManager(false) { override def scheduleOutboundPacket(packet: Packet, listener: GenericFutureListener[_ <: Future[_]]*) {} diff --git a/src/main/scala/li/cil/oc/server/component/robot/Inventory.scala b/src/main/scala/li/cil/oc/server/component/robot/Inventory.scala index 1c4a800c2..b69ecf8ca 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/Inventory.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/Inventory.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.component.robot import li.cil.oc.common.tileentity import net.minecraft.block.Block import net.minecraft.entity.player.InventoryPlayer -import net.minecraft.item.{Item, ItemStack} +import net.minecraft.item.Item +import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagList import scala.util.control.Breaks._ diff --git a/src/main/scala/li/cil/oc/server/component/robot/Player.scala b/src/main/scala/li/cil/oc/server/component/robot/Player.scala index 2942bedc0..0701b1004 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/Player.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/Player.scala @@ -7,25 +7,36 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper import cpw.mods.fml.common.eventhandler.Event import li.cil.oc.api.event._ import li.cil.oc.common.tileentity -import li.cil.oc.util.mods.{Mods, PortalGun, TinkersConstruct} -import li.cil.oc.{OpenComputers, Settings} -import net.minecraft.block.{Block, BlockPistonBase} +import li.cil.oc.util.mods.Mods +import li.cil.oc.util.mods.PortalGun +import li.cil.oc.util.mods.TinkersConstruct +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import net.minecraft.block.Block +import net.minecraft.block.BlockPistonBase import net.minecraft.entity.item.EntityItem import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer.EnumStatus -import net.minecraft.entity.{Entity, EntityLivingBase, IMerchant} -import net.minecraft.init.{Blocks, Items} -import net.minecraft.item.{ItemBlock, ItemStack} +import net.minecraft.entity.Entity +import net.minecraft.entity.EntityLivingBase +import net.minecraft.entity.IMerchant +import net.minecraft.init.Blocks +import net.minecraft.init.Items +import net.minecraft.item.ItemBlock +import net.minecraft.item.ItemStack import net.minecraft.network.NetHandlerPlayServer import net.minecraft.potion.PotionEffect import net.minecraft.server.MinecraftServer import net.minecraft.util._ import net.minecraft.world.WorldServer -import net.minecraftforge.common.util.{FakePlayer, ForgeDirection} -import net.minecraftforge.common.{ForgeHooks, MinecraftForge} +import net.minecraftforge.common.util.FakePlayer +import net.minecraftforge.common.util.ForgeDirection +import net.minecraftforge.common.ForgeHooks +import net.minecraftforge.common.MinecraftForge import net.minecraftforge.event.ForgeEventFactory import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action -import net.minecraftforge.event.entity.player.{EntityInteractEvent, PlayerInteractEvent} +import net.minecraftforge.event.entity.player.EntityInteractEvent +import net.minecraftforge.event.entity.player.PlayerInteractEvent import net.minecraftforge.event.world.BlockEvent import net.minecraftforge.fluids.FluidRegistry diff --git a/src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala b/src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala index d4abc4f91..ee3adf4c9 100644 --- a/src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala +++ b/src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala @@ -6,7 +6,8 @@ import li.cil.oc.api.driver import li.cil.oc.api.driver.NamedBlock import li.cil.oc.api.network.ManagedEnvironment import net.minecraft.inventory.IInventory -import net.minecraft.item.{Item, ItemStack} +import net.minecraft.item.Item +import net.minecraft.item.ItemStack import net.minecraft.tileentity.TileEntity import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala b/src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala index 778a393bc..5878a76d7 100644 --- a/src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala +++ b/src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala @@ -6,7 +6,8 @@ import com.google.common.hash.Hashing import li.cil.oc.api.driver import li.cil.oc.api.network._ import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{OpenComputers, api} +import li.cil.oc.OpenComputers +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound class CompoundBlockEnvironment(val name: String, val environments: (driver.Block, ManagedEnvironment)*) extends ManagedEnvironment { diff --git a/src/main/scala/li/cil/oc/server/driver/Registry.scala b/src/main/scala/li/cil/oc/server/driver/Registry.scala index 492169ce0..f8a8cc9e1 100644 --- a/src/main/scala/li/cil/oc/server/driver/Registry.scala +++ b/src/main/scala/li/cil/oc/server/driver/Registry.scala @@ -2,9 +2,11 @@ package li.cil.oc.server.driver import java.util -import li.cil.oc.api.driver.{EnvironmentHost, Converter} +import li.cil.oc.api.driver.Converter +import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.machine.Value -import li.cil.oc.{OpenComputers, api} +import li.cil.oc.OpenComputers +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/server/driver/converter/FluidStack.scala b/src/main/scala/li/cil/oc/server/driver/converter/FluidStack.scala index b27613bbc..344954425 100644 --- a/src/main/scala/li/cil/oc/server/driver/converter/FluidStack.scala +++ b/src/main/scala/li/cil/oc/server/driver/converter/FluidStack.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.converter import java.util -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/server/driver/converter/ItemStack.scala b/src/main/scala/li/cil/oc/server/driver/converter/ItemStack.scala index e3a272e5a..fdc2c6b88 100644 --- a/src/main/scala/li/cil/oc/server/driver/converter/ItemStack.scala +++ b/src/main/scala/li/cil/oc/server/driver/converter/ItemStack.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.converter import java.util -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item import net.minecraft.item.Item diff --git a/src/main/scala/li/cil/oc/server/driver/item/AbstractBusCard.scala b/src/main/scala/li/cil/oc/server/driver/item/AbstractBusCard.scala index 98274dc95..4ff45a82b 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/AbstractBusCard.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/AbstractBusCard.scala @@ -13,7 +13,7 @@ object AbstractBusCard extends Item { isOneOf(stack, api.Items.get("abstractBusCard")) override def worksWith(stack: ItemStack, host: Class[_ <: EnvironmentHost]) = - super.worksWith(stack, host) && isComputer(host) + super.worksWith(stack, host) && isComputer(host) override def createEnvironment(stack: ItemStack, host: EnvironmentHost) = if (Mods.StargateTech2.isAvailable) host match { case device: IBusDevice => new component.AbstractBusCard(device) diff --git a/src/main/scala/li/cil/oc/server/driver/item/CPU.scala b/src/main/scala/li/cil/oc/server/driver/item/CPU.scala index 79982a36e..9cbe5f983 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/CPU.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/CPU.scala @@ -1,9 +1,13 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.api.{Machine, driver} -import li.cil.oc.common.{Slot, item} -import li.cil.oc.{Items, Settings, api} +import li.cil.oc.api.Machine +import li.cil.oc.api.driver +import li.cil.oc.common.Slot +import li.cil.oc.common.item +import li.cil.oc.Items +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack object CPU extends Item with driver.Processor { diff --git a/src/main/scala/li/cil/oc/server/driver/item/ComponentBus.scala b/src/main/scala/li/cil/oc/server/driver/item/ComponentBus.scala index c268ea5fa..a4eb2f7f4 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/ComponentBus.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/ComponentBus.scala @@ -2,8 +2,11 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, item} -import li.cil.oc.{Items, Settings, api} +import li.cil.oc.common.Slot +import li.cil.oc.common.item +import li.cil.oc.Items +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack object ComponentBus extends Item with driver.Processor { diff --git a/src/main/scala/li/cil/oc/server/driver/item/ComputerCraftMedia.scala b/src/main/scala/li/cil/oc/server/driver/item/ComputerCraftMedia.scala index 304813fdd..334a142ad 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/ComputerCraftMedia.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/ComputerCraftMedia.scala @@ -5,7 +5,8 @@ import li.cil.oc import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.fs.Label import li.cil.oc.common.Slot -import li.cil.oc.util.mods.{ComputerCraft, Mods} +import li.cil.oc.util.mods.ComputerCraft +import li.cil.oc.util.mods.Mods import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/driver/item/ContainerCard.scala b/src/main/scala/li/cil/oc/server/driver/item/ContainerCard.scala index 238911055..649c41683 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/ContainerCard.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/ContainerCard.scala @@ -1,8 +1,11 @@ package li.cil.oc.server.driver.item -import li.cil.oc.api.driver.{Container, EnvironmentHost} -import li.cil.oc.common.{Slot, item} -import li.cil.oc.{Items, api} +import li.cil.oc.api.driver.Container +import li.cil.oc.api.driver.EnvironmentHost +import li.cil.oc.common.Slot +import li.cil.oc.common.item +import li.cil.oc.Items +import li.cil.oc.api import net.minecraft.item.ItemStack object ContainerCard extends Item with Container { diff --git a/src/main/scala/li/cil/oc/server/driver/item/ContainerFloppy.scala b/src/main/scala/li/cil/oc/server/driver/item/ContainerFloppy.scala index a5c5e8778..99f6f999f 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/ContainerFloppy.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/ContainerFloppy.scala @@ -1,8 +1,10 @@ package li.cil.oc.server.driver.item import li.cil.oc.api -import li.cil.oc.api.driver.{Container, EnvironmentHost} -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.api.driver.Container +import li.cil.oc.api.driver.EnvironmentHost +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import net.minecraft.item.ItemStack object ContainerFloppy extends Item with Container { diff --git a/src/main/scala/li/cil/oc/server/driver/item/FileSystem.scala b/src/main/scala/li/cil/oc/server/driver/item/FileSystem.scala index 7aee5ab36..cdea1c422 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/FileSystem.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/FileSystem.scala @@ -3,9 +3,12 @@ package li.cil.oc.server.driver.item import li.cil.oc import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.common.Slot -import li.cil.oc.common.item.{FloppyDisk, HardDiskDrive} +import li.cil.oc.common.item.FloppyDisk +import li.cil.oc.common.item.HardDiskDrive import li.cil.oc.server.fs.FileSystem.ItemLabel -import li.cil.oc.{Items, Settings, api} +import li.cil.oc.Items +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/driver/item/GraphicsCard.scala b/src/main/scala/li/cil/oc/server/driver/item/GraphicsCard.scala index 2cf7665f5..73c36af82 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/GraphicsCard.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/GraphicsCard.scala @@ -3,7 +3,9 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.common.Slot import li.cil.oc.server.component -import li.cil.oc.{Items, api, common} +import li.cil.oc.Items +import li.cil.oc.api +import li.cil.oc.common import net.minecraft.item.ItemStack object GraphicsCard extends Item { diff --git a/src/main/scala/li/cil/oc/server/driver/item/InternetCard.scala b/src/main/scala/li/cil/oc/server/driver/item/InternetCard.scala index 7ee1c7feb..ad9f1f32e 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/InternetCard.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/InternetCard.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/Item.scala b/src/main/scala/li/cil/oc/server/driver/item/Item.scala index 2f2e63523..0ecb69dd5 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/Item.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/Item.scala @@ -2,8 +2,11 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Tier, item, tileentity} -import li.cil.oc.{Settings, api} +import li.cil.oc.common.Tier +import li.cil.oc.common.item +import li.cil.oc.common.tileentity +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/driver/item/LinkedCard.scala b/src/main/scala/li/cil/oc/server/driver/item/LinkedCard.scala index b08eefc71..39a3fc66d 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/LinkedCard.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/LinkedCard.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/Loot.scala b/src/main/scala/li/cil/oc/server/driver/item/Loot.scala index 6036b05a7..8cd8829d3 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/Loot.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/Loot.scala @@ -4,7 +4,9 @@ import java.io import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.common.Slot -import li.cil.oc.{OpenComputers, Settings, api} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraftforge.common.DimensionManager diff --git a/src/main/scala/li/cil/oc/server/driver/item/Memory.scala b/src/main/scala/li/cil/oc/server/driver/item/Memory.scala index e6c054f4b..0596f51ed 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/Memory.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/Memory.scala @@ -2,8 +2,11 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier, item} -import li.cil.oc.{Items, api} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier +import li.cil.oc.common.item +import li.cil.oc.Items +import li.cil.oc.api import net.minecraft.item.ItemStack object Memory extends Item with driver.Memory { diff --git a/src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala b/src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala index 15ccd48d8..2b37b642e 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala @@ -1,11 +1,16 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.tileentity.traits.{BundledRedstoneAware, RedstoneAware} -import li.cil.oc.common.{Slot, Tier, item} +import li.cil.oc.common.tileentity.traits.BundledRedstoneAware +import li.cil.oc.common.tileentity.traits.RedstoneAware +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier +import li.cil.oc.common.item import li.cil.oc.server.component -import li.cil.oc.util.mods.{BundledRedstone, WirelessRedstone} -import li.cil.oc.{Items, api} +import li.cil.oc.util.mods.BundledRedstone +import li.cil.oc.util.mods.WirelessRedstone +import li.cil.oc.Items +import li.cil.oc.api import net.minecraft.item.ItemStack object RedstoneCard extends Item { diff --git a/src/main/scala/li/cil/oc/server/driver/item/Screen.scala b/src/main/scala/li/cil/oc/server/driver/item/Screen.scala index 9e4e180ef..045241d4d 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/Screen.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/Screen.scala @@ -2,7 +2,9 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, component, tileentity} +import li.cil.oc.common.Slot +import li.cil.oc.common.component +import li.cil.oc.common.tileentity import net.minecraft.item.ItemStack object Screen extends Item { diff --git a/src/main/scala/li/cil/oc/server/driver/item/Tablet.scala b/src/main/scala/li/cil/oc/server/driver/item/Tablet.scala index 9dac11357..4d00a6bba 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/Tablet.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/Tablet.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.common.Slot import li.cil.oc.util.ItemUtils -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.Constants.NBT diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala index 92b33378b..52f2db4f0 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeBattery.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeBattery.scala index 51071a588..6e477edb4 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeBattery.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeBattery.scala @@ -1,9 +1,11 @@ package li.cil.oc.server.driver.item import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, item} +import li.cil.oc.common.Slot +import li.cil.oc.common.item import li.cil.oc.server.component -import li.cil.oc.{Items, api} +import li.cil.oc.Items +import li.cil.oc.api import net.minecraft.item.ItemStack object UpgradeBattery extends Item { diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeChunkloader.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeChunkloader.scala index 2ed216eb1..ec8b36fc2 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeChunkloader.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeChunkloader.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainer.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainer.scala index af6a3126a..55146a9d8 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainer.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainer.scala @@ -1,8 +1,11 @@ package li.cil.oc.server.driver.item -import li.cil.oc.api.driver.{Container, EnvironmentHost} -import li.cil.oc.common.{Slot, item} -import li.cil.oc.{Items, api} +import li.cil.oc.api.driver.Container +import li.cil.oc.api.driver.EnvironmentHost +import li.cil.oc.common.Slot +import li.cil.oc.common.item +import li.cil.oc.Items +import li.cil.oc.api import net.minecraft.item.ItemStack object UpgradeContainer extends Item with Container { diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeCrafting.scala index 2fd2c0e51..7065dfa81 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeCrafting.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeCrafting.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.tileentity.Robot -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeExperience.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeExperience.scala index 29e3c4e67..60004ded0 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeExperience.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeExperience.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeGenerator.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeGenerator.scala index 11bd0e26e..407fcda5a 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeGenerator.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeGenerator.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.tileentity.Robot -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventory.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventory.scala index b2446f43a..1468f52f8 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventory.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventory.scala @@ -1,7 +1,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api -import li.cil.oc.api.driver.{EnvironmentHost, Inventory} +import li.cil.oc.api.driver.EnvironmentHost +import li.cil.oc.api.driver.Inventory import li.cil.oc.common.Slot import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventoryController.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventoryController.scala index 3270458ce..7d5fc1245 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventoryController.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeInventoryController.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.tileentity.Robot -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeNavigation.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeNavigation.scala index 527db73e7..a7f5e5332 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeNavigation.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeNavigation.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.tileentity.Rotatable -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala index 039d35810..98ea01b9a 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeTankController.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeTankController.scala index 7696a7ba0..e43bb6b29 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeTankController.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeTankController.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.common.tileentity.Robot -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeTractorBeam.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeTractorBeam.scala index a3d1be423..cd377f28f 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeTractorBeam.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeTractorBeam.scala @@ -4,7 +4,8 @@ import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.tileentity.Robot import li.cil.oc.common.item.TabletWrapper -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/driver/item/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/driver/item/WirelessNetworkCard.scala index 164942864..80e01e7c4 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/WirelessNetworkCard.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/WirelessNetworkCard.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.driver.item import li.cil.oc.api import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.common.{Slot, Tier} +import li.cil.oc.common.Slot +import li.cil.oc.common.Tier import li.cil.oc.server.component import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala index ee0d4d829..4cbde8c0a 100644 --- a/src/main/scala/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala @@ -1,6 +1,7 @@ package li.cil.oc.server.fs -import java.io.{IOException, OutputStream} +import java.io.IOException +import java.io.OutputStream import dan200.computercraft.api.filesystem.IWritableMount import li.cil.oc.api.fs.Mode diff --git a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala index 6050b59b4..8c343929f 100644 --- a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala @@ -5,10 +5,14 @@ import java.net.URL import java.util.UUID import li.cil.oc.api.driver.EnvironmentHost -import li.cil.oc.api.fs.{Label, Mode} +import li.cil.oc.api.fs.Label +import li.cil.oc.api.fs.Mode import li.cil.oc.server.component -import li.cil.oc.util.mods.{ComputerCraft, Mods} -import li.cil.oc.{OpenComputers, Settings, api} +import li.cil.oc.util.mods.ComputerCraft +import li.cil.oc.util.mods.Mods +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.DimensionManager diff --git a/src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala index bcadd37e0..82125ee33 100644 --- a/src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala @@ -1,12 +1,14 @@ package li.cil.oc.server.fs -import java.io.{FileNotFoundException, IOException} +import java.io.FileNotFoundException +import java.io.IOException import java.nio.ByteBuffer import java.nio.channels.ReadableByteChannel import li.cil.oc.api import li.cil.oc.api.fs.Mode -import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList import net.minecraftforge.common.util.Constants.NBT import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/server/fs/OutputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/OutputStreamFileSystem.scala index 3ce379715..d6de4d06c 100644 --- a/src/main/scala/li/cil/oc/server/fs/OutputStreamFileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/OutputStreamFileSystem.scala @@ -1,10 +1,12 @@ package li.cil.oc.server.fs -import java.io.{FileNotFoundException, IOException} +import java.io.FileNotFoundException +import java.io.IOException import li.cil.oc.api import li.cil.oc.api.fs.Mode -import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList import net.minecraftforge.common.util.Constants.NBT import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/server/fs/VirtualFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/VirtualFileSystem.scala index e2a4a09a4..5ff070548 100644 --- a/src/main/scala/li/cil/oc/server/fs/VirtualFileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/VirtualFileSystem.scala @@ -4,7 +4,8 @@ import java.io import java.io.FileNotFoundException import li.cil.oc.api.fs.Mode -import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList import net.minecraftforge.common.util.Constants.NBT import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala index 8305238bd..991c419ae 100644 --- a/src/main/scala/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala @@ -3,11 +3,13 @@ package li.cil.oc.server.fs import java.io import java.io.ByteArrayInputStream import java.util.concurrent.Callable -import java.util.zip.{ZipEntry, ZipFile} +import java.util.zip.ZipEntry +import java.util.zip.ZipFile import com.google.common.cache.CacheBuilder import li.cil.oc.OpenComputers -import li.cil.oc.server.fs.ZipFileInputStreamFileSystem.{ArchiveDirectory, ArchiveFile} +import li.cil.oc.server.fs.ZipFileInputStreamFileSystem.ArchiveDirectory +import li.cil.oc.server.fs.ZipFileInputStreamFileSystem.ArchiveFile import scala.collection.mutable import scala.language.postfixOps diff --git a/src/main/scala/li/cil/oc/server/machine/Callbacks.scala b/src/main/scala/li/cil/oc/server/machine/Callbacks.scala index e264b2bb8..4d0827738 100644 --- a/src/main/scala/li/cil/oc/server/machine/Callbacks.scala +++ b/src/main/scala/li/cil/oc/server/machine/Callbacks.scala @@ -1,16 +1,20 @@ package li.cil.oc.server.machine -import java.lang.reflect.{InvocationTargetException, Method, Modifier} +import java.lang.reflect.InvocationTargetException +import java.lang.reflect.Method +import java.lang.reflect.Modifier import li.cil.oc.OpenComputers import li.cil.oc.api.driver.MethodWhitelist import li.cil.oc.api.machine -import li.cil.oc.api.machine.{Arguments, Context} +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Context import li.cil.oc.api.network.ManagedPeripheral import li.cil.oc.api.tileentity.Robot import li.cil.oc.server.driver.CompoundBlockEnvironment -import scala.collection.{immutable, mutable} +import scala.collection.immutable +import scala.collection.mutable object Callbacks { private val cache = mutable.Map.empty[Class[_], immutable.Map[String, Callback]] diff --git a/src/main/scala/li/cil/oc/server/machine/luac/NativeLuaArchitecture.scala b/src/main/scala/li/cil/oc/server/machine/luac/NativeLuaArchitecture.scala index 832e24184..66bc22b04 100644 --- a/src/main/scala/li/cil/oc/server/machine/luac/NativeLuaArchitecture.scala +++ b/src/main/scala/li/cil/oc/server/machine/luac/NativeLuaArchitecture.scala @@ -1,14 +1,19 @@ package li.cil.oc.server.machine.luac -import java.io.{FileNotFoundException, IOException} +import java.io.FileNotFoundException +import java.io.IOException import com.google.common.base.Strings -import li.cil.oc.api.machine.{Architecture, ExecutionResult, LimitReachedException} +import li.cil.oc.api.machine.Architecture +import li.cil.oc.api.machine.ExecutionResult +import li.cil.oc.api.machine.LimitReachedException import li.cil.oc.common.SaveHandler import li.cil.oc.server.machine.Machine import li.cil.oc.util.ExtendedLuaState.extendLuaState import li.cil.oc.util.LuaStateFactory -import li.cil.oc.{OpenComputers, Settings, api} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api import li.cil.repack.com.naef.jnlua._ import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/machine/luac/UserdataAPI.scala b/src/main/scala/li/cil/oc/server/machine/luac/UserdataAPI.scala index 63f62226e..a03450ed6 100644 --- a/src/main/scala/li/cil/oc/server/machine/luac/UserdataAPI.scala +++ b/src/main/scala/li/cil/oc/server/machine/luac/UserdataAPI.scala @@ -1,13 +1,18 @@ package li.cil.oc.server.machine.luac -import java.io.{ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, DataOutputStream} +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream +import java.io.DataInputStream +import java.io.DataOutputStream import li.cil.oc.OpenComputers import li.cil.oc.api.Persistable import li.cil.oc.api.machine.Value -import li.cil.oc.server.machine.{ArgumentsImpl, Callbacks} +import li.cil.oc.server.machine.ArgumentsImpl +import li.cil.oc.server.machine.Callbacks import li.cil.oc.util.ExtendedLuaState.extendLuaState -import net.minecraft.nbt.{CompressedStreamTools, NBTTagCompound} +import net.minecraft.nbt.CompressedStreamTools +import net.minecraft.nbt.NBTTagCompound class UserdataAPI(owner: NativeLuaArchitecture) extends NativeLuaAPI(owner) { def initialize() { diff --git a/src/main/scala/li/cil/oc/server/machine/luaj/ComponentAPI.scala b/src/main/scala/li/cil/oc/server/machine/luaj/ComponentAPI.scala index bb773ad32..e185e8876 100644 --- a/src/main/scala/li/cil/oc/server/machine/luaj/ComponentAPI.scala +++ b/src/main/scala/li/cil/oc/server/machine/luaj/ComponentAPI.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.machine.luaj import li.cil.oc.server import li.cil.oc.util.ScalaClosure._ -import li.cil.repack.org.luaj.vm2.{LuaValue, Varargs} +import li.cil.repack.org.luaj.vm2.LuaValue +import li.cil.repack.org.luaj.vm2.Varargs import scala.collection.convert.WrapAsScala._ diff --git a/src/main/scala/li/cil/oc/server/machine/luaj/ComputerAPI.scala b/src/main/scala/li/cil/oc/server/machine/luaj/ComputerAPI.scala index d4ed9a00f..30b551660 100644 --- a/src/main/scala/li/cil/oc/server/machine/luaj/ComputerAPI.scala +++ b/src/main/scala/li/cil/oc/server/machine/luaj/ComputerAPI.scala @@ -3,7 +3,8 @@ package li.cil.oc.server.machine.luaj import li.cil.oc.Settings import li.cil.oc.api.network.Connector import li.cil.oc.util.ScalaClosure._ -import li.cil.repack.org.luaj.vm2.{LuaValue, Varargs} +import li.cil.repack.org.luaj.vm2.LuaValue +import li.cil.repack.org.luaj.vm2.Varargs class ComputerAPI(owner: LuaJLuaArchitecture) extends LuaJAPI(owner) { override def initialize() { diff --git a/src/main/scala/li/cil/oc/server/machine/luaj/LuaJLuaArchitecture.scala b/src/main/scala/li/cil/oc/server/machine/luaj/LuaJLuaArchitecture.scala index a2cd9d949..beeed8d38 100644 --- a/src/main/scala/li/cil/oc/server/machine/luaj/LuaJLuaArchitecture.scala +++ b/src/main/scala/li/cil/oc/server/machine/luaj/LuaJLuaArchitecture.scala @@ -1,13 +1,18 @@ package li.cil.oc.server.machine.luaj -import java.io.{FileNotFoundException, IOException} +import java.io.FileNotFoundException +import java.io.IOException import com.google.common.base.Strings -import li.cil.oc.api.machine.{Architecture, ExecutionResult, LimitReachedException} +import li.cil.oc.api.machine.Architecture +import li.cil.oc.api.machine.ExecutionResult +import li.cil.oc.api.machine.LimitReachedException import li.cil.oc.server.machine.Machine import li.cil.oc.util.ScalaClosure import li.cil.oc.util.ScalaClosure._ -import li.cil.oc.{OpenComputers, Settings, api} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api import li.cil.repack.org.luaj.vm2._ import li.cil.repack.org.luaj.vm2.lib.jse.JsePlatform import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/machine/luaj/OSAPI.scala b/src/main/scala/li/cil/oc/server/machine/luaj/OSAPI.scala index 569a02441..439e74057 100644 --- a/src/main/scala/li/cil/oc/server/machine/luaj/OSAPI.scala +++ b/src/main/scala/li/cil/oc/server/machine/luaj/OSAPI.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.machine.luaj import li.cil.oc.util.GameTimeFormatter import li.cil.oc.util.ScalaClosure._ -import li.cil.repack.org.luaj.vm2.{LuaValue, Varargs} +import li.cil.repack.org.luaj.vm2.LuaValue +import li.cil.repack.org.luaj.vm2.Varargs class OSAPI(owner: LuaJLuaArchitecture) extends LuaJAPI(owner) { override def initialize() { diff --git a/src/main/scala/li/cil/oc/server/machine/luaj/SystemAPI.scala b/src/main/scala/li/cil/oc/server/machine/luaj/SystemAPI.scala index 31984a7a9..540b96282 100644 --- a/src/main/scala/li/cil/oc/server/machine/luaj/SystemAPI.scala +++ b/src/main/scala/li/cil/oc/server/machine/luaj/SystemAPI.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.machine.luaj import li.cil.oc.Settings import li.cil.oc.util.ScalaClosure._ -import li.cil.repack.org.luaj.vm2.{LuaValue, Varargs} +import li.cil.repack.org.luaj.vm2.LuaValue +import li.cil.repack.org.luaj.vm2.Varargs class SystemAPI(owner: LuaJLuaArchitecture) extends LuaJAPI(owner) { override def initialize() { diff --git a/src/main/scala/li/cil/oc/server/machine/luaj/UnicodeAPI.scala b/src/main/scala/li/cil/oc/server/machine/luaj/UnicodeAPI.scala index 8e2c1afdc..fc876c1d8 100644 --- a/src/main/scala/li/cil/oc/server/machine/luaj/UnicodeAPI.scala +++ b/src/main/scala/li/cil/oc/server/machine/luaj/UnicodeAPI.scala @@ -2,7 +2,8 @@ package li.cil.oc.server.machine.luaj import li.cil.oc.util.FontUtil import li.cil.oc.util.ScalaClosure._ -import li.cil.repack.org.luaj.vm2.{LuaValue, Varargs} +import li.cil.repack.org.luaj.vm2.LuaValue +import li.cil.repack.org.luaj.vm2.Varargs class UnicodeAPI(owner: LuaJLuaArchitecture) extends LuaJAPI(owner) { override def initialize() { diff --git a/src/main/scala/li/cil/oc/server/machine/luaj/UserdataAPI.scala b/src/main/scala/li/cil/oc/server/machine/luaj/UserdataAPI.scala index c3bdf4f4b..003b28066 100644 --- a/src/main/scala/li/cil/oc/server/machine/luaj/UserdataAPI.scala +++ b/src/main/scala/li/cil/oc/server/machine/luaj/UserdataAPI.scala @@ -2,9 +2,11 @@ package li.cil.oc.server.machine.luaj import li.cil.oc.OpenComputers import li.cil.oc.api.machine.Value -import li.cil.oc.server.machine.{ArgumentsImpl, Callbacks} +import li.cil.oc.server.machine.ArgumentsImpl +import li.cil.oc.server.machine.Callbacks import li.cil.oc.util.ScalaClosure._ -import li.cil.repack.org.luaj.vm2.{LuaValue, Varargs} +import li.cil.repack.org.luaj.vm2.LuaValue +import li.cil.repack.org.luaj.vm2.Varargs class UserdataAPI(owner: LuaJLuaArchitecture) extends LuaJAPI(owner) { override def initialize() { diff --git a/src/main/scala/li/cil/oc/server/network/Component.scala b/src/main/scala/li/cil/oc/server/network/Component.scala index c0b7d654f..745e8d54b 100644 --- a/src/main/scala/li/cil/oc/server/network/Component.scala +++ b/src/main/scala/li/cil/oc/server/network/Component.scala @@ -2,10 +2,15 @@ package li.cil.oc.server.network import li.cil.oc.api.machine.Context import li.cil.oc.api.network -import li.cil.oc.api.network.{Node => ImmutableNode, _} -import li.cil.oc.server.driver.{CompoundBlockEnvironment, Registry} -import li.cil.oc.server.machine.Callbacks.{ComponentCallback, PeripheralCallback} -import li.cil.oc.server.machine.{ArgumentsImpl, Callbacks, Machine} +import li.cil.oc.api.network.{Node => ImmutableNode} +import li.cil.oc.api.network._ +import li.cil.oc.server.driver.CompoundBlockEnvironment +import li.cil.oc.server.driver.Registry +import li.cil.oc.server.machine.Callbacks.ComponentCallback +import li.cil.oc.server.machine.Callbacks.PeripheralCallback +import li.cil.oc.server.machine.ArgumentsImpl +import li.cil.oc.server.machine.Callbacks +import li.cil.oc.server.machine.Machine import li.cil.oc.util.SideTracker import net.minecraft.nbt.NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/network/Network.scala b/src/main/scala/li/cil/oc/server/network/Network.scala index ce334fdb1..4dc1e527a 100644 --- a/src/main/scala/li/cil/oc/server/network/Network.scala +++ b/src/main/scala/li/cil/oc/server/network/Network.scala @@ -1,17 +1,26 @@ package li.cil.oc.server.network import codechicken.lib.vec.Cuboid6 -import codechicken.multipart.{JNormalOcclusion, NormalOcclusionTest, TFacePart, TileMultipart} +import codechicken.multipart.JNormalOcclusion +import codechicken.multipart.NormalOcclusionTest +import codechicken.multipart.TFacePart +import codechicken.multipart.TileMultipart import li.cil.oc.api.network -import li.cil.oc.api.network.{Environment, Visibility, WirelessEndpoint, Node => ImmutableNode} +import li.cil.oc.api.network.Environment +import li.cil.oc.api.network.Visibility +import li.cil.oc.api.network.WirelessEndpoint +import li.cil.oc.api.network.{Node => ImmutableNode} import li.cil.oc.api.tileentity.SidedEnvironment import li.cil.oc.common.block.Cable import li.cil.oc.common.multipart.CablePart import li.cil.oc.common.tileentity import li.cil.oc.server.network.{Node => MutableNode} import li.cil.oc.util.mods.Mods -import li.cil.oc.util.{Color, SideTracker} -import li.cil.oc.{OpenComputers, Settings, api} +import li.cil.oc.util.Color +import li.cil.oc.util.SideTracker +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.nbt._ import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection diff --git a/src/main/scala/li/cil/oc/server/network/Node.scala b/src/main/scala/li/cil/oc/server/network/Node.scala index 4ed9922d8..12da4f88f 100644 --- a/src/main/scala/li/cil/oc/server/network/Node.scala +++ b/src/main/scala/li/cil/oc/server/network/Node.scala @@ -1,7 +1,10 @@ package li.cil.oc.server.network -import li.cil.oc.api.network.{Environment, Visibility, Node => ImmutableNode} -import li.cil.oc.{OpenComputers, api} +import li.cil.oc.api.network.Environment +import li.cil.oc.api.network.Visibility +import li.cil.oc.api.network.{Node => ImmutableNode} +import li.cil.oc.OpenComputers +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound import scala.collection.convert.WrapAsJava._ diff --git a/src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala b/src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala index e45a5d659..27b51ea70 100644 --- a/src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala +++ b/src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala @@ -5,7 +5,8 @@ import li.cil.oc.Settings import li.cil.oc.api.network.WirelessEndpoint import li.cil.oc.util.RTree import net.minecraft.util.Vec3 -import net.minecraftforge.event.world.{ChunkEvent, WorldEvent} +import net.minecraftforge.event.world.ChunkEvent +import net.minecraftforge.event.world.WorldEvent import scala.collection.convert.WrapAsScala._ import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/util/Audio.scala b/src/main/scala/li/cil/oc/util/Audio.scala index f500eb995..c5ff61813 100644 --- a/src/main/scala/li/cil/oc/util/Audio.scala +++ b/src/main/scala/li/cil/oc/util/Audio.scala @@ -9,7 +9,9 @@ import li.cil.oc.OpenComputers import net.minecraft.client.Minecraft import net.minecraft.client.audio.SoundCategory import org.lwjgl.BufferUtils -import org.lwjgl.openal.{AL, AL10, Util} +import org.lwjgl.openal.AL +import org.lwjgl.openal.AL10 +import org.lwjgl.openal.Util import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/util/ExtendedLuaState.scala b/src/main/scala/li/cil/oc/util/ExtendedLuaState.scala index 7a47a033e..2a4ae85ac 100644 --- a/src/main/scala/li/cil/oc/util/ExtendedLuaState.scala +++ b/src/main/scala/li/cil/oc/util/ExtendedLuaState.scala @@ -2,9 +2,12 @@ package li.cil.oc.util import java.util -import li.cil.repack.com.naef.jnlua.{JavaFunction, LuaState, LuaType} import li.cil.oc.api.machine.Value -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.repack.com.naef.jnlua.JavaFunction +import li.cil.repack.com.naef.jnlua.LuaState +import li.cil.repack.com.naef.jnlua.LuaType import scala.collection.convert.WrapAsScala._ import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/util/InventoryUtils.scala b/src/main/scala/li/cil/oc/util/InventoryUtils.scala index d4409a888..6e1a316e2 100644 --- a/src/main/scala/li/cil/oc/util/InventoryUtils.scala +++ b/src/main/scala/li/cil/oc/util/InventoryUtils.scala @@ -1,7 +1,8 @@ package li.cil.oc.util import net.minecraft.entity.item.EntityMinecartContainer -import net.minecraft.inventory.{IInventory, ISidedInventory} +import net.minecraft.inventory.IInventory +import net.minecraft.inventory.ISidedInventory import net.minecraft.item.ItemStack import net.minecraft.tileentity.TileEntityChest import net.minecraft.util.AxisAlignedBB diff --git a/src/main/scala/li/cil/oc/util/ItemCosts.scala b/src/main/scala/li/cil/oc/util/ItemCosts.scala index e7a8de2df..ad18f5e7d 100644 --- a/src/main/scala/li/cil/oc/util/ItemCosts.scala +++ b/src/main/scala/li/cil/oc/util/ItemCosts.scala @@ -5,10 +5,14 @@ import java.util import li.cil.oc.Localization import li.cil.oc.util.mods.Mods import net.minecraft.block.Block -import net.minecraft.init.{Blocks, Items} +import net.minecraft.init.Blocks +import net.minecraft.init.Items import net.minecraft.item.crafting._ -import net.minecraft.item.{Item, ItemStack} -import net.minecraftforge.oredict.{OreDictionary, ShapedOreRecipe, ShapelessOreRecipe} +import net.minecraft.item.Item +import net.minecraft.item.ItemStack +import net.minecraftforge.oredict.OreDictionary +import net.minecraftforge.oredict.ShapedOreRecipe +import net.minecraftforge.oredict.ShapelessOreRecipe import scala.collection.convert.WrapAsScala._ import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/util/ItemUtils.scala b/src/main/scala/li/cil/oc/util/ItemUtils.scala index f8b8ccf45..224657e24 100644 --- a/src/main/scala/li/cil/oc/util/ItemUtils.scala +++ b/src/main/scala/li/cil/oc/util/ItemUtils.scala @@ -1,11 +1,17 @@ package li.cil.oc.util -import com.google.common.base.{Charsets, Strings} +import com.google.common.base.Charsets +import com.google.common.base.Strings import li.cil.oc.api.Persistable import li.cil.oc.common.Tier import li.cil.oc.util.ExtendedNBT._ -import li.cil.oc.{Blocks, OpenComputers, Settings, api, server} -import net.minecraft.item.{ItemMap, ItemStack} +import li.cil.oc.Blocks +import li.cil.oc.OpenComputers +import li.cil.oc.Settings +import li.cil.oc.api +import li.cil.oc.server +import net.minecraft.item.ItemMap +import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.world.World import net.minecraftforge.common.util.Constants.NBT diff --git a/src/main/scala/li/cil/oc/util/LuaStateFactory.scala b/src/main/scala/li/cil/oc/util/LuaStateFactory.scala index 72bce1fca..81fc66684 100644 --- a/src/main/scala/li/cil/oc/util/LuaStateFactory.scala +++ b/src/main/scala/li/cil/oc/util/LuaStateFactory.scala @@ -1,12 +1,15 @@ package li.cil.oc.util -import java.io.{File, FileInputStream, FileOutputStream} +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream import java.nio.channels.Channels import com.google.common.base.Strings import li.cil.oc.server.machine.Machine import li.cil.oc.util.ExtendedLuaState._ -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import li.cil.repack.com.naef.jnlua import li.cil.repack.com.naef.jnlua.LuaState import li.cil.repack.com.naef.jnlua.NativeSupport.Loader diff --git a/src/main/scala/li/cil/oc/util/RenderState.scala b/src/main/scala/li/cil/oc/util/RenderState.scala index cb41ff011..4a52b74fc 100644 --- a/src/main/scala/li/cil/oc/util/RenderState.scala +++ b/src/main/scala/li/cil/oc/util/RenderState.scala @@ -1,6 +1,7 @@ package li.cil.oc.util -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import net.minecraft.client.renderer.OpenGlHelper import org.lwjgl.opengl._ import org.lwjgl.util.glu.GLU diff --git a/src/main/scala/li/cil/oc/util/ScalaClosure.scala b/src/main/scala/li/cil/oc/util/ScalaClosure.scala index 5f35081f3..3a3d8544c 100644 --- a/src/main/scala/li/cil/oc/util/ScalaClosure.scala +++ b/src/main/scala/li/cil/oc/util/ScalaClosure.scala @@ -1,9 +1,11 @@ package li.cil.oc.util import li.cil.oc.api.machine.Value -import li.cil.oc.{OpenComputers, Settings} +import li.cil.oc.OpenComputers +import li.cil.oc.Settings import li.cil.repack.org.luaj.vm2.lib.VarArgFunction -import li.cil.repack.org.luaj.vm2.{LuaValue, Varargs} +import li.cil.repack.org.luaj.vm2.LuaValue +import li.cil.repack.org.luaj.vm2.Varargs import scala.collection.convert.WrapAsScala._ import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/util/ThreadPoolFactory.scala b/src/main/scala/li/cil/oc/util/ThreadPoolFactory.scala index 0af7483de..684561c7a 100644 --- a/src/main/scala/li/cil/oc/util/ThreadPoolFactory.scala +++ b/src/main/scala/li/cil/oc/util/ThreadPoolFactory.scala @@ -1,7 +1,8 @@ package li.cil.oc.util import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.{Executors, ThreadFactory} +import java.util.concurrent.Executors +import java.util.concurrent.ThreadFactory object ThreadPoolFactory { val priority = Thread.MIN_PRIORITY + (Thread.NORM_PRIORITY - Thread.MIN_PRIORITY) / 2 diff --git a/src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala b/src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala index 663615818..0af508b9f 100644 --- a/src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala +++ b/src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala @@ -1,13 +1,17 @@ package li.cil.oc.util.mods import dan200.computercraft.api.ComputerCraftAPI -import dan200.computercraft.api.filesystem.{IMount, IWritableMount} +import dan200.computercraft.api.filesystem.IMount +import dan200.computercraft.api.filesystem.IWritableMount import dan200.computercraft.api.lua.ILuaContext import dan200.computercraft.api.media.IMedia -import dan200.computercraft.api.peripheral.{IComputerAccess, IPeripheral, IPeripheralProvider} +import dan200.computercraft.api.peripheral.IComputerAccess +import dan200.computercraft.api.peripheral.IPeripheral +import dan200.computercraft.api.peripheral.IPeripheralProvider import li.cil.oc import li.cil.oc.common.tileentity.Switch -import li.cil.oc.server.fs.{ComputerCraftFileSystem, ComputerCraftWritableFileSystem} +import li.cil.oc.server.fs.ComputerCraftFileSystem +import li.cil.oc.server.fs.ComputerCraftWritableFileSystem import net.minecraft.item.ItemStack import net.minecraft.world.World diff --git a/src/main/scala/li/cil/oc/util/mods/Mods.scala b/src/main/scala/li/cil/oc/util/mods/Mods.scala index d7ac30d80..f974a7a07 100644 --- a/src/main/scala/li/cil/oc/util/mods/Mods.scala +++ b/src/main/scala/li/cil/oc/util/mods/Mods.scala @@ -1,7 +1,8 @@ package li.cil.oc.util.mods import cpw.mods.fml.common.versioning.VersionParser -import cpw.mods.fml.common.{Loader, ModAPIManager} +import cpw.mods.fml.common.Loader +import cpw.mods.fml.common.ModAPIManager import li.cil.oc.Settings import scala.collection.mutable diff --git a/src/main/scala/li/cil/oc/util/mods/StargateTech2.scala b/src/main/scala/li/cil/oc/util/mods/StargateTech2.scala index afc36eee9..2c1851561 100644 --- a/src/main/scala/li/cil/oc/util/mods/StargateTech2.scala +++ b/src/main/scala/li/cil/oc/util/mods/StargateTech2.scala @@ -2,7 +2,8 @@ package li.cil.oc.util.mods import net.minecraft.world.World import net.minecraftforge.common.MinecraftForge -import stargatetech2.api.bus.BusEvent.{AddToNetwork, RemoveFromNetwork} +import stargatetech2.api.bus.BusEvent.AddToNetwork +import stargatetech2.api.bus.BusEvent.RemoveFromNetwork object StargateTech2 { def addDevice(world: World, x: Int, y: Int, z: Int) = MinecraftForge.EVENT_BUS.post(new AddToNetwork(world, x, y, z)) diff --git a/src/main/scala/li/cil/oc/util/mods/Waila.scala b/src/main/scala/li/cil/oc/util/mods/Waila.scala index 126fcfa19..cd8ef5cbc 100644 --- a/src/main/scala/li/cil/oc/util/mods/Waila.scala +++ b/src/main/scala/li/cil/oc/util/mods/Waila.scala @@ -5,8 +5,12 @@ import java.util import cpw.mods.fml.common.Optional import li.cil.oc.common.block._ import li.cil.oc.common.tileentity -import li.cil.oc.{Localization, Settings} -import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor, IWailaDataProvider, IWailaRegistrar} +import li.cil.oc.Localization +import li.cil.oc.Settings +import mcp.mobius.waila.api.IWailaConfigHandler +import mcp.mobius.waila.api.IWailaDataAccessor +import mcp.mobius.waila.api.IWailaDataProvider +import mcp.mobius.waila.api.IWailaRegistrar import net.minecraft.item.ItemStack import net.minecraftforge.common.util.Constants.NBT diff --git a/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneCBE.scala b/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneCBE.scala index 0e07fa7e8..22808050c 100644 --- a/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneCBE.scala +++ b/src/main/scala/li/cil/oc/util/mods/WirelessRedstoneCBE.scala @@ -1,6 +1,7 @@ package li.cil.oc.util.mods -import codechicken.wirelessredstone.core.{WirelessReceivingDevice, WirelessTransmittingDevice} +import codechicken.wirelessredstone.core.WirelessReceivingDevice +import codechicken.wirelessredstone.core.WirelessTransmittingDevice import li.cil.oc.server.component.RedstoneWireless import scala.language.reflectiveCalls