AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-28 15:30:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

More formatting and organize imports.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/li/cil/oc/Settings.scala
View File

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

1
src/main/scala/li/cil/oc/client/PacketHandler.scala
View File

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

1
src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
View File

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

1
src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
View File

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

2
src/main/scala/li/cil/oc/common/block/Hologram.scala
View File

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

2
src/main/scala/li/cil/oc/common/component/Terminal.scala
View File

@ -9,7 +9,7 @@ import li.cil.oc.common.tileentity
import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.{Items, Settings}
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 scala.collection.mutable

2
src/main/scala/li/cil/oc/common/item/Delegate.scala
View File

@ -8,7 +8,7 @@ import li.cil.oc.Settings
import li.cil.oc.util.{Rarity, ItemCosts}
import net.minecraft.client.renderer.texture.IIconRegister
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.StatCollector
import net.minecraft.world.World

1
src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
View File

@ -3,7 +3,6 @@ package li.cil.oc.common.tileentity
import li.cil.oc.api.Driver
import li.cil.oc.api.driver.Slot
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.{api, Settings}
import net.minecraft.entity.player.EntityPlayer

2
src/main/scala/li/cil/oc/common/tileentity/Rack.scala
View File

@ -11,7 +11,7 @@ import li.cil.oc.common
import li.cil.oc.server.{PacketSender => ServerPacketSender, driver, component}
import li.cil.oc.util.ExtendedNBT._
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.item.ItemStack
import net.minecraft.nbt.{NBTTagString, NBTTagCompound}

1
src/main/scala/li/cil/oc/server/PacketHandler.scala
View File

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

2
src/main/scala/li/cil/oc/server/component/machine/luac/OSAPI.scala
View File

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