From 1881507712721f5ffedb7a8559276ce03ba8961e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 09:10:25 +1000
Subject: [PATCH] Move scoreboard stuff to the sscore package in preparation
 for refactor

---
 .../bungee/api/{scoreboard => score}/Objective.java    |  2 +-
 .../bungee/api/{scoreboard => score}/Position.java     |  2 +-
 .../md_5/bungee/api/{scoreboard => score}/Score.java   |  2 +-
 .../bungee/api/{scoreboard => score}/Scoreboard.java   |  2 +-
 .../md_5/bungee/api/{scoreboard => score}/Team.java    |  2 +-
 .../src/main/java/net/md_5/bungee/ServerConnector.java |  6 +++---
 .../src/main/java/net/md_5/bungee/UserConnection.java  |  2 +-
 .../net/md_5/bungee/connection/DownstreamBridge.java   | 10 +++++-----
 8 files changed, 14 insertions(+), 14 deletions(-)
 rename api/src/main/java/net/md_5/bungee/api/{scoreboard => score}/Objective.java (87%)
 rename api/src/main/java/net/md_5/bungee/api/{scoreboard => score}/Position.java (74%)
 rename api/src/main/java/net/md_5/bungee/api/{scoreboard => score}/Score.java (90%)
 rename api/src/main/java/net/md_5/bungee/api/{scoreboard => score}/Scoreboard.java (98%)
 rename api/src/main/java/net/md_5/bungee/api/{scoreboard => score}/Team.java (94%)

diff --git a/api/src/main/java/net/md_5/bungee/api/scoreboard/Objective.java b/api/src/main/java/net/md_5/bungee/api/score/Objective.java
similarity index 87%
rename from api/src/main/java/net/md_5/bungee/api/scoreboard/Objective.java
rename to api/src/main/java/net/md_5/bungee/api/score/Objective.java
index 5b0ef6a7..07a4d4a5 100644
--- a/api/src/main/java/net/md_5/bungee/api/scoreboard/Objective.java
+++ b/api/src/main/java/net/md_5/bungee/api/score/Objective.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.api.scoreboard;
+package net.md_5.bungee.api.score;
 
 import lombok.Data;
 
diff --git a/api/src/main/java/net/md_5/bungee/api/scoreboard/Position.java b/api/src/main/java/net/md_5/bungee/api/score/Position.java
similarity index 74%
rename from api/src/main/java/net/md_5/bungee/api/scoreboard/Position.java
rename to api/src/main/java/net/md_5/bungee/api/score/Position.java
index ad3cde81..e68d0667 100644
--- a/api/src/main/java/net/md_5/bungee/api/scoreboard/Position.java
+++ b/api/src/main/java/net/md_5/bungee/api/score/Position.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.api.scoreboard;
+package net.md_5.bungee.api.score;
 
 /**
  * Represents locations for a scoreboard to be displayed.
diff --git a/api/src/main/java/net/md_5/bungee/api/scoreboard/Score.java b/api/src/main/java/net/md_5/bungee/api/score/Score.java
similarity index 90%
rename from api/src/main/java/net/md_5/bungee/api/scoreboard/Score.java
rename to api/src/main/java/net/md_5/bungee/api/score/Score.java
index 88c3e954..cb906ddd 100644
--- a/api/src/main/java/net/md_5/bungee/api/scoreboard/Score.java
+++ b/api/src/main/java/net/md_5/bungee/api/score/Score.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.api.scoreboard;
+package net.md_5.bungee.api.score;
 
 import lombok.Data;
 
diff --git a/api/src/main/java/net/md_5/bungee/api/scoreboard/Scoreboard.java b/api/src/main/java/net/md_5/bungee/api/score/Scoreboard.java
similarity index 98%
rename from api/src/main/java/net/md_5/bungee/api/scoreboard/Scoreboard.java
rename to api/src/main/java/net/md_5/bungee/api/score/Scoreboard.java
index 3247a67e..de82b247 100644
--- a/api/src/main/java/net/md_5/bungee/api/scoreboard/Scoreboard.java
+++ b/api/src/main/java/net/md_5/bungee/api/score/Scoreboard.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.api.scoreboard;
+package net.md_5.bungee.api.score;
 
 import com.google.common.base.Preconditions;
 import java.util.Collection;
diff --git a/api/src/main/java/net/md_5/bungee/api/scoreboard/Team.java b/api/src/main/java/net/md_5/bungee/api/score/Team.java
similarity index 94%
rename from api/src/main/java/net/md_5/bungee/api/scoreboard/Team.java
rename to api/src/main/java/net/md_5/bungee/api/score/Team.java
index b756f855..3b9b0c89 100644
--- a/api/src/main/java/net/md_5/bungee/api/scoreboard/Team.java
+++ b/api/src/main/java/net/md_5/bungee/api/score/Team.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.api.scoreboard;
+package net.md_5.bungee.api.score;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 776cb39f..4292993a 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -16,9 +16,9 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.event.ServerKickEvent;
 import net.md_5.bungee.api.event.ServerSwitchEvent;
-import net.md_5.bungee.api.scoreboard.Objective;
-import net.md_5.bungee.api.scoreboard.Scoreboard;
-import net.md_5.bungee.api.scoreboard.Team;
+import net.md_5.bungee.api.score.Objective;
+import net.md_5.bungee.api.score.Scoreboard;
+import net.md_5.bungee.api.score.Team;
 import net.md_5.bungee.connection.CancelSendSignal;
 import net.md_5.bungee.connection.DownstreamBridge;
 import net.md_5.bungee.netty.HandlerBoss;
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 98498e74..2b6807c7 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -26,7 +26,7 @@ import net.md_5.bungee.api.config.TexturePackInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PermissionCheckEvent;
 import net.md_5.bungee.api.event.ServerConnectEvent;
-import net.md_5.bungee.api.scoreboard.Scoreboard;
+import net.md_5.bungee.api.score.Scoreboard;
 import net.md_5.bungee.api.tab.TabListHandler;
 import net.md_5.bungee.connection.InitialHandler;
 import net.md_5.bungee.netty.ChannelWrapper;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index fb95fc40..c305c794 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -15,11 +15,11 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.ServerKickEvent;
-import net.md_5.bungee.api.scoreboard.Objective;
-import net.md_5.bungee.api.scoreboard.Position;
-import net.md_5.bungee.api.scoreboard.Score;
-import net.md_5.bungee.api.scoreboard.Scoreboard;
-import net.md_5.bungee.api.scoreboard.Team;
+import net.md_5.bungee.api.score.Objective;
+import net.md_5.bungee.api.score.Position;
+import net.md_5.bungee.api.score.Score;
+import net.md_5.bungee.api.score.Scoreboard;
+import net.md_5.bungee.api.score.Team;
 import net.md_5.bungee.netty.ChannelWrapper;
 import net.md_5.bungee.netty.PacketHandler;
 import net.md_5.bungee.protocol.packet.Packet0KeepAlive;