From aa564d1e1fbb336fe956e248a1a63f4f9adf61a5 Mon Sep 17 00:00:00 2001 From: Nikky Ai Date: Sun, 21 Jan 2018 11:58:54 +0100 Subject: [PATCH] import cleanup and autoformatting --- src/main/kotlin/civilengineering/CivilEngineering.kt | 11 +---------- src/main/kotlin/civilengineering/bridge/ApiMessage.kt | 4 +--- .../bridge/CancellableConnectionFollowThread.kt | 4 ++-- .../kotlin/civilengineering/bridge/MessageHandler.kt | 1 - .../kotlin/civilengineering/command/BridgeCommand.kt | 1 - .../eventhandlers/DeathEventHandler.kt | 2 -- .../eventhandlers/UserActionHandler.kt | 1 - 7 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/main/kotlin/civilengineering/CivilEngineering.kt b/src/main/kotlin/civilengineering/CivilEngineering.kt index 8806634..f7dfc58 100644 --- a/src/main/kotlin/civilengineering/CivilEngineering.kt +++ b/src/main/kotlin/civilengineering/CivilEngineering.kt @@ -12,16 +12,10 @@ import net.minecraftforge.fml.common.Mod import net.minecraftforge.fml.common.event.* import org.apache.logging.log4j.Level import org.apache.logging.log4j.Logger -import org.apache.logging.log4j.Marker -import org.apache.logging.log4j.message.Message -import org.apache.logging.log4j.message.MessageFactory import org.apache.logging.log4j.message.SimpleMessageFactory import org.apache.logging.log4j.simple.SimpleLogger -import org.apache.logging.log4j.spi.AbstractLogger import org.apache.logging.log4j.util.PropertiesUtil import java.io.File -import java.time.format.DateTimeFormatter -import java.time.format.DateTimeFormatterBuilder import java.util.* const val MODID = "civilengineering" @@ -37,13 +31,10 @@ const val VERSION = "0.0.1" modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter" ) object CivilEngineering { - init { - } - var config: Configuration = Configuration() //create fake logger to get around Nullability - var logger: Logger = SimpleLogger ("", + var logger: Logger = SimpleLogger("", Level.OFF, false, false, diff --git a/src/main/kotlin/civilengineering/bridge/ApiMessage.kt b/src/main/kotlin/civilengineering/bridge/ApiMessage.kt index 6e9d983..54596e0 100644 --- a/src/main/kotlin/civilengineering/bridge/ApiMessage.kt +++ b/src/main/kotlin/civilengineering/bridge/ApiMessage.kt @@ -1,10 +1,8 @@ package civilengineering.bridge -import civilengineering.Config import com.google.gson.Gson -import java.util.* -data class ApiMessage ( +data class ApiMessage( val text: String = "", val channel: String = "", val username: String = "", diff --git a/src/main/kotlin/civilengineering/bridge/CancellableConnectionFollowThread.kt b/src/main/kotlin/civilengineering/bridge/CancellableConnectionFollowThread.kt index a231897..02f5a8e 100644 --- a/src/main/kotlin/civilengineering/bridge/CancellableConnectionFollowThread.kt +++ b/src/main/kotlin/civilengineering/bridge/CancellableConnectionFollowThread.kt @@ -9,7 +9,7 @@ import java.net.HttpURLConnection * @version 1.0 */ -class CancellableConnectionFollowThread (httpConnClosure: () -> HttpURLConnection, private val mhandler: (String) -> Unit): Thread() { +class CancellableConnectionFollowThread(httpConnClosure: () -> HttpURLConnection, private val mhandler: (String) -> Unit) : Thread() { val cancelGuard = Object() var waitingOnNetwork = true var cancelled = false @@ -22,7 +22,7 @@ class CancellableConnectionFollowThread (httpConnClosure: () -> HttpURLConnectio httpConn.requestMethod = "GET" InputStreamReader(httpConn.inputStream).useLines { - it.forEach{ + it.forEach { synchronized(cancelGuard) { if (cancelled) return waitingOnNetwork = false diff --git a/src/main/kotlin/civilengineering/bridge/MessageHandler.kt b/src/main/kotlin/civilengineering/bridge/MessageHandler.kt index db02f61..a908279 100644 --- a/src/main/kotlin/civilengineering/bridge/MessageHandler.kt +++ b/src/main/kotlin/civilengineering/bridge/MessageHandler.kt @@ -8,7 +8,6 @@ import java.net.HttpURLConnection import java.net.URL import java.util.concurrent.ConcurrentLinkedQueue - object MessageHandler { private fun createThread(): CancellableConnectionFollowThread { diff --git a/src/main/kotlin/civilengineering/command/BridgeCommand.kt b/src/main/kotlin/civilengineering/command/BridgeCommand.kt index 1178439..621cedb 100644 --- a/src/main/kotlin/civilengineering/command/BridgeCommand.kt +++ b/src/main/kotlin/civilengineering/command/BridgeCommand.kt @@ -1,6 +1,5 @@ package civilengineering.command -import civilengineering.CivilEngineering import civilengineering.* import civilengineering.CivilEngineering.logger import civilengineering.bridge.MessageHandler diff --git a/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt b/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt index c45c413..beb45da 100644 --- a/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt +++ b/src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt @@ -3,10 +3,8 @@ package civilengineering.eventhandlers import civilengineering.Config import civilengineering.bridge.ApiMessage import civilengineering.bridge.MessageHandler -import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.player.EntityPlayer import net.minecraftforge.event.entity.living.LivingDeathEvent -import net.minecraftforge.fml.common.Mod import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class DeathEventHandler { diff --git a/src/main/kotlin/civilengineering/eventhandlers/UserActionHandler.kt b/src/main/kotlin/civilengineering/eventhandlers/UserActionHandler.kt index cff1073..f236745 100644 --- a/src/main/kotlin/civilengineering/eventhandlers/UserActionHandler.kt +++ b/src/main/kotlin/civilengineering/eventhandlers/UserActionHandler.kt @@ -5,7 +5,6 @@ import civilengineering.bridge.MessageHandler import net.minecraft.command.server.CommandEmote import net.minecraft.entity.player.EntityPlayer import net.minecraftforge.event.CommandEvent -import net.minecraftforge.fml.common.Mod import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class UserActionHandler {