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

More wrappers

This commit is contained in:
DaMachinator 2018-02-09 13:22:03 -05:00
parent cac5c59f75
commit 224af67113
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/matterlink/MatterLink.kt
View File

@ -56,6 +56,7 @@ object MatterLink {
BridgeCommandRegistry.registerAll(PlayerListCommand, HelpCommand) BridgeCommandRegistry.registerAll(PlayerListCommand, HelpCommand)
} }
@Mod.EventHandler @Mod.EventHandler
fun serverStarting(event: FMLServerStartingEvent) { fun serverStarting(event: FMLServerStartingEvent) {
logger.debug("Registering server commands") logger.debug("Registering server commands")
@ -69,8 +70,13 @@ object MatterLink {
} }
//FORGE-DEPENDENT //FORGE-DEPENDENT
fun writeToServerChat(msg: String) { fun wrappedSendToPlayers(msg: String) {
FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(TextComponentString(msg)) FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(TextComponentString(msg))
} }
//FORGE-DEPENDENT
fun wrappedPlayerList(): Array<String> {
return FMLCommonHandler.instance().minecraftServerInstance.playerList.onlinePlayerNames
}
} }

6
src/main/kotlin/matterlink/bridge/ServerChatHandler.kt
View File

@ -3,10 +3,6 @@ package matterlink.bridge
import matterlink.MatterLink import matterlink.MatterLink
import matterlink.bridge.command.BridgeCommandRegistry import matterlink.bridge.command.BridgeCommandRegistry
import matterlink.cfg import matterlink.cfg
import net.minecraft.util.text.TextComponentString
import net.minecraftforge.fml.common.FMLCommonHandler
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent
object ServerChatHandler { object ServerChatHandler {
/** /**
@ -39,7 +35,7 @@ object ServerChatHandler {
return return
} }
} }
FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(TextComponentString(message)) MatterLink.wrappedSendToPlayers(message)
} }
} }
} }

4
src/main/kotlin/matterlink/bridge/command/PlayerListCommand.kt
View File

@ -1,10 +1,10 @@
package matterlink.bridge.command package matterlink.bridge.command
import matterlink.MatterLink
import matterlink.antiping import matterlink.antiping
import matterlink.bridge.ApiMessage import matterlink.bridge.ApiMessage
import matterlink.bridge.MessageHandler import matterlink.bridge.MessageHandler
import matterlink.cfg import matterlink.cfg
import net.minecraftforge.fml.common.FMLCommonHandler
object PlayerListCommand : IBridgeCommand { object PlayerListCommand : IBridgeCommand {
override val name: String = "players" override val name: String = "players"
@ -14,7 +14,7 @@ object PlayerListCommand : IBridgeCommand {
MessageHandler.transmit(ApiMessage( MessageHandler.transmit(ApiMessage(
username = cfg!!.relay.systemUser, username = cfg!!.relay.systemUser,
text = FMLCommonHandler.instance().minecraftServerInstance.playerList.onlinePlayerNames.joinToString(" ") { it.antiping() } text = MatterLink.wrappedPlayerList().joinToString(" ") { it.antiping() }
)) ))
return true return true

6
src/main/kotlin/matterlink/handlers/JoinLeaveHandler.kt
View File

@ -1,12 +1,10 @@
package matterlink.handlers package matterlink.handlers
import matterlink.antiping
import matterlink.bridge.ApiMessage import matterlink.bridge.ApiMessage
import matterlink.bridge.JOIN_LEAVE
import matterlink.bridge.MessageHandler import matterlink.bridge.MessageHandler
import matterlink.cfg import matterlink.cfg
import matterlink.antiping
import matterlink.bridge.JOIN_LEAVE
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.PlayerEvent
object JoinLeaveHandler { object JoinLeaveHandler {
fun handleJoin(player: String) { fun handleJoin(player: String) {