diff --git a/mappings/cwy.mapping b/mappings/cwy.mapping deleted file mode 100644 index dad55a3248..0000000000 --- a/mappings/cwy.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS cwy - METHOD m getTeamNames ()Ljava/util/Collection; - METHOD n getSoundIds ()Ljava/util/Collection; - METHOD o getRecipeIds ()Ljava/util/Collection; diff --git a/mappings/mo.mapping b/mappings/mo.mapping index 28f2210a33..b79e9d7396 100644 --- a/mappings/mo.mapping +++ b/mappings/mo.mapping @@ -1,4 +1,5 @@ CLASS mo + METHOD a isErrorFatal ()Z METHOD a read (Lin;)V ARG 1 buf METHOD a apply (Liq;)V diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index 12fdab129d..ab2b116a78 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -7,20 +7,25 @@ CLASS dmf net/minecraft/client/audio/SoundLoader FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c GSON Lcom/google/gson/Gson; FIELD d TYPE Ljava/lang/reflect/ParameterizedType; + FIELD e sounds Ljava/util/Map; FIELD f soundManager Ldmd; FIELD g resourceManager Lvt; METHOD (Lvt;Lclr;)V ARG 1 manager ARG 2 settings METHOD Z_ tick ()V + METHOD a getKeys ()Ljava/util/Collection; METHOD a updateListenerPosition (Lapr;F)V ARG 1 listener + METHOD a isSoundResourcePresent (Ldlf;Lpu;)Z METHOD a play (Ldli;)V ARG 1 sound METHOD a registerListener (Ldme;)V ARG 1 listener METHOD a readSounds (Ljava/io/InputStream;)Ljava/util/Map; ARG 1 input + METHOD a get (Lpu;)Ldmg; + ARG 1 id METHOD a stopSounds (Lpu;Lwy;)V ARG 2 category METHOD a onResourceReload (Lvt;)V diff --git a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClientImpl.mapping b/mappings/net/minecraft/client/network/handler/ClientGameNetworkHandler.mapping similarity index 98% rename from mappings/net/minecraft/client/network/handler/NetworkGameHandlerClientImpl.mapping rename to mappings/net/minecraft/client/network/handler/ClientGameNetworkHandler.mapping index 16ac4a4909..76eae5a822 100644 --- a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClientImpl.mapping +++ b/mappings/net/minecraft/client/network/handler/ClientGameNetworkHandler.mapping @@ -1,4 +1,4 @@ -CLASS cwx net/minecraft/client/network/handler/NetworkGameHandlerClientImpl +CLASS cwx net/minecraft/client/network/handler/ClientGameNetworkHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b connection Lil; FIELD e game Lclp; diff --git a/mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl.mapping b/mappings/net/minecraft/client/network/handler/ClientLoginNetworkHandler.mapping similarity index 85% rename from mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl.mapping rename to mappings/net/minecraft/client/network/handler/ClientLoginNetworkHandler.mapping index 45028abd0f..0d19bc49cd 100644 --- a/mappings/net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl.mapping +++ b/mappings/net/minecraft/client/network/handler/ClientLoginNetworkHandler.mapping @@ -1,4 +1,4 @@ -CLASS cww net/minecraft/client/network/handler/NetworkLoginHandlerClientImpl +CLASS cww net/minecraft/client/network/handler/ClientLoginNetworkHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b game Lclp; FIELD c parentGui Lcpt; diff --git a/mappings/bz.mapping b/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping similarity index 56% rename from mappings/bz.mapping rename to mappings/net/minecraft/client/sortme/ClientCommandSource.mapping index 9eadf3d0a1..ac7207f7db 100644 --- a/mappings/bz.mapping +++ b/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping @@ -1,4 +1,6 @@ -CLASS bz +CLASS cwy net/minecraft/client/sortme/ClientCommandSource + FIELD a networkHandler Lcwx; + FIELD b game Lclp; METHOD m getTeamNames ()Ljava/util/Collection; METHOD n getSoundIds ()Ljava/util/Collection; METHOD o getRecipeIds ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping index 5e86c0c9cd..ec3c69edfd 100644 --- a/mappings/net/minecraft/command/CommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -1,6 +1,4 @@ -CLASS bx net/minecraft/command/CommandSource - FIELD i server Lnet/minecraft/server/MinecraftServer; - METHOD j getServer ()Lnet/minecraft/server/MinecraftServer; +CLASS bz net/minecraft/command/CommandSource METHOD m getTeamNames ()Ljava/util/Collection; METHOD n getSoundIds ()Ljava/util/Collection; METHOD o getRecipeIds ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 190f820df6..2a8f5184e8 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -31,7 +31,7 @@ CLASS afv net/minecraft/entity/Entity FIELD ak portalCooldown I FIELD al inPortal Z FIELD am portalTime I - FIELD an worldType Lbqj; + FIELD an dimension Lbqj; FIELD ao lastPortalPosition Leq; FIELD ar uuid Ljava/util/UUID; FIELD as uuidString Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 84003e942e..389ed03c78 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -1,6 +1,7 @@ CLASS uc net/minecraft/entity/player/EntityPlayerServer FIELD a networkHandler Luq; FIELD b server Lnet/minecraft/server/MinecraftServer; + FIELD cA enteredNetherPos Lcim; FIELD ca LOGGER_PLAYER Lorg/apache/logging/log4j/Logger; FIELD cv seenCredits Z FIELD cw recipeBook Lxb; @@ -76,6 +77,7 @@ CLASS uc net/minecraft/entity/player/EntityPlayerServer ARG 1 entity METHOD g createCooldownManager ()Laur; METHOD n initAi ()V + METHOD s getServerWorld ()Lua; METHOD t isSpectator ()Z METHOD u isCreative ()Z METHOD y getPermissionLevel ()I diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index d3d71150ee..9926b2df53 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -31,6 +31,7 @@ CLASS il net/minecraft/network/ClientConnection ARG 0 address METHOD a setupEncryption (Ljavax/crypto/SecretKey;)V ARG 1 key + METHOD a sendPacket (Ljl;)V METHOD a sendPacket (Ljl;Lio/netty/util/concurrent/GenericFutureListener;)V METHOD b getAddress ()Ljava/net/SocketAddress; METHOD c isLocal ()Z diff --git a/mappings/net/minecraft/network/PacketHandler.mapping b/mappings/net/minecraft/network/Packet.mapping similarity index 63% rename from mappings/net/minecraft/network/PacketHandler.mapping rename to mappings/net/minecraft/network/Packet.mapping index daa130e396..43c7b58bfe 100644 --- a/mappings/net/minecraft/network/PacketHandler.mapping +++ b/mappings/net/minecraft/network/Packet.mapping @@ -1,4 +1,5 @@ -CLASS jl net/minecraft/network/PacketHandler +CLASS jl net/minecraft/network/Packet + METHOD a isErrorFatal ()Z METHOD a read (Lin;)V ARG 1 buf METHOD a apply (Liq;)V diff --git a/mappings/net/minecraft/network/PacketEncoderException.mapping b/mappings/net/minecraft/network/PacketEncoderException.mapping new file mode 100644 index 0000000000..8ebd865a19 --- /dev/null +++ b/mappings/net/minecraft/network/PacketEncoderException.mapping @@ -0,0 +1 @@ +CLASS ir net/minecraft/network/PacketEncoderException diff --git a/mappings/net/minecraft/network/handler/NetworkLoginHandlerClient.mapping b/mappings/net/minecraft/network/handler/ClientLoginPacketListener.mapping similarity index 67% rename from mappings/net/minecraft/network/handler/NetworkLoginHandlerClient.mapping rename to mappings/net/minecraft/network/handler/ClientLoginPacketListener.mapping index 7db9ef8d3e..26ef3978bb 100644 --- a/mappings/net/minecraft/network/handler/NetworkLoginHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/ClientLoginPacketListener.mapping @@ -1,4 +1,4 @@ -CLASS op net/minecraft/network/handler/NetworkLoginHandlerClient +CLASS op net/minecraft/network/handler/ClientLoginPacketListener METHOD a (Lor;)V ARG 1 packet METHOD a (Los;)V diff --git a/mappings/net/minecraft/network/handler/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/network/handler/ClientPlayPacketListener.mapping similarity index 98% rename from mappings/net/minecraft/network/handler/NetworkGameHandlerClient.mapping rename to mappings/net/minecraft/network/handler/ClientPlayPacketListener.mapping index eba1e9caa2..d5fb574e9c 100644 --- a/mappings/net/minecraft/network/handler/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/ClientPlayPacketListener.mapping @@ -1,4 +1,4 @@ -CLASS jo net/minecraft/network/handler/NetworkGameHandlerClient +CLASS jo net/minecraft/network/handler/ClientPlayPacketListener METHOD a onEntitySpawn (Ljp;)V ARG 1 packet METHOD a onExperienceOrbSpawn (Ljq;)V diff --git a/mappings/net/minecraft/network/handler/ClientQueryPacketListener.mapping b/mappings/net/minecraft/network/handler/ClientQueryPacketListener.mapping new file mode 100644 index 0000000000..79b80d6fd6 --- /dev/null +++ b/mappings/net/minecraft/network/handler/ClientQueryPacketListener.mapping @@ -0,0 +1,5 @@ +CLASS pb net/minecraft/network/handler/ClientQueryPacketListener + METHOD a onPong (Lpc;)V + ARG 1 packet + METHOD a onResponse (Lpd;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/NetworkHandshakeHandlerServer.mapping b/mappings/net/minecraft/network/handler/NetworkHandshakeHandlerServer.mapping deleted file mode 100644 index a015c42add..0000000000 --- a/mappings/net/minecraft/network/handler/NetworkHandshakeHandlerServer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS on net/minecraft/network/handler/NetworkHandshakeHandlerServer diff --git a/mappings/net/minecraft/network/handler/NetworkLoginHandlerServer.mapping b/mappings/net/minecraft/network/handler/NetworkLoginHandlerServer.mapping deleted file mode 100644 index ba75ceb251..0000000000 --- a/mappings/net/minecraft/network/handler/NetworkLoginHandlerServer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ov net/minecraft/network/handler/NetworkLoginHandlerServer diff --git a/mappings/net/minecraft/network/handler/NetworkPlayHandlerServer.mapping b/mappings/net/minecraft/network/handler/NetworkPlayHandlerServer.mapping deleted file mode 100644 index 3a0cb71d02..0000000000 --- a/mappings/net/minecraft/network/handler/NetworkPlayHandlerServer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS mw net/minecraft/network/handler/NetworkPlayHandlerServer - METHOD a onBookUpdate (Lni;)V diff --git a/mappings/net/minecraft/network/handler/NetworkQueryHandlerClient.mapping b/mappings/net/minecraft/network/handler/NetworkQueryHandlerClient.mapping deleted file mode 100644 index 0913fa0e98..0000000000 --- a/mappings/net/minecraft/network/handler/NetworkQueryHandlerClient.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS pb net/minecraft/network/handler/NetworkQueryHandlerClient - METHOD a (Lpc;)V - ARG 1 packet - METHOD a (Lpd;)V - ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/NetworkQueryHandlerServer.mapping b/mappings/net/minecraft/network/handler/NetworkQueryHandlerServer.mapping deleted file mode 100644 index 85ae5394e9..0000000000 --- a/mappings/net/minecraft/network/handler/NetworkQueryHandlerServer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS pf net/minecraft/network/handler/NetworkQueryHandlerServer diff --git a/mappings/net/minecraft/network/handler/ServerHandshakePacketListener.mapping b/mappings/net/minecraft/network/handler/ServerHandshakePacketListener.mapping new file mode 100644 index 0000000000..9f3ccec611 --- /dev/null +++ b/mappings/net/minecraft/network/handler/ServerHandshakePacketListener.mapping @@ -0,0 +1,3 @@ +CLASS on net/minecraft/network/handler/ServerHandshakePacketListener + METHOD a onHandshake (Lom;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/ServerLoginPacketListener.mapping b/mappings/net/minecraft/network/handler/ServerLoginPacketListener.mapping new file mode 100644 index 0000000000..e2d4347ef9 --- /dev/null +++ b/mappings/net/minecraft/network/handler/ServerLoginPacketListener.mapping @@ -0,0 +1 @@ +CLASS ov net/minecraft/network/handler/ServerLoginPacketListener diff --git a/mappings/net/minecraft/network/handler/NetworkPlayHandlerServerImpl.mapping b/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping similarity index 79% rename from mappings/net/minecraft/network/handler/NetworkPlayHandlerServerImpl.mapping rename to mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping index f5d14428ed..b9589ae673 100644 --- a/mappings/net/minecraft/network/handler/NetworkPlayHandlerServerImpl.mapping +++ b/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping @@ -1,4 +1,4 @@ -CLASS uq net/minecraft/network/handler/NetworkPlayHandlerServerImpl +CLASS uq net/minecraft/network/handler/ServerPlayNetworkHandler FIELD a connection Lil; FIELD b player Luc; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; @@ -9,4 +9,5 @@ CLASS uq net/minecraft/network/handler/NetworkPlayHandlerServerImpl ARG 1 reason METHOD a sendPacket (Ljl;)V METHOD a sendPacket (Ljl;Lio/netty/util/concurrent/GenericFutureListener;)V + METHOD a onCustomPayload (Lnh;)V METHOD a onBookUpdate (Lni;)V diff --git a/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping new file mode 100644 index 0000000000..0d8b69fb33 --- /dev/null +++ b/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping @@ -0,0 +1,3 @@ +CLASS mw net/minecraft/network/handler/ServerPlayPacketListener + METHOD a onCustomPayload (Lnh;)V + METHOD a onBookUpdate (Lni;)V diff --git a/mappings/net/minecraft/network/handler/ServerQueryPacketListener.mapping b/mappings/net/minecraft/network/handler/ServerQueryPacketListener.mapping new file mode 100644 index 0000000000..1e1981e986 --- /dev/null +++ b/mappings/net/minecraft/network/handler/ServerQueryPacketListener.mapping @@ -0,0 +1,5 @@ +CLASS pf net/minecraft/network/handler/ServerQueryPacketListener + METHOD a onPing (Lpg;)V + ARG 1 packet + METHOD a onRequest (Lph;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/client/CPacketChatMessage.mapping b/mappings/net/minecraft/network/packet/client/CPacketChatMessage.mapping index c540dbb543..33bbcaa9cb 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketChatMessage.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketChatMessage.mapping @@ -3,6 +3,7 @@ CLASS kd net/minecraft/network/packet/client/CPacketChatMessage FIELD b location Liv; METHOD (Lix;)V ARG 1 message + METHOD a isErrorFatal ()Z METHOD a read (Lin;)V ARG 1 buf METHOD a apply (Liq;)V diff --git a/mappings/net/minecraft/network/packet/client/CPacketCustomPayload.mapping b/mappings/net/minecraft/network/packet/client/CPacketCustomPayload.mapping index 0b29552006..340d8ec8cc 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketCustomPayload.mapping @@ -1,7 +1,16 @@ CLASS ko net/minecraft/network/packet/client/CPacketCustomPayload + FIELD a TRADER_LIST Lpu; + FIELD b BRAND Lpu; + FIELD c BOOK_OPEN Lpu; + FIELD d DEBUG_PATH Lpu; + FIELD e DEBUG_NEIGHBORS_UPDATE Lpu; + FIELD f DEBUG_CAVES Lpu; + FIELD g DEBUG_STRUCTURES Lpu; + FIELD h DEBUG_WORLDGEN_ATTEMPT Lpu; FIELD i channel Lpu; FIELD j data Lin; METHOD (Lpu;Lin;)V + ARG 1 channel ARG 2 data METHOD a read (Lin;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/client/CPacketEventCombat.mapping b/mappings/net/minecraft/network/packet/client/CPacketEventCombat.mapping index a160f71a40..7b8c5e0944 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketEventCombat.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketEventCombat.mapping @@ -8,6 +8,7 @@ CLASS lh net/minecraft/network/packet/client/CPacketEventCombat FIELD c attackerEntityId I FIELD d timeSinceLastAttack I FIELD e deathMessage Lix; + METHOD a isErrorFatal ()Z METHOD a read (Lin;)V ARG 1 buf METHOD a apply (Liq;)V diff --git a/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping b/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping index 4d2e384561..771a734574 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping @@ -25,5 +25,6 @@ CLASS la net/minecraft/network/packet/client/CPacketGameJoin ARG 1 buf METHOD c isHardcore ()Z METHOD d getGameMode ()Lazq; + METHOD e getDimension ()Lbqj; METHOD f getDifficulty ()Laem; METHOD i hasReducedDebugInfo ()Z diff --git a/mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping b/mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping new file mode 100644 index 0000000000..76902928fe --- /dev/null +++ b/mappings/net/minecraft/network/packet/server/SPacketCustomPayload.mapping @@ -0,0 +1,15 @@ +CLASS nh net/minecraft/network/packet/server/SPacketCustomPayload + FIELD a BRAND Lpu; + FIELD b channel Lpu; + FIELD c data Lin; + METHOD (Lpu;Lin;)V + ARG 1 channel + ARG 2 data + METHOD a read (Lin;)V + ARG 1 buf + METHOD a apply (Liq;)V + ARG 1 handler + METHOD a apply (Lmw;)V + ARG 1 handler + METHOD b write (Lin;)V + ARG 1 buf diff --git a/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping b/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping index 37630509d8..359d103294 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping @@ -1,3 +1,5 @@ CLASS xb net/minecraft/recipe/book/RecipeBookServer FIELD g LOGGER Lorg/apache/logging/log4j/Logger; FIELD h manager Laxc; + METHOD a fromTag (Lhm;)V + METHOD e toTag ()Lhm; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardBase.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping similarity index 91% rename from mappings/net/minecraft/scoreboard/ScoreboardBase.mapping rename to mappings/net/minecraft/scoreboard/Scoreboard.mapping index f04aebe6df..a14588e7f2 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardBase.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -1,4 +1,4 @@ -CLASS cjk net/minecraft/scoreboard/ScoreboardBase +CLASS cjk net/minecraft/scoreboard/Scoreboard FIELD a objectives Ljava/util/Map; FIELD b objectivesByCriterion Ljava/util/Map; FIELD c playerObjectives Ljava/util/Map; @@ -19,6 +19,7 @@ CLASS cjk net/minecraft/scoreboard/ScoreboardBase ARG 1 team METHOD a updateScore (Lcjj;)V ARG 1 value + METHOD a fromTag (Lhs;)V METHOD a updatePlayerScore (Ljava/lang/String;)V ARG 1 playerName METHOD a updatePlayerScore (Ljava/lang/String;Lcjh;)V @@ -32,6 +33,8 @@ CLASS cjk net/minecraft/scoreboard/ScoreboardBase ARG 1 value METHOD b updateScoreboardTeam (Lcji;)V ARG 1 team + METHOD b containsObjective (Ljava/lang/String;)Z + ARG 1 name METHOD b playerHasObjective (Ljava/lang/String;Lcjh;)Z ARG 1 playerName ARG 2 objective @@ -46,6 +49,7 @@ CLASS cjk net/minecraft/scoreboard/ScoreboardBase METHOD c getPlayerScore (Ljava/lang/String;Lcjh;)Lcjj; ARG 1 player ARG 2 objective + METHOD d getObjectiveNames ()Ljava/util/Collection; METHOD d removeTeam (Lcji;)V ARG 1 team METHOD d resetPlayerScore (Ljava/lang/String;Lcjh;)V @@ -63,6 +67,7 @@ CLASS cjk net/minecraft/scoreboard/ScoreboardBase METHOD h getDisplaySlotNames ()[Ljava/lang/String; METHOD h clearPlayerTeam (Ljava/lang/String;)Z ARG 1 player + METHOD i toTag ()Lhs; METHOD i getAllPlayerScores (Lcjh;)Ljava/util/Collection; ARG 1 objective METHOD i getPlayerTeam (Ljava/lang/String;)Lcji; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index 1b7b7d0f80..163c3c7fb7 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -19,6 +19,8 @@ CLASS cjn net/minecraft/scoreboard/ScoreboardCriterion FIELD m TEAM_KILLS [Lcjn; FIELD n KILLED_BY_TEAMS [Lcjn; FIELD o name Ljava/lang/String; + FIELD p readOnly Z FIELD q criterionType Lcjn$a; METHOD c getName ()Ljava/lang/String; + METHOD d isReadOnly ()Z METHOD e getCriterionType ()Lcjn$a; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping b/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping index 8b469b7a00..2ddcc40b55 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping @@ -1,22 +1,28 @@ CLASS cjj net/minecraft/scoreboard/ScoreboardPlayerScore + FIELD a COMPARATOR Ljava/util/Comparator; FIELD b scoreboard Lcjk; FIELD c objective Lcjh; FIELD d playerName Ljava/lang/String; FIELD e score I - FIELD f disabled Z + FIELD f locked Z FIELD g forceUpdate Z + METHOD ()V + ARG 0 first + ARG 1 second METHOD (Lcjk;Lcjh;Ljava/lang/String;)V ARG 1 scoreboard ARG 2 objective ARG 3 playerName + METHOD a incrementScore ()V METHOD a incrementScore (I)V ARG 1 value - METHOD a setDisabled (Z)V + METHOD a setLocked (Z)V ARG 1 value METHOD b getScore ()I + METHOD c clearScore ()V METHOD c setScore (I)V ARG 1 value METHOD d getObjective ()Lcjh; METHOD e getPlayerName ()Ljava/lang/String; METHOD f getScoreboard ()Lcjk; - METHOD g isDisabled ()Z + METHOD g isLocked ()Z diff --git a/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping b/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping index 659b65cc57..d3ebbef465 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping @@ -2,17 +2,20 @@ CLASS cji net/minecraft/scoreboard/ScoreboardTeam FIELD a scoreboard Lcjk; FIELD b name Ljava/lang/String; FIELD c playerList Ljava/util/Set; + FIELD d displayName Lix; FIELD g friendlyFire Z FIELD h showFriendlyInvisibles Z FIELD i nameTagVisibilityRule Lcjm$b; FIELD j deathMessageVisibilityRule Lcjm$b; - FIELD k displayFormat La; + FIELD k color La; FIELD l collisionRule Lcjm$a; METHOD (Lcjk;Ljava/lang/String;)V ARG 1 scoreboard ARG 2 name METHOD a setFriendlyFlagsBitwise (I)V ARG 1 value + METHOD a setColor (La;)V + ARG 1 color METHOD a setCollisionRule (Lcjm$a;)V ARG 1 value METHOD a setNameTagVisibilityRule (Lcjm$b;)V @@ -32,4 +35,4 @@ CLASS cji net/minecraft/scoreboard/ScoreboardTeam METHOD k getDeathMessageVisibilityRule ()Lcjm$b; METHOD l getCollisionRule ()Lcjm$a; METHOD m getFriendlyFlagsBitwise ()I - METHOD n getTeamColor ()La; + METHOD n getColor ()La; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping b/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping index 6012f1002e..0f57291654 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardTeamBase.mapping @@ -1,4 +1,6 @@ CLASS cjm net/minecraft/scoreboard/ScoreboardTeamBase + CLASS cjm$a CollisionRule + CLASS cjm$b VisibilityRule METHOD a isEqual (Lcjm;)Z ARG 1 team METHOD b getName ()Ljava/lang/String; @@ -8,4 +10,4 @@ CLASS cjm net/minecraft/scoreboard/ScoreboardTeamBase METHOD j getNameTagVisibilityRule ()Lcjm$b; METHOD k getDeathMessageVisibilityRule ()Lcjm$b; METHOD l getCollisionRule ()Lcjm$a; - METHOD n getTeamColor ()La; + METHOD n getColor ()La; diff --git a/mappings/qj.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping similarity index 82% rename from mappings/qj.mapping rename to mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index c564a612cb..bf86989554 100644 --- a/mappings/qj.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -1,4 +1,5 @@ -CLASS qj +CLASS qj net/minecraft/scoreboard/ServerScoreboard + FIELD a server Lnet/minecraft/server/MinecraftServer; METHOD a setObjectiveSlot (ILcjh;)V ARG 1 slot ARG 2 objective @@ -26,3 +27,5 @@ CLASS qj ARG 1 objective METHOD c updateRemovedTeam (Lcji;)V ARG 1 team + METHOD f (Lcjh;)Ljava/util/List; + ARG 1 objective diff --git a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping b/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping index 81c6d035e5..ed19dc494f 100644 --- a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping +++ b/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping @@ -2,9 +2,9 @@ CLASS cxf net/minecraft/sortme/ServerEntryNetworkPart CLASS cxf$1 METHOD a onConnectionLost (Lix;)V ARG 0 reason - METHOD a (Lpc;)V + METHOD a onPong (Lpc;)V ARG 0 packet - METHOD a (Lpd;)V + METHOD a onResponse (Lpd;)V ARG 0 packet FIELD a ZERO_SPLITTER Lcom/google/common/base/Splitter; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index e552d62706..aa67a0f536 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -5,16 +5,34 @@ CLASS azp net/minecraft/world/GameRules FIELD c asInteger I FIELD d asDouble D FIELD e type Lazp$c; + FIELD f applyConsumer Ljava/util/function/BiConsumer; METHOD a getString ()Ljava/lang/String; + METHOD a set (Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;)V METHOD b getBoolean ()Z METHOD c getInteger ()I METHOD e getType ()Lazp$c; - CLASS azp$b + CLASS azp$b Key + FIELD a type Lazp$c; + FIELD b defaultValue Ljava/lang/String; + METHOD a createValue ()Lazp$a; + METHOD b getType ()Lazp$c; + CLASS azp$c Type + FIELD a STRING Lazp$c; + FIELD b BOOLEAN Lazp$c; + FIELD c INTEGER Lazp$c; + FIELD a KEYS Ljava/util/TreeMap; FIELD b rules Ljava/util/TreeMap; METHOD a serialize ()Lhm; METHOD a deserialize (Lhm;)V ARG 1 tag + METHOD a put (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;)V + ARG 1 key + ARG 2 value + ARG 3 server + METHOD b getKeys ()Ljava/util/TreeMap; METHOD b getBoolean (Ljava/lang/String;)Z ARG 1 name METHOD c getInteger (Ljava/lang/String;)I ARG 1 name + METHOD f get (Ljava/lang/String;)Lazp$a; + ARG 1 id diff --git a/mappings/nh.mapping b/mappings/nh.mapping deleted file mode 100644 index 5339253fe4..0000000000 --- a/mappings/nh.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS nh - METHOD a read (Lin;)V - ARG 1 buf - METHOD a apply (Liq;)V - ARG 1 handler - METHOD a apply (Lmw;)V - ARG 1 handler - METHOD b write (Lin;)V - ARG 1 buf diff --git a/mappings/uo.mapping b/mappings/uo.mapping index 17d25474db..d82412756f 100644 --- a/mappings/uo.mapping +++ b/mappings/uo.mapping @@ -1,3 +1,5 @@ CLASS uo METHOD a onConnectionLost (Lix;)V ARG 1 reason + METHOD a onHandshake (Lom;)V + ARG 1 packet diff --git a/mappings/ur.mapping b/mappings/ur.mapping index 26a03bc95a..ec0e762448 100644 --- a/mappings/ur.mapping +++ b/mappings/ur.mapping @@ -1,3 +1,5 @@ CLASS ur METHOD a onConnectionLost (Lix;)V ARG 1 reason + METHOD a onHandshake (Lom;)V + ARG 1 packet diff --git a/mappings/ut.mapping b/mappings/ut.mapping index fcd8c7994b..bfffd81090 100644 --- a/mappings/ut.mapping +++ b/mappings/ut.mapping @@ -1,3 +1,7 @@ CLASS ut METHOD a onConnectionLost (Lix;)V ARG 1 reason + METHOD a onPing (Lpg;)V + ARG 1 packet + METHOD a onRequest (Lph;)V + ARG 1 packet