sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

import cleanup and autoformatting

This commit is contained in:
Nikky Ai 2018-01-21 11:58:54 +01:00
parent 47f014c344
commit aa564d1e1f
7 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/civilengineering/CivilEngineering.kt
View File

@ -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,

4
src/main/kotlin/civilengineering/bridge/ApiMessage.kt
View File

@ -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 = "",

4
src/main/kotlin/civilengineering/bridge/CancellableConnectionFollowThread.kt
View File

@ -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

1
src/main/kotlin/civilengineering/bridge/MessageHandler.kt
View File

@ -8,7 +8,6 @@ import java.net.HttpURLConnection
import java.net.URL
import java.util.concurrent.ConcurrentLinkedQueue
object MessageHandler {
private fun createThread(): CancellableConnectionFollowThread {

1
src/main/kotlin/civilengineering/command/BridgeCommand.kt
View File

@ -1,6 +1,5 @@
package civilengineering.command
import civilengineering.CivilEngineering
import civilengineering.*
import civilengineering.CivilEngineering.logger
import civilengineering.bridge.MessageHandler

2
src/main/kotlin/civilengineering/eventhandlers/DeathEventHandler.kt
View File

@ -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 {

1
src/main/kotlin/civilengineering/eventhandlers/UserActionHandler.kt
View File

@ -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 {