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

renamed proxies to be symmetric

Browse Source
This commit is contained in:
Florian Nücke 2013-09-16 11:45:10 +02:00
parent 2b25bc2105
commit c90d7d1865
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
li/cil/oc/OpenComputers.scala
View File

@ -9,7 +9,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent
import cpw.mods.fml.common.event.FMLPreInitializationEvent import cpw.mods.fml.common.event.FMLPreInitializationEvent
import cpw.mods.fml.common.network.NetworkMod import cpw.mods.fml.common.network.NetworkMod
import cpw.mods.fml.common.network.NetworkMod._ import cpw.mods.fml.common.network.NetworkMod._
import li.cil.oc.common.CommonProxy import li.cil.oc.common.Proxy
import li.cil.oc.client.{ PacketHandler => ClientPacketHandler } import li.cil.oc.client.{ PacketHandler => ClientPacketHandler }
import li.cil.oc.server.{ PacketHandler => ServerPacketHandler } import li.cil.oc.server.{ PacketHandler => ServerPacketHandler }
@ -24,9 +24,9 @@ object OpenComputers {
val log = Logger.getLogger("OpenComputers") val log = Logger.getLogger("OpenComputers")
@SidedProxy( @SidedProxy(
clientSide = "li.cil.oc.client.ClientProxy", clientSide = "li.cil.oc.client.Proxy",
serverSide = "li.cil.oc.server.ServerProxy") serverSide = "li.cil.oc.server.Proxy")
var proxy: CommonProxy = null var proxy: Proxy = null
@EventHandler @EventHandler
def preInit(e: FMLPreInitializationEvent) = proxy.preInit(e) def preInit(e: FMLPreInitializationEvent) = proxy.preInit(e)

7
li/cil/oc/client/ClientProxy.scala
View File

@ -1,7 +0,0 @@
package li.cil.oc.client
import li.cil.oc.common.CommonProxy
private[oc] class ClientProxy extends CommonProxy {
}

7
li/cil/oc/client/Proxy.scala Normal file
View File

@ -0,0 +1,7 @@
package li.cil.oc.client
import li.cil.oc.common.{ Proxy => CommonProxy }
private[oc] class Proxy extends CommonProxy {
}

2
li/cil/oc/common/CommonProxy.scala → li/cil/oc/common/Proxy.scala
View File

@ -11,7 +11,7 @@ import li.cil.oc.common.gui.GuiHandler
import li.cil.oc.server.computer.Drivers import li.cil.oc.server.computer.Drivers
import li.cil.oc.server.drivers._ import li.cil.oc.server.drivers._
class CommonProxy { class Proxy {
def preInit(e: FMLPreInitializationEvent): Unit = { def preInit(e: FMLPreInitializationEvent): Unit = {
val config = new net.minecraftforge.common.Configuration(e.getSuggestedConfigurationFile()) val config = new net.minecraftforge.common.Configuration(e.getSuggestedConfigurationFile())

4
li/cil/oc/server/ServerProxy.scala → li/cil/oc/server/Proxy.scala
View File

@ -3,13 +3,13 @@ package li.cil.oc.server
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
import cpw.mods.fml.common.event.FMLInitializationEvent import cpw.mods.fml.common.event.FMLInitializationEvent
import li.cil.oc.common.CommonProxy import li.cil.oc.common.{ Proxy => CommonProxy }
import li.cil.oc.common.tileentity.TileEntityComputer import li.cil.oc.common.tileentity.TileEntityComputer
import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.event.ForgeSubscribe import net.minecraftforge.event.ForgeSubscribe
import net.minecraftforge.event.world.ChunkEvent import net.minecraftforge.event.world.ChunkEvent
class ServerProxy extends CommonProxy { class Proxy extends CommonProxy {
override def init(e: FMLInitializationEvent) = { override def init(e: FMLInitializationEvent) = {
super.init(e) super.init(e)