diff --git a/src/main/java/li/cil/oc/api/network/Context.java b/src/main/java/li/cil/oc/api/network/Context.java index 227433b60..d7eccf1c3 100644 --- a/src/main/java/li/cil/oc/api/network/Context.java +++ b/src/main/java/li/cil/oc/api/network/Context.java @@ -5,14 +5,6 @@ package li.cil.oc.api.network; * computer from which the callback was called. */ public interface Context { - /** - * The network address of the computer. - * - * @deprecated Use node().address() instead. - */ - @Deprecated - String address(); - /** * The node through which the computer is attached to the component network. */ diff --git a/src/main/java/li/cil/oc/api/package-info.java b/src/main/java/li/cil/oc/api/package-info.java index 0a51c5253..999f3864c 100644 --- a/src/main/java/li/cil/oc/api/package-info.java +++ b/src/main/java/li/cil/oc/api/package-info.java @@ -37,5 +37,5 @@ @cpw.mods.fml.common.API( owner = "OpenComputers|Core", provides = "OpenComputersAPI", - apiVersion = "1.4.14") + apiVersion = "1.5.0") package li.cil.oc.api; \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala index 07b4d3e9a..8b7b48336 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala @@ -41,8 +41,6 @@ trait Computer extends Environment with ComponentInventory with Rotatable with B // Note: we implement IContext in the TE to allow external components to cast // their owner to it (to allow interacting with their owning computer). - override def address = computer.address - override def canInteract(player: String) = if (isServer) computer.canInteract(player) else !Settings.get.canComputersBeOwned || diff --git a/src/main/scala/li/cil/oc/server/component/Server.scala b/src/main/scala/li/cil/oc/server/component/Server.scala index 1903e14c9..b674830fd 100644 --- a/src/main/scala/li/cil/oc/server/component/Server.scala +++ b/src/main/scala/li/cil/oc/server/component/Server.scala @@ -26,8 +26,6 @@ class Server(val rack: tileentity.Rack, val number: Int) extends Owner { // ----------------------------------------------------------------------- // - override def address = machine.node.address - override def node = machine.node override def start() = machine.start() diff --git a/src/main/scala/li/cil/oc/server/component/machine/Machine.scala b/src/main/scala/li/cil/oc/server/component/machine/Machine.scala index 6b3e5a695..db0f63e3c 100644 --- a/src/main/scala/li/cil/oc/server/component/machine/Machine.scala +++ b/src/main/scala/li/cil/oc/server/component/machine/Machine.scala @@ -95,8 +95,6 @@ class Machine(val owner: Owner, val rom: Option[ManagedEnvironment], constructor // ----------------------------------------------------------------------- // - override def address = node.address - override def canInteract(player: String) = !Settings.get.canComputersBeOwned || _users.synchronized(_users.isEmpty || _users.contains(player)) || MinecraftServer.getServer.isSinglePlayer ||