From 792681f8a0bca9d19e3dd5fd2b6da3124194e8d8 Mon Sep 17 00:00:00 2001 From: copygirl Date: Sat, 15 Oct 2016 11:15:33 +0200 Subject: [PATCH] Map world event (#109) --- .../handler/NetworkGameHandlerClient.mapping | 2 +- .../net/minecraft/client/render/bpb.mapping | 9 +++++++++ .../handler/INetworkGameHandlerClient.mapping | 2 +- ...ffect.mapping => CPacketWorldEvent.mapping} | 18 +++++++++--------- .../net/minecraft/world/IWorldListener.mapping | 9 +++++++++ mappings/net/minecraft/world/World.mapping | 13 +++++++++++++ .../world/WorldListenerServer.mapping | 9 +++++++++ mappings/none/vx.mapping | 9 +++++++++ 8 files changed, 60 insertions(+), 11 deletions(-) rename mappings/net/minecraft/network/packet/client/{CPacketEffect.mapping => CPacketWorldEvent.mapping} (54%) diff --git a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping index f1fff5622e..e7d2d1da58 100644 --- a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping @@ -79,7 +79,7 @@ CLASS none/bmf net/minecraft/client/network/handler/NetworkGameHandlerClient ARG 0 packet METHOD a onChunkData (Lnone/gv;)V ARG 0 packet - METHOD a onEffect (Lnone/gw;)V + METHOD a onWorldEvent (Lnone/gw;)V ARG 0 packet METHOD a onParticle (Lnone/gx;)V ARG 0 packet diff --git a/mappings/net/minecraft/client/render/bpb.mapping b/mappings/net/minecraft/client/render/bpb.mapping index 780358d39b..afa1983950 100644 --- a/mappings/net/minecraft/client/render/bpb.mapping +++ b/mappings/net/minecraft/client/render/bpb.mapping @@ -11,9 +11,18 @@ CLASS none/bpb net/minecraft/client/render/bpb FIELD z destroyStages [Lnone/bxe; METHOD (Lnone/bdr;)V ARG 0 game + METHOD a onGlobalWorldEvent (ILnone/cn;I)V + ARG 0 eventId + ARG 1 pos + ARG 2 data METHOD a onParticle (IZDDDDDD[I)V ARG 0 typeId ARG 1 ignoreRange + METHOD a onWorldEvent (Lnone/aam;ILnone/cn;I)V + ARG 0 player + ARG 1 eventId + ARG 2 pos + ARG 3 data METHOD a onSound (Lnone/aam;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound diff --git a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping index 8032e6e56b..3dcab95337 100644 --- a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping @@ -65,7 +65,7 @@ CLASS none/fo net/minecraft/network/handler/INetworkGameHandlerClient ARG 0 packet METHOD a onChunkData (Lnone/gv;)V ARG 0 packet - METHOD a onEffect (Lnone/gw;)V + METHOD a onWorldEvent (Lnone/gw;)V ARG 0 packet METHOD a onParticle (Lnone/gx;)V ARG 0 packet diff --git a/mappings/net/minecraft/network/packet/client/CPacketEffect.mapping b/mappings/net/minecraft/network/packet/client/CPacketWorldEvent.mapping similarity index 54% rename from mappings/net/minecraft/network/packet/client/CPacketEffect.mapping rename to mappings/net/minecraft/network/packet/client/CPacketWorldEvent.mapping index 32350b686b..055877b793 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketEffect.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketWorldEvent.mapping @@ -1,21 +1,21 @@ -CLASS none/gw net/minecraft/network/packet/client/CPacketEffect - FIELD a effectId I +CLASS none/gw net/minecraft/network/packet/client/CPacketWorldEvent + FIELD a eventId I FIELD b pos Lnone/cn; - FIELD c effectData I - FIELD d disableRelativeVolume Z + FIELD c data I + FIELD d global Z METHOD (ILnone/cn;IZ)V - ARG 0 effectId + ARG 0 eventId ARG 1 pos - ARG 2 effectData - ARG 3 disableRelativeVolume - METHOD a disableRelativeVolume ()Z + ARG 2 data + ARG 3 global + METHOD a isGlobal ()Z METHOD a readPacket (Lnone/es;)V ARG 0 packet METHOD a applyPacket (Lnone/ev;)V ARG 0 handler METHOD a applyPacket (Lnone/fo;)V ARG 0 handler - METHOD b getEffectId ()I + METHOD b getEventId ()I METHOD b writePacket (Lnone/es;)V ARG 0 packet METHOD c getEffectData ()I diff --git a/mappings/net/minecraft/world/IWorldListener.mapping b/mappings/net/minecraft/world/IWorldListener.mapping index 0712b61acb..453d57d61d 100644 --- a/mappings/net/minecraft/world/IWorldListener.mapping +++ b/mappings/net/minecraft/world/IWorldListener.mapping @@ -1,7 +1,16 @@ CLASS none/aiy net/minecraft/world/IWorldListener + METHOD a onGlobalWorldEvent (ILnone/cn;I)V + ARG 0 eventId + ARG 1 pos + ARG 2 data METHOD a onParticle (IZDDDDDD[I)V ARG 0 typeId ARG 1 ignoreRange + METHOD a onWorldEvent (Lnone/aam;ILnone/cn;I)V + ARG 0 player + ARG 1 eventId + ARG 2 pos + ARG 3 data METHOD a onSound (Lnone/aam;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 10dc2bc388..84b59cb366 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -83,6 +83,10 @@ CLASS none/aiw net/minecraft/world/World METHOD a isChunkLoaded (IIZ)Z ARG 0 chunkX ARG 1 chunkZ + METHOD a fireGlobalWorldEvent (ILnone/cn;I)V + ARG 0 eventId + ARG 1 pos + ARG 2 data METHOD a spawnParticle (IZDDDDDD[I)V ARG 0 typeId ARG 1 ignoreRange @@ -103,6 +107,11 @@ CLASS none/aiw net/minecraft/world/World ARG 5 category ARG 6 volume ARG 7 pitch + METHOD a fireWorldEvent (Lnone/aam;ILnone/cn;I)V + ARG 0 player + ARG 1 eventId + ARG 2 pos + ARG 3 data METHOD a playSound (Lnone/aam;Lnone/cn;Lnone/nk;Lnone/nm;FF)V ARG 0 player ARG 1 pos @@ -201,6 +210,10 @@ CLASS none/aiw net/minecraft/world/World METHOD b ()Lnone/aiw; METHOD b setSeaLevel (I)V ARG 0 seaLevel + METHOD b fireWorldEvent (ILnone/cn;I)V + ARG 0 eventId + ARG 1 pos + ARG 2 data METHOD b setTimeOfDay (J)V ARG 0 value METHOD b getPlayers (Ljava/lang/Class;Lcom/google/common/base/Predicate;)Ljava/util/List; diff --git a/mappings/net/minecraft/world/WorldListenerServer.mapping b/mappings/net/minecraft/world/WorldListenerServer.mapping index f241864955..171a2e5610 100644 --- a/mappings/net/minecraft/world/WorldListenerServer.mapping +++ b/mappings/net/minecraft/world/WorldListenerServer.mapping @@ -1,9 +1,18 @@ CLASS none/lv net/minecraft/world/WorldListenerServer FIELD a server Lnet/minecraft/server/MinecraftServer; FIELD b world Lnone/lu; + METHOD a onGlobalWorldEvent (ILnone/cn;I)V + ARG 0 eventId + ARG 1 pos + ARG 2 data METHOD a onParticle (IZDDDDDD[I)V ARG 0 typeId ARG 1 ignoreRange + METHOD a onWorldEvent (Lnone/aam;ILnone/cn;I)V + ARG 0 player + ARG 1 eventId + ARG 2 pos + ARG 3 data METHOD a onSound (Lnone/aam;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound diff --git a/mappings/none/vx.mapping b/mappings/none/vx.mapping index bd827584c6..1ef1a2e8cd 100644 --- a/mappings/none/vx.mapping +++ b/mappings/none/vx.mapping @@ -1,7 +1,16 @@ CLASS none/vx + METHOD a onGlobalWorldEvent (ILnone/cn;I)V + ARG 0 eventId + ARG 1 pos + ARG 2 data METHOD a onParticle (IZDDDDDD[I)V ARG 0 typeId ARG 1 ignoreRange + METHOD a onWorldEvent (Lnone/aam;ILnone/cn;I)V + ARG 0 player + ARG 1 eventId + ARG 2 pos + ARG 3 data METHOD a onSound (Lnone/aam;Lnone/nk;Lnone/nm;DDDFF)V ARG 0 player ARG 1 sound