More formatting and organize imports.

This commit is contained in:
Florian Nücke 2014-06-11 17:46:10 +02:00
parent a8de31b577
commit 1078cd9548
17 changed files with 117 additions and 119 deletions

View File

@ -310,4 +310,5 @@ object Settings {
def apply(inetAddress: InetAddress, host: String) = validator(inetAddress, host) def apply(inetAddress: InetAddress, host: String) = validator(inetAddress, host)
} }
} }

View File

@ -9,7 +9,6 @@ import li.cil.oc.common.tileentity._
import li.cil.oc.common.tileentity.traits._ import li.cil.oc.common.tileentity.traits._
import li.cil.oc.util.Audio import li.cil.oc.util.Audio
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.util.PackedColor
import net.minecraft.client.gui.GuiScreen import net.minecraft.client.gui.GuiScreen
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer

View File

@ -7,7 +7,6 @@ import li.cil.oc.{Settings, api}
import net.minecraft.client.gui.ScaledResolution import net.minecraft.client.gui.ScaledResolution
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
import net.minecraft.client.renderer.entity.{RenderManager, RenderItem} import net.minecraft.client.renderer.entity.{RenderManager, RenderItem}
import net.minecraft.client.renderer.Tessellator
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.util.{EnumChatFormatting, AxisAlignedBB} import net.minecraft.util.{EnumChatFormatting, AxisAlignedBB}
import net.minecraftforge.client.IItemRenderer import net.minecraftforge.client.IItemRenderer

View File

@ -1,6 +1,5 @@
package li.cil.oc.client.renderer.tileentity package li.cil.oc.client.renderer.tileentity
import li.cil.oc.client.Textures
import li.cil.oc.common.tileentity import li.cil.oc.common.tileentity
import li.cil.oc.util.RenderState import li.cil.oc.util.RenderState
import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.Tessellator

View File

@ -73,6 +73,7 @@ abstract class Hologram(val parent: SpecialDelegator) extends SpecialDelegate {
} }
object Hologram { object Hologram {
class Tier1(parent: SpecialDelegator) extends Hologram(parent) { class Tier1(parent: SpecialDelegator) extends Hologram(parent) {
def tier = 0 def tier = 0
} }
@ -80,4 +81,5 @@ object Hologram {
class Tier2(parent: SpecialDelegator) extends Hologram(parent) { class Tier2(parent: SpecialDelegator) extends Hologram(parent) {
def tier = 1 def tier = 1
} }
} }

View File

@ -9,7 +9,7 @@ import li.cil.oc.common.tileentity
import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.{Items, Settings} import li.cil.oc.{Items, Settings}
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.nbt.{NBTTagString, NBTTagCompound} import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.Constants.NBT
import scala.collection.mutable import scala.collection.mutable

View File

@ -8,7 +8,7 @@ import li.cil.oc.Settings
import li.cil.oc.util.{Rarity, ItemCosts} import li.cil.oc.util.{Rarity, ItemCosts}
import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{EnumRarity, ItemStack} import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon import net.minecraft.util.IIcon
import net.minecraft.util.StatCollector import net.minecraft.util.StatCollector
import net.minecraft.world.World import net.minecraft.world.World

View File

@ -3,7 +3,6 @@ package li.cil.oc.common.tileentity
import li.cil.oc.api.Driver import li.cil.oc.api.Driver
import li.cil.oc.api.driver.Slot import li.cil.oc.api.driver.Slot
import li.cil.oc.api.network.{Analyzable, Component, Visibility} import li.cil.oc.api.network.{Analyzable, Component, Visibility}
import li.cil.oc.common.EventHandler
import li.cil.oc.common.Sound import li.cil.oc.common.Sound
import li.cil.oc.{api, Settings} import li.cil.oc.{api, Settings}
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer

View File

@ -11,7 +11,7 @@ import li.cil.oc.common
import li.cil.oc.server.{PacketSender => ServerPacketSender, driver, component} import li.cil.oc.server.{PacketSender => ServerPacketSender, driver, component}
import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.util.mods.Waila import li.cil.oc.util.mods.Waila
import li.cil.oc.{api, Items, Settings} import li.cil.oc.{api, Settings}
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.nbt.{NBTTagString, NBTTagCompound} import net.minecraft.nbt.{NBTTagString, NBTTagCompound}

View File

@ -8,7 +8,6 @@ import li.cil.oc.common.{PacketHandler => CommonPacketHandler}
import li.cil.oc.common.PacketType import li.cil.oc.common.PacketType
import li.cil.oc.common.multipart.EventHandler import li.cil.oc.common.multipart.EventHandler
import li.cil.oc.common.tileentity._ import li.cil.oc.common.tileentity._
import li.cil.oc.common.tileentity.traits.TileEntity
import li.cil.oc.common.{PacketHandler => CommonPacketHandler} import li.cil.oc.common.{PacketHandler => CommonPacketHandler}
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.common.tileentity.traits.{Computer, TileEntity} import li.cil.oc.common.tileentity.traits.{Computer, TileEntity}

View File

@ -95,7 +95,7 @@ class OSAPI(owner: NativeLuaArchitecture) extends NativeLuaAPI(owner) {
val year = getField("year", -1) val year = getField("year", -1)
GameTimeFormatter.mktime(year, mon, mday, hour, min, sec) match { GameTimeFormatter.mktime(year, mon, mday, hour, min, sec) match {
case Some(time) =>lua.pushNumber(time) case Some(time) => lua.pushNumber(time)
case _ => lua.pushNil() case _ => lua.pushNil()
} }
} }