From 1087daa2f402f8c74014144667314063aa934364 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 15 Oct 2016 13:59:08 +0200 Subject: [PATCH] stat/entity/tracker mappings --- .../net/minecraft/entity/EntityLiving.mapping | 4 ++++ .../decoration/EntityArmorStand.mapping | 2 ++ .../entity/mob/EntityHostile.mapping | 2 ++ .../entity/player/EntityPlayer.mapping | 6 ++++++ .../entity/player/EntityPlayerServer.mapping | 21 +++++++++++++++++++ .../entity/projectile/EntityFishHook.mapping | 1 + .../config/ServerConfigurationManager.mapping | 3 +++ mappings/net/minecraft/stat/Stat.mapping | 4 ++++ mappings/net/minecraft/stat/StatEntry.mapping | 9 ++++++++ .../net/minecraft/stat/StatManager.mapping | 10 +++++++++ .../minecraft/stat/StatManagerServer.mapping | 3 +++ .../stat/achievement/Achievement.mapping | 4 ++++ .../world/ChunkPlayerTrackerMap.mapping | 15 ++++++++----- .../world/entity/WorldEntityTracker.mapping | 2 ++ .../entity/WorldEntityTrackingManager.mapping | 2 ++ mappings/none/nw.mapping | 1 - 16 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 mappings/net/minecraft/stat/StatEntry.mapping delete mode 100644 mappings/none/nw.mapping diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index 3f53428140..38cb1f246c 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -104,6 +104,8 @@ CLASS none/sp net/minecraft/entity/EntityLiving METHOD d (Lnone/rz;)V METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD e getSoundFall (I)Lnone/nk; + ARG 0 height METHOD f getForwardVector (F)Lnone/bcv; ARG 0 lerpTime METHOD f setStuckArrows (I)V @@ -113,5 +115,7 @@ CLASS none/sp net/minecraft/entity/EntityLiving METHOD i initDataTracker ()V METHOD l_ isChild ()Z METHOD m_ canClimb ()Z + METHOD n (F)V + ARG 0 value METHOD p stopRiding ()V METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping index 4461be5384..d93905128f 100644 --- a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping @@ -67,6 +67,8 @@ CLASS none/yn net/minecraft/entity/decoration/EntityArmorStand METHOD cw getMainHand ()Lnone/so; METHOD d setRightArmRotation (Lnone/dh;)V ARG 0 rotation + METHOD e getSoundFall (I)Lnone/nk; + ARG 0 height METHOD e setLeftLegRotation (Lnone/dh;)V ARG 0 rotation METHOD f setRightLegRotation (Lnone/dh;)V diff --git a/mappings/net/minecraft/entity/mob/EntityHostile.mapping b/mappings/net/minecraft/entity/mob/EntityHostile.mapping index 7090e8297e..3f5a86a190 100644 --- a/mappings/net/minecraft/entity/mob/EntityHostile.mapping +++ b/mappings/net/minecraft/entity/mob/EntityHostile.mapping @@ -9,4 +9,6 @@ CLASS none/zq net/minecraft/entity/mob/EntityHostile METHOD bG canDropLootAndXp ()Z METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD e getSoundFall (I)Lnone/nk; + ARG 0 height METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 4df4cb0781..d7bdf485e0 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -136,6 +136,8 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer METHOD df getItemCooldownManager ()Lnone/aer; METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD e getSoundFall (I)Lnone/nk; + ARG 0 height METHOD e (Lnone/aam;)Z METHOD f attack (Lnone/sg;)V ARG 0 entity @@ -145,10 +147,14 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer METHOD h_ getName ()Ljava/lang/String; METHOD i initDataTracker ()V METHOD i_ getNameComponent ()Lnone/fa; + METHOD l createCooldownManager ()Lnone/aer; METHOD m addScore (I)V ARG 0 amount + METHOD n (F)V + ARG 0 value METHOD n setReducedDebugInfo (Z)V ARG 0 value + METHOD o checkBiomeExplorationAchievement ()V METHOD p stopRiding ()V METHOD y isSpectator ()Z METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 73520faa88..96e333616c 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -2,14 +2,27 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer FIELD a networkHandler Lnone/mg; FIELD b server Lnet/minecraft/server/MinecraftServer; FIELD bS LOGGER Lorg/apache/logging/log4j/Logger; + FIELD bT language Ljava/lang/String; FIELD bV statManager Lnone/nt; + FIELD bW lastScoreHealth F + FIELD bX lastScoreFood I + FIELD bY lastScoreBreath I + FIELD bZ lastScoreArmor I + FIELD ca lastScoreExperience I + FIELD cb lastScoreExperienceLevel I + FIELD cc lastSyncedHealth F + FIELD cd lastSyncedFoodLevel I + FIELD ce lastSyncedSaturationLevel Z + FIELD cf lastSyncedExperienceLevel I FIELD ch chatVisibility Lnone/aam$b; + FIELD ci chatColorsEnabled Z FIELD ck cameraEntity Lnone/sg; METHOD (Lnet/minecraft/server/MinecraftServer;Lnone/lu;Lcom/mojang/authlib/GameProfile;Lnone/lx;)V ARG 0 server ARG 1 world METHOD A getIpAddress ()Ljava/lang/String; METHOD C getChatVisibility ()Lnone/aam$b; + METHOD E getStatManager ()Lnone/nt; METHOD F updatePotionVisibility ()V METHOD G getCameraEntity ()Lnone/sg; METHOD H updatePortalCooldown ()V @@ -36,6 +49,9 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer METHOD a openVillagerGui (Lnone/aih;)V METHOD a openCommandBlock (Lnone/arh;)V METHOD a openSignEditor (Lnone/arw;)V + METHOD a setScore (Lnone/bdh;I)V + ARG 0 criterion + ARG 1 value METHOD a trySleep (Lnone/cn;)Lnone/aam$a; ARG 0 pos METHOD a deserializeCustomData (Lnone/dt;)V @@ -43,6 +59,8 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer METHOD a appendCommandFeedback (Lnone/fa;)V ARG 0 component METHOD a addChatMsg (Lnone/fa;Z)V + METHOD a setClientSettings (Lnone/iq;)V + ARG 0 clientSettings METHOD a increaseStat (Lnone/nu;I)V ARG 0 stat ARG 1 points @@ -74,6 +92,9 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer ARG 0 entity METHOD f attack (Lnone/sg;)V ARG 0 entity + METHOD k_ updateNetwork ()V + METHOD l createCooldownManager ()Lnone/aer; + METHOD o checkBiomeExplorationAchievement ()V METHOD p stopRiding ()V METHOD s closeGui ()V METHOD x getWorldServer ()Lnone/lu; diff --git a/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping b/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping index 4a93aedfe4..66c43f7186 100644 --- a/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping @@ -1,4 +1,5 @@ CLASS none/yt net/minecraft/entity/projectile/EntityFishHook + FIELD a owner Lnone/aam; FIELD c HOOK_ENTITY_ID Lnone/kj; METHOD T invalidate ()V METHOD a (DDDFFIZ)V diff --git a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping index c303bdab3f..de58494a49 100644 --- a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping @@ -48,6 +48,7 @@ CLASS none/mr net/minecraft/server/config/ServerConfigurationManager ARG 0 server METHOD a reloadWhitelist ()V METHOD a setViewDistance (I)V + ARG 0 value METHOD a addToOperators (Lcom/mojang/authlib/GameProfile;)V ARG 0 profile METHOD a getPlayerByName (Ljava/lang/String;)Lnone/lw; @@ -57,6 +58,8 @@ CLASS none/mr net/minecraft/server/config/ServerConfigurationManager ARG 1 gameProfile METHOD a getPlayer (Ljava/util/UUID;)Lnone/lw; ARG 0 uuid + METHOD a getStatManager (Lnone/aam;)Lnone/nt; + ARG 0 player METHOD a sendToAllPlayersInRange (Lnone/aam;DDDDILnone/fl;)V ARG 0 except ARG 1 x diff --git a/mappings/net/minecraft/stat/Stat.mapping b/mappings/net/minecraft/stat/Stat.mapping index 293dcdff19..ee97b287c1 100644 --- a/mappings/net/minecraft/stat/Stat.mapping +++ b/mappings/net/minecraft/stat/Stat.mapping @@ -14,6 +14,7 @@ CLASS none/nu net/minecraft/stat/Stat FIELD a name Lnone/fa; FIELD b formatter Lnone/nv; FIELD c objectiveCriteria Lnone/bdh; + FIELD d extraDataLoader Ljava/lang/Class; FIELD e id Ljava/lang/String; FIELD f awardLocallyOnly Z FIELD g FORMATTER_INTEGER Lnone/nv; @@ -31,6 +32,8 @@ CLASS none/nu net/minecraft/stat/Stat ARG 2 statFormatter METHOD a format (I)Ljava/lang/String; ARG 0 statValue + METHOD b setExtraDataLoader (Ljava/lang/Class;)Lnone/nu; + ARG 0 value METHOD d isAchievement ()Z METHOD e getName ()Lnone/fa; METHOD equals (Ljava/lang/Object;)Z @@ -39,5 +42,6 @@ CLASS none/nu net/minecraft/stat/Stat METHOD i awardStatLocallyOnly ()Lnone/nu; METHOD j getNameStyled ()Lnone/fa; METHOD k getObjectiveCriteria ()Lnone/bdh; + METHOD l getExtraDataLoader ()Ljava/lang/Class; METHOD m getNumberFormat ()Ljava/text/NumberFormat; METHOD n getDecimalFormat ()Ljava/text/DecimalFormat; diff --git a/mappings/net/minecraft/stat/StatEntry.mapping b/mappings/net/minecraft/stat/StatEntry.mapping new file mode 100644 index 0000000000..31a7ad6e4f --- /dev/null +++ b/mappings/net/minecraft/stat/StatEntry.mapping @@ -0,0 +1,9 @@ +CLASS none/nw net/minecraft/stat/StatEntry + FIELD a value I + FIELD b extraData Lnone/nx; + METHOD a get ()I + METHOD a set (I)V + ARG 0 value + METHOD a setExtraData (Lnone/nx;)V + ARG 0 value + METHOD b getExtraData ()Lnone/nx; diff --git a/mappings/net/minecraft/stat/StatManager.mapping b/mappings/net/minecraft/stat/StatManager.mapping index 791589cabf..be3fc64cd5 100644 --- a/mappings/net/minecraft/stat/StatManager.mapping +++ b/mappings/net/minecraft/stat/StatManager.mapping @@ -1 +1,11 @@ CLASS none/nz net/minecraft/stat/StatManager + FIELD a stats Ljava/util/Map; + METHOD a isAchievementUnlocked (Lnone/no;)Z + ARG 0 achievement + METHOD a getValue (Lnone/nu;)I + ARG 0 stat + METHOD a setExtraData (Lnone/nu;Lnone/nx;)Lnone/nx; + ARG 0 stat + ARG 1 value + METHOD b getExtraData (Lnone/nu;)Lnone/nx; + ARG 0 stat diff --git a/mappings/net/minecraft/stat/StatManagerServer.mapping b/mappings/net/minecraft/stat/StatManagerServer.mapping index 16627fa1a8..fdfb7e5bb4 100644 --- a/mappings/net/minecraft/stat/StatManagerServer.mapping +++ b/mappings/net/minecraft/stat/StatManagerServer.mapping @@ -6,4 +6,7 @@ CLASS none/nt net/minecraft/stat/StatManagerServer ARG 0 server ARG 1 statFile METHOD a load ()V + METHOD a deserialize (Ljava/lang/String;)Ljava/util/Map; METHOD b save ()V + METHOD b (Lnone/lw;)V + ARG 0 player diff --git a/mappings/net/minecraft/stat/achievement/Achievement.mapping b/mappings/net/minecraft/stat/achievement/Achievement.mapping index ab6a8a4918..590da6f170 100644 --- a/mappings/net/minecraft/stat/achievement/Achievement.mapping +++ b/mappings/net/minecraft/stat/achievement/Achievement.mapping @@ -27,7 +27,11 @@ CLASS none/no net/minecraft/stat/achievement/Achievement ARG 4 displayBlock ARG 5 parent METHOD a awardStatLocallyOnly ()Lnone/no; + METHOD a setExtraDataLoader (Ljava/lang/Class;)Lnone/no; + ARG 0 value METHOD b setSpecial ()Lnone/no; + METHOD b setExtraDataLoader (Ljava/lang/Class;)Lnone/nu; + ARG 0 value METHOD c register ()Lnone/no; METHOD d isAchievement ()Z METHOD e getName ()Lnone/fa; diff --git a/mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping b/mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping index 65c6828a29..dc1195a7be 100644 --- a/mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping +++ b/mappings/net/minecraft/world/ChunkPlayerTrackerMap.mapping @@ -18,23 +18,28 @@ CLASS none/ma net/minecraft/world/ChunkPlayerTrackerMap ARG 0 chunkDistance METHOD a contains (II)Z ARG 0 chunkX - ARG 1 chunZ + ARG 1 chunkZ METHOD a markBlockDirty (Lnone/cn;)V ARG 0 pos METHOD a registerPlayer (Lnone/lw;)V ARG 0 player + METHOD a isObservingChunk (Lnone/lw;II)Z + ARG 0 player + ARG 1 chunkX + ARG 2 chunkZ METHOD a markTrackerDirty (Lnone/lz;)V ARG 0 chunkManager METHOD b get (II)Lnone/lz; - ARG 0 x - ARG 1 z + ARG 0 chunkX + ARG 1 chunkZ METHOD b unregisterPlayer (Lnone/lw;)V + ARG 0 player METHOD b remove (Lnone/lz;)V ARG 0 object METHOD c update ()V METHOD c getOrCreate (II)Lnone/lz; - ARG 0 x - ARG 1 z + ARG 0 chunkX + ARG 1 chunkZ METHOD d chunkPosAsLong (II)J ARG 0 chunkX ARG 1 chunkZ diff --git a/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping b/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping index dd5b289085..b42f13eb49 100644 --- a/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping +++ b/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping @@ -16,5 +16,7 @@ CLASS none/ly net/minecraft/world/entity/WorldEntityTracker METHOD b sendToAllTrackingAndSelf (Lnone/fl;)V ARG 0 packet METHOD e getSpawnPacket ()Lnone/fl; + METHOD e isObservingEntity (Lnone/lw;)Z + ARG 0 player METHOD equals (Ljava/lang/Object;)Z ARG 0 other diff --git a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping index 0f312feb3f..ab07ddd077 100644 --- a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping +++ b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping @@ -7,6 +7,8 @@ CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager FIELD d trackersById Lnone/om; METHOD (Lnone/lu;)V ARG 0 world + METHOD a setChunkDistance (I)V + ARG 0 value METHOD a sendChunkEntityData (Lnone/lw;Lnone/atp;)V ARG 0 player ARG 1 chunk diff --git a/mappings/none/nw.mapping b/mappings/none/nw.mapping deleted file mode 100644 index e41afb930f..0000000000 --- a/mappings/none/nw.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/nw