From b3f8fb3c568a18f33fb43005e118c71d4d6259a7 Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 23 Sep 2014 14:06:46 +0300 Subject: [PATCH] Added PlayerCache - a generic player->whatever map that auto-clears on server restart, logoff, respawn, etc. --- src/net/bdew/lib/BdLib.scala | 11 +++- src/net/bdew/lib/player/PlayerCache.scala | 61 +++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 src/net/bdew/lib/player/PlayerCache.scala diff --git a/src/net/bdew/lib/BdLib.scala b/src/net/bdew/lib/BdLib.scala index 1cb5186..79e7165 100644 --- a/src/net/bdew/lib/BdLib.scala +++ b/src/net/bdew/lib/BdLib.scala @@ -11,7 +11,7 @@ package net.bdew.lib import cpw.mods.fml.common.Mod import cpw.mods.fml.common.Mod.EventHandler -import cpw.mods.fml.common.event.{FMLPreInitializationEvent, FMLServerStartingEvent} +import cpw.mods.fml.common.event.{FMLPreInitializationEvent, FMLServerStartingEvent, FMLServerStoppingEvent} import net.bdew.lib.multiblock.network.NetHandler import net.minecraft.command.CommandHandler import org.apache.logging.log4j.Logger @@ -26,6 +26,9 @@ object BdLib { def logWarnException(msg: String, t: Throwable, args: Any*) = log.warn(msg.format(args: _*), t) def logErrorException(msg: String, t: Throwable, args: Any*) = log.error(msg.format(args: _*), t) + val onServerStarting = Event[FMLServerStartingEvent] + val onServerStopping = Event[FMLServerStoppingEvent] + @EventHandler def preInit(ev: FMLPreInitializationEvent) { log = ev.getModLog @@ -37,5 +40,11 @@ object BdLib { def serverStarting(event: FMLServerStartingEvent) { val commandHandler = event.getServer.getCommandManager.asInstanceOf[CommandHandler] commandHandler.registerCommand(new CommandDumpRegistry) + onServerStarting.trigger(event) + } + + @EventHandler + def serverStopping(event: FMLServerStoppingEvent) { + onServerStopping.trigger(event) } } diff --git a/src/net/bdew/lib/player/PlayerCache.scala b/src/net/bdew/lib/player/PlayerCache.scala new file mode 100644 index 0000000..c79527f --- /dev/null +++ b/src/net/bdew/lib/player/PlayerCache.scala @@ -0,0 +1,61 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/bdlib + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://bdew.net/minecraft-mod-public-license/ + */ + +package net.bdew.lib.player + +import cpw.mods.fml.common.FMLCommonHandler +import cpw.mods.fml.common.eventhandler.SubscribeEvent +import cpw.mods.fml.common.gameevent.PlayerEvent._ +import net.bdew.lib.BdLib +import net.minecraft.entity.player.EntityPlayer + +import scala.collection.mutable + +class PlayerCache[T] extends mutable.Map[EntityPlayer, T] { + var map = Map.empty[EntityPlayer, T] + + BdLib.onServerStarting.listen(x => map = map.empty) + BdLib.onServerStopping.listen(x => map = map.empty) + FMLCommonHandler.instance().bus().register(this) + + def updateIfNeeded(p: EntityPlayer, v: T): Boolean = { + if (map.get(p).contains(v)) { + false + } else { + map += p -> v + true + } + } + + def reset(p: EntityPlayer) { + if (map.contains(p)) map -= p + } + + override def get(p: EntityPlayer) = map.get(p) + + override def +=(kv: (EntityPlayer, T)) = { + map += kv + this + } + override def -=(key: EntityPlayer) = { + map -= key + this + } + + override def iterator = map.iterator + + @SubscribeEvent + def hadlePlayerLogout(ev: PlayerLoggedOutEvent) = reset(ev.player) + + @SubscribeEvent + def hadlePlayerChangedDimension(ev: PlayerChangedDimensionEvent) = reset(ev.player) + + @SubscribeEvent + def hadlePlayerRespawn(ev: PlayerRespawnEvent) = reset(ev.player) +}