From a4ea9b829f126c938500f283227c559c5acaab77 Mon Sep 17 00:00:00 2001
From: DaMachinator <damachinator@gmail.com>
Date: Tue, 23 Jan 2018 23:06:02 -0500
Subject: [PATCH] Utils cleanup

---
 .../civilengineering/{util => }/Util.kt       |  2 +-
 .../civilengineering/bridge/ApiMessage.kt     |  2 +-
 .../eventhandlers/AdvancementEventHandler.kt  |  2 +-
 .../eventhandlers/DeathEventHandler.kt        |  2 +-
 .../eventhandlers/JoinLeaveHandler.kt         |  2 +-
 .../kotlin/civilengineering/util/Color.kt     | 24 -------------------
 6 files changed, 5 insertions(+), 29 deletions(-)
 rename src/main/kotlin/civilengineering/{util => }/Util.kt (86%)
 delete mode 100644 src/main/kotlin/civilengineering/util/Color.kt

diff --git a/src/main/kotlin/civilengineering/util/Util.kt b/src/main/kotlin/civilengineering/Util.kt
similarity index 86%
rename from src/main/kotlin/civilengineering/util/Util.kt
rename to src/main/kotlin/civilengineering/Util.kt
index 924ff0a..679ccbc 100644
--- a/src/main/kotlin/civilengineering/util/Util.kt
+++ b/src/main/kotlin/civilengineering/Util.kt
@@ -1,4 +1,4 @@
-package civilengineering.util
+package civilengineering
 
 
 private const val ZWSP: Char = '\u200b'
diff --git a/src/main/kotlin/civilengineering/bridge/ApiMessage.kt b/src/main/kotlin/civilengineering/bridge/ApiMessage.kt
index de4ad10..9442489 100644
--- a/src/main/kotlin/civilengineering/bridge/ApiMessage.kt
+++ b/src/main/kotlin/civilengineering/bridge/ApiMessage.kt
@@ -1,7 +1,7 @@
 package civilengineering.bridge
 
 import civilengineering.cfg
-import civilengineering.util.antiping
+import civilengineering.antiping
 import com.google.gson.Gson
 
 data class ApiMessage(
diff --git a/src/main/kotlin/civilengineering/eventhandlers/AdvancementEventHandler.kt b/src/main/kotlin/civilengineering/eventhandlers/AdvancementEventHandler.kt
index 241f16d..e373663 100644
--- a/src/main/kotlin/civilengineering/eventhandlers/AdvancementEventHandler.kt
+++ b/src/main/kotlin/civilengineering/eventhandlers/AdvancementEventHandler.kt
@@ -3,7 +3,7 @@ package civilengineering.eventhandlers
 import civilengineering.bridge.ApiMessage
 import civilengineering.bridge.MessageHandler
 import civilengineering.cfg
-import civilengineering.util.antiping
+import civilengineering.antiping
 import net.minecraftforge.event.entity.player.AdvancementEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
diff --git a/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt b/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt
index fe5ab48..32484bf 100644
--- a/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt
+++ b/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt
@@ -3,7 +3,7 @@ package civilengineering.eventhandlers
 import civilengineering.bridge.ApiMessage
 import civilengineering.bridge.MessageHandler
 import civilengineering.cfg
-import civilengineering.util.antiping
+import civilengineering.antiping
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraftforge.event.entity.living.LivingDeathEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
diff --git a/src/main/kotlin/civilengineering/eventhandlers/JoinLeaveHandler.kt b/src/main/kotlin/civilengineering/eventhandlers/JoinLeaveHandler.kt
index 3435392..0d51c74 100644
--- a/src/main/kotlin/civilengineering/eventhandlers/JoinLeaveHandler.kt
+++ b/src/main/kotlin/civilengineering/eventhandlers/JoinLeaveHandler.kt
@@ -3,7 +3,7 @@ package civilengineering.eventhandlers
 import civilengineering.bridge.ApiMessage
 import civilengineering.bridge.MessageHandler
 import civilengineering.cfg
-import civilengineering.util.antiping
+import civilengineering.antiping
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.PlayerEvent
 
diff --git a/src/main/kotlin/civilengineering/util/Color.kt b/src/main/kotlin/civilengineering/util/Color.kt
deleted file mode 100644
index a3089c7..0000000
--- a/src/main/kotlin/civilengineering/util/Color.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package civilengineering.util
-
-fun String.color(color: Color):String {
-    return color.code+this
-}
-
-enum class Color(val index:Int,val code:String) {
-    BLACK(0,"§0"),
-    DARK_BLUE(1,"§1"),
-    DARK_GREEN(2,"§2"),
-    DARK_AQUA(3,"§3"),
-    DARK_RED(4,"§4"),
-    DARK_PURPLE(5,"§5"),
-    GOLD(6,"§6"),
-    GRAY(7,"§7"),
-    DARK_GRAY(8,"§8"),
-    BLUE(9,"§9"),
-    GREEN(10,"§a"),
-    AQUA(11,"§b"),
-    RED(12,"§c"),
-    LIGHT_PURPLE(13,"§d"),
-    YELLOW(14,"§e"),
-    WHITE(15,"§f")
-}
\ No newline at end of file