mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-20 12:19:58 +00:00
refactor: port multipart event handler
Preserve event-bus identity and the annotated singleton surface.
This commit is contained in:
1 parent
e9f244fefa
commit
4cd63eb3c8
7 files changed
+194
-95
No files matched your search
@@ -0,0 +1,76 @@
|
||||
package codechicken.multipart.handler;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
|
||||
import net.minecraftforge.event.world.ChunkDataEvent;
|
||||
import net.minecraftforge.event.world.ChunkWatchEvent;
|
||||
import net.minecraftforge.event.world.WorldEvent;
|
||||
|
||||
import codechicken.multipart.BlockMultipart;
|
||||
import codechicken.multipart.TileCache;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import scala.collection.JavaConverters;
|
||||
|
||||
public final class MultipartEventHandler$ {
|
||||
|
||||
public static final MultipartEventHandler$ MODULE$ = new MultipartEventHandler$();
|
||||
|
||||
private MultipartEventHandler$() {}
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
public void tileEntityLoad(ChunkDataEvent.Load event) {
|
||||
MultipartSaveLoad.loadTiles(event.getChunk());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void worldUnLoad(WorldEvent.Unload event) {
|
||||
MultipartSPH$.MODULE$.onWorldUnload(event.world);
|
||||
if (event.world.isRemote) {
|
||||
TileCache.clear();
|
||||
} else {
|
||||
MultipartSaveLoad.loadingWorld_$eq(null);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void chunkWatch(ChunkWatchEvent.Watch event) {
|
||||
MultipartSPH$.MODULE$.onChunkWatch(event.player, event.chunk);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void chunkUnWatch(ChunkWatchEvent.UnWatch event) {
|
||||
MultipartSPH$.MODULE$.onChunkUnWatch(event.player, event.chunk);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void drawBlockHighlight(DrawBlockHighlightEvent event) {
|
||||
if (event.target != null && event.target.typeOfHit == MovingObjectType.BLOCK
|
||||
&& event.player.worldObj.getTileEntity(
|
||||
event.target.blockX,
|
||||
event.target.blockY,
|
||||
event.target.blockZ) instanceof TileMultipart
|
||||
&& BlockMultipart
|
||||
.drawHighlight(event.player.worldObj, event.player, event.target, event.partialTicks)) {
|
||||
event.setCanceled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SuppressWarnings("unchecked")
|
||||
public void serverTick(TickEvent.ServerTickEvent event) {
|
||||
if (event.phase == TickEvent.Phase.END) {
|
||||
List<EntityPlayerMP> players = MinecraftServer.getServer().getConfigurationManager().playerEntityList;
|
||||
MultipartSPH$.MODULE$.onTickEnd(JavaConverters.asScalaBufferConverter(players).asScala());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package codechicken.multipart.handler;
|
||||
|
||||
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
|
||||
import net.minecraftforge.event.world.ChunkDataEvent;
|
||||
import net.minecraftforge.event.world.ChunkWatchEvent;
|
||||
import net.minecraftforge.event.world.WorldEvent;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public final class MultipartEventHandler {
|
||||
|
||||
private MultipartEventHandler() {}
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
public static void tileEntityLoad(ChunkDataEvent.Load event) {
|
||||
MultipartEventHandler$.MODULE$.tileEntityLoad(event);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void worldUnLoad(WorldEvent.Unload event) {
|
||||
MultipartEventHandler$.MODULE$.worldUnLoad(event);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void chunkWatch(ChunkWatchEvent.Watch event) {
|
||||
MultipartEventHandler$.MODULE$.chunkWatch(event);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void chunkUnWatch(ChunkWatchEvent.UnWatch event) {
|
||||
MultipartEventHandler$.MODULE$.chunkUnWatch(event);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void drawBlockHighlight(DrawBlockHighlightEvent event) {
|
||||
MultipartEventHandler$.MODULE$.drawBlockHighlight(event);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void serverTick(TickEvent.ServerTickEvent event) {
|
||||
MultipartEventHandler$.MODULE$.serverTick(event);
|
||||
}
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
package codechicken.multipart.handler
|
||||
|
||||
import codechicken.multipart.{
|
||||
TileCache,
|
||||
TileMultipart,
|
||||
MultiPartRegistry,
|
||||
BlockMultipart
|
||||
}
|
||||
import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent}
|
||||
import net.minecraft.server.MinecraftServer
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import net.minecraftforge.event.world._
|
||||
import java.util.EnumSet
|
||||
import scala.collection.JavaConverters._
|
||||
import java.util.List
|
||||
import net.minecraft.entity.player.EntityPlayerMP
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import net.minecraftforge.client.event.DrawBlockHighlightEvent
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import net.minecraft.util.MovingObjectPosition.MovingObjectType
|
||||
import cpw.mods.fml.common.gameevent.TickEvent
|
||||
|
||||
object MultipartEventHandler {
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
def tileEntityLoad(event: ChunkDataEvent.Load) {
|
||||
MultipartSaveLoad.loadTiles(event.getChunk)
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
def worldUnLoad(event: WorldEvent.Unload) {
|
||||
MultipartSPH.onWorldUnload(event.world)
|
||||
if (event.world.isRemote) {
|
||||
TileCache.clear()
|
||||
} else {
|
||||
MultipartSaveLoad.loadingWorld = null
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
def chunkWatch(event: ChunkWatchEvent.Watch) {
|
||||
MultipartSPH.onChunkWatch(event.player, event.chunk)
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
def chunkUnWatch(event: ChunkWatchEvent.UnWatch) {
|
||||
MultipartSPH.onChunkUnWatch(event.player, event.chunk)
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
def drawBlockHighlight(event: DrawBlockHighlightEvent) {
|
||||
if (
|
||||
event.target != null && event.target.typeOfHit == MovingObjectType.BLOCK &&
|
||||
event.player.worldObj
|
||||
.getTileEntity(
|
||||
event.target.blockX,
|
||||
event.target.blockY,
|
||||
event.target.blockZ
|
||||
)
|
||||
.isInstanceOf[TileMultipart]
|
||||
) {
|
||||
if (
|
||||
BlockMultipart.drawHighlight(
|
||||
event.player.worldObj,
|
||||
event.player,
|
||||
event.target,
|
||||
event.partialTicks
|
||||
)
|
||||
)
|
||||
event.setCanceled(true)
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
def serverTick(event: TickEvent.ServerTickEvent) {
|
||||
if (event.phase == TickEvent.Phase.END)
|
||||
MultipartSPH.onTickEnd(
|
||||
MinecraftServer.getServer.getConfigurationManager.playerEntityList
|
||||
.asInstanceOf[List[EntityPlayerMP]]
|
||||
.asScala
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -78,8 +78,8 @@ class MultipartProxy_serverImpl {
|
||||
def init() {}
|
||||
|
||||
def postInit() {
|
||||
FMLCommonHandler.instance().bus().register(MultipartEventHandler)
|
||||
MinecraftForge.EVENT_BUS.register(MultipartEventHandler)
|
||||
FMLCommonHandler.instance().bus().register(MultipartEventHandler$.MODULE$)
|
||||
MinecraftForge.EVENT_BUS.register(MultipartEventHandler$.MODULE$)
|
||||
PacketCustom.assignHandler(MultipartSPH.channel, MultipartSPH)
|
||||
PacketCustom.assignHandshakeHandler(
|
||||
MultipartSPH.registryChannel,
|
||||
|
||||
Reference in new issue
Block a user