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

Organized imports, splitting up multi imports of the format import pkg.{a, b, c} since those are a pain when merging stuff after imports changed.

Browse Source
This commit is contained in:
Florian Nücke 2014-10-05 16:25:49 +02:00
parent 3841fb4759
commit e35dfb960a
216 changed files with 1124 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/li/cil/oc/Blocks.scala
View File

@ -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 = _

11
src/main/scala/li/cil/oc/Items.scala
View File

@ -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

4
src/main/scala/li/cil/oc/Localization.scala
View File

@ -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

3
src/main/scala/li/cil/oc/OpenComputers.scala
View File

@ -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

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

@ -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) {
// ----------------------------------------------------------------------- //

9
src/main/scala/li/cil/oc/client/GuiHandler.scala
View File

@ -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

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

@ -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

4
src/main/scala/li/cil/oc/client/PacketSender.scala
View File

@ -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

18
src/main/scala/li/cil/oc/client/Proxy.scala
View File

@ -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

19
src/main/scala/li/cil/oc/client/Sound.scala
View File

@ -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

3
src/main/scala/li/cil/oc/client/Textures.scala
View File

@ -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")

6
src/main/scala/li/cil/oc/client/gui/Case.scala
View File

@ -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

3
src/main/scala/li/cil/oc/client/gui/Charger.scala
View File

@ -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)) {

3
src/main/scala/li/cil/oc/client/gui/CustomGuiContainer.scala
View File

@ -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._

3
src/main/scala/li/cil/oc/client/gui/Disassembler.scala
View File

@ -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

3
src/main/scala/li/cil/oc/client/gui/DiskDrive.scala
View File

@ -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)) {

9
src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
View File

@ -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

5
src/main/scala/li/cil/oc/client/gui/Icons.scala
View File

@ -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

3
src/main/scala/li/cil/oc/client/gui/ImageButton.scala
View File

@ -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

16
src/main/scala/li/cil/oc/client/gui/Robot.scala
View File

@ -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

6
src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
View File

@ -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

12
src/main/scala/li/cil/oc/client/gui/ServerRack.scala
View File

@ -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

3
src/main/scala/li/cil/oc/client/gui/Switch.scala
View File

@ -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)) {

3
src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
View File

@ -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

15
src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala
View File

@ -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().

7
src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala
View File

@ -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

3
src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
View File

@ -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

7
src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala
View File

@ -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._

3
src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala
View File

@ -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

4
src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala
View File

@ -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
/**

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

@ -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._

3
src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala
View File

@ -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

10
src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
View File

@ -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

13
src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
View File

@ -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)

4
src/main/scala/li/cil/oc/common/EventHandler.scala
View File

@ -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

7
src/main/scala/li/cil/oc/common/Loot.scala
View File

@ -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._

7
src/main/scala/li/cil/oc/common/PacketBuilder.scala
View File

@ -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

12
src/main/scala/li/cil/oc/common/PacketHandler.scala
View File

@ -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. */

12
src/main/scala/li/cil/oc/common/Proxy.scala
View File

@ -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._

18
src/main/scala/li/cil/oc/common/SaveHandler.scala
View File

@ -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

7
src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
View File

@ -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._

3
src/main/scala/li/cil/oc/common/block/Adapter.scala
View File

@ -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 {

9
src/main/scala/li/cil/oc/common/block/Assembler.scala
View File

@ -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 {

11
src/main/scala/li/cil/oc/common/block/Cable.scala
View File

@ -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 {

18
src/main/scala/li/cil/oc/common/block/Case.scala
View File

@ -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 {

9
src/main/scala/li/cil/oc/common/block/Charger.scala
View File

@ -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 {

6
src/main/scala/li/cil/oc/common/block/Disassembler.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/block/DiskDrive.scala
View File

@ -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

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

@ -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 {

10
src/main/scala/li/cil/oc/common/block/Item.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/block/Keyboard.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
View File

@ -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 {

12
src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
View File

@ -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 {

27
src/main/scala/li/cil/oc/common/block/RobotProxy.scala
View File

@ -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 {

48
src/main/scala/li/cil/oc/common/block/Screen.scala
View File

@ -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)
}

9
src/main/scala/li/cil/oc/common/block/ServerRack.scala
View File

@ -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 {

26
src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
View File

@ -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) {

6
src/main/scala/li/cil/oc/common/block/Switch.scala
View File

@ -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

4
src/main/scala/li/cil/oc/common/component/Screen.scala
View File

@ -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}

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

@ -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

6
src/main/scala/li/cil/oc/common/component/TextBuffer.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/container/Case.scala
View File

@ -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)) {

3
src/main/scala/li/cil/oc/common/container/ComponentSlot.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/container/Disassembler.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/container/DiskDrive.scala
View File

@ -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) {

3
src/main/scala/li/cil/oc/common/container/DynamicComponentSlot.scala
View File

@ -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 = {

8
src/main/scala/li/cil/oc/common/container/Player.scala
View File

@ -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._

6
src/main/scala/li/cil/oc/common/container/Robot.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/container/RobotAssembler.scala
View File

@ -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) {

3
src/main/scala/li/cil/oc/common/container/Server.scala
View File

@ -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) {

3
src/main/scala/li/cil/oc/common/container/ServerRack.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/container/StaticComponentSlot.scala
View File

@ -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))

3
src/main/scala/li/cil/oc/common/container/Switch.scala
View File

@ -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) {

6
src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
View File

@ -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._

3
src/main/scala/li/cil/oc/common/event/ExperienceUpgradeHandler.scala
View File

@ -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 {

9
src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala
View File

@ -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 {

3
src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/item/Analyzer.scala
View File

@ -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

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

@ -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

13
src/main/scala/li/cil/oc/common/item/Delegator.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/item/ItemTier.scala
View File

@ -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)

12
src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
View File

@ -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"))
}

9
src/main/scala/li/cil/oc/common/item/Server.scala
View File

@ -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

36
src/main/scala/li/cil/oc/common/item/Tablet.scala
View File

@ -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

10
src/main/scala/li/cil/oc/common/item/Terminal.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/item/UpgradeTank.scala
View File

@ -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

3
src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
View File

@ -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"))

24
src/main/scala/li/cil/oc/common/multipart/CablePart.scala
View File

@ -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._

6
src/main/scala/li/cil/oc/common/multipart/EventHandler.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/multipart/MultiPart.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/multipart/SimpleBlockPart.scala
View File

@ -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

6
src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
View File

@ -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

10
src/main/scala/li/cil/oc/common/recipe/Recipes.scala
View File

@ -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._

9
src/main/scala/li/cil/oc/common/template/AssemblerTemplates.scala
View File

@ -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

10
src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
View File

@ -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]

9
src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
View File

@ -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

7
src/main/scala/li/cil/oc/common/template/Template.scala
View File

@ -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

8
src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More