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

gui refactoring

Browse Source
This commit is contained in:
Florian Nücke 2013-09-16 12:14:52 +02:00
parent a88b4f5dab
commit 978e413233
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
li/cil/oc/common/gui/GuiComputer.scala → li/cil/oc/client/gui/GuiComputer.scala
View File

@ -1,7 +1,6 @@
package li.cil.oc.common.gui
package li.cil.oc.client.gui
import org.lwjgl.opengl.GL11
import li.cil.oc.common.container.ContainerComputer
import li.cil.oc.common.tileentity.TileEntityComputer
import net.minecraft.client.gui.GuiButton

2
li/cil/oc/common/gui/GuiScreen.scala → li/cil/oc/client/gui/GuiScreen.scala
View File

@ -1,4 +1,4 @@
package li.cil.oc.common.gui
package li.cil.oc.client.gui
import li.cil.oc.common.tileentity.TileEntityScreen
import net.minecraft.client.gui.Gui

4
li/cil/oc/common/gui/GuiHandler.scala → li/cil/oc/common/GuiHandler.scala
View File

@ -1,4 +1,4 @@
package li.cil.oc.common.gui
package li.cil.oc.common
import cpw.mods.fml.common.network.IGuiHandler
import li.cil.oc.common.container.ContainerComputer
@ -6,6 +6,8 @@ import li.cil.oc.common.tileentity.TileEntityComputer
import li.cil.oc.common.tileentity.TileEntityScreen
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.world.World
import li.cil.oc.client.gui.GuiScreen
import li.cil.oc.client.gui.GuiComputer
object GuiType extends Enumeration {
val Computer = Value("Computer")

3
li/cil/oc/common/Proxy.scala
View File

@ -7,7 +7,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry
import li.cil.oc._
import li.cil.oc.OpenComputers
import li.cil.oc.api.OpenComputersAPI
import li.cil.oc.common.gui.GuiHandler
import li.cil.oc.server.computer.Drivers
import li.cil.oc.server.drivers._
@ -33,7 +32,7 @@ class Proxy {
// TODO Figure out how resource pack based localization works.
LanguageRegistry.addName(Blocks.computer, "Computer")
NetworkRegistry.instance().registerGuiHandler(OpenComputers, new GuiHandler());
NetworkRegistry.instance.registerGuiHandler(OpenComputers, new GuiHandler)
OpenComputersAPI.addDriver(GraphicsCardDriver)
OpenComputersAPI.addDriver(ScreenDriver)

3
li/cil/oc/common/block/BlockComputer.scala
View File

@ -4,7 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry
import li.cil.oc.Config
import li.cil.oc.CreativeTab
import li.cil.oc.OpenComputers
import li.cil.oc.common.gui.GuiType
import li.cil.oc.common.GuiType
import li.cil.oc.common.tileentity.TileEntityComputer
import net.minecraft.block.Block
import net.minecraft.block.material.Material
@ -15,6 +15,7 @@ import net.minecraft.util.MathHelper
import net.minecraft.world.IBlockAccess
import net.minecraft.world.World
import net.minecraftforge.common.ForgeDirection
import li.cil.oc.common.GuiType
class BlockComputer extends Block(Config.blockComputerId, Material.iron) {
// ----------------------------------------------------------------------- //

3
li/cil/oc/common/block/BlockScreen.scala
View File

@ -4,12 +4,13 @@ import cpw.mods.fml.common.registry.GameRegistry
import li.cil.oc.Config
import li.cil.oc.CreativeTab
import li.cil.oc.OpenComputers
import li.cil.oc.common.gui.GuiType
import li.cil.oc.common.GuiType
import li.cil.oc.common.tileentity.TileEntityScreen
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.world.World
import li.cil.oc.common.GuiType
class BlockScreen extends Block(Config.blockScreenId, Material.iron) {
// ----------------------------------------------------------------------- //

2
li/cil/oc/common/tileentity/TileEntityScreen.scala
View File

@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher._
import li.cil.oc.client.{ PacketSender => ClientPacketSender }
import li.cil.oc.common.components.IScreenEnvironment
import li.cil.oc.common.components.Screen
import li.cil.oc.common.gui.GuiScreen
import li.cil.oc.client.gui.GuiScreen
import li.cil.oc.server.{ PacketSender => ServerPacketSender }
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity