From 4b82d7412a71226d46d9df20ed5cbff6b89f530f Mon Sep 17 00:00:00 2001 From: Runemoro Date: Tue, 16 Apr 2019 10:16:45 -0400 Subject: [PATCH] Misc mappings (#621) --- .../net/minecraft/SharedConstants.mapping | 4 +++- .../net/minecraft/block/FluidBlock.mapping | 7 ++++++ .../{sortme => block/entity}/Hopper.mapping | 2 +- .../ClientChatListener.mapping | 2 +- .../client/gui/GameInfoChatListener.mapping | 2 ++ .../ClientPlayerInteractionManager.mapping | 1 + .../network}/DebugRendererInfoManager.mapping | 2 +- .../packet/ScoreboardDisplayS2CPacket.mapping | 8 +++---- .../client/render/model/CubeFace.mapping | 16 +++++++++++++ .../sortme/GameInfoChatListener.mapping | 2 -- .../sortme/ServerEntryNetworkPart.mapping | 2 +- .../PlayerSkinProvider.mapping | 2 +- .../arguments/ItemStringReader.mapping | 17 +++++++++++++ .../container/AnvilContainer.mapping | 4 +++- .../container/BrewingStandContainer.mapping | 2 ++ .../CartographyTableContainer.mapping | 4 ++++ .../container/CraftingTableContainer.mapping | 6 +++++ .../EnchantingTableContainer.mapping | 2 ++ .../container/GrindstoneContainer.mapping | 13 ++++++++++ .../minecraft/enchantment/Enchantment.mapping | 1 + .../enchantment/ProtectionEnchantment.mapping | 6 +++++ .../enchantment/ThornsEnchantment.mapping | 6 +++++ .../enchantment/UnbreakingEnchantment.mapping | 4 ++++ mappings/net/minecraft/entity/Entity.mapping | 4 +++- .../SpawnRestriction.mapping | 2 +- .../map}/MapBannerInstance.mapping | 2 +- .../map}/MapFrameInstance.mapping | 2 +- mappings/net/minecraft/nbt/ListTag.mapping | 1 + .../StringNbtReader.mapping} | 4 +++- .../network/ButtonClickServerPacket.mapping | 5 ---- .../network/ClientConnection.mapping | 24 +++++++++++++++---- .../network/LegacyQueryHandler.mapping | 9 +++++++ .../network/NetworkEncryptionUtils.mapping | 7 ++++++ .../minecraft/network/NetworkState.mapping | 9 ++++--- .../entity/DistancePredicate.mapping | 4 ++-- .../predicate/entity/EntityPredicates.mapping | 5 +++- .../entity/LocationPredicate.mapping | 7 +++--- .../predicate/item/ItemPredicate.mapping | 2 ++ .../recipe/BrewingRecipeRegistry.mapping | 2 ++ .../net/minecraft/recipe/RecipeFinder.mapping | 9 +++++-- .../crafting/MapExtendingRecipe.mapping | 2 ++ .../resource/DefaultResourcePack.mapping | 6 +++++ .../resource/ResourceReloadMonitor.mapping | 1 + .../minecraft/scoreboard/Scoreboard.mapping | 10 ++++++++ .../scoreboard/ScoreboardCriterion.mapping | 4 ++++ .../scoreboard/ScoreboardObjective.mapping | 9 +++---- .../scoreboard/ServerScoreboard.mapping | 14 ++++++++++- .../net/minecraft/scoreboard/Team.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 4 ++-- .../minecraft/server/PlayerManager.mapping | 7 ++++++ .../minecraft/server/ServerNetworkIO.mapping | 2 +- .../packet/ButtonClickC2SPacket.mapping | 8 +++++++ .../network/packet/LoginKeyC2SPacket.mapping | 7 +++++- .../server/world/ServerWorld.mapping | 1 + .../minecraft/sortme/ItemStringReader.mapping | 8 ------- ...ethingDirectionSomethingQuadBakery.mapping | 8 ------- .../sortme/WorldNameProvider.mapping | 3 --- .../sortme/rule/AbstractRuleTest.mapping | 3 --- .../sortme/rule/AlwaysTrueRuleTest.mapping | 2 -- .../sortme/rule/TagMatchRuleTest.mapping | 4 ---- .../minecraft/stat/ServerStatHandler.mapping | 10 ++++++++ .../net/minecraft/stat/StatHandler.mapping | 3 +++ .../state/AbstractPropertyContainer.mapping | 19 +++++++++++++-- .../structure/rule/AbstractRuleTest.mapping | 4 ++++ .../structure/rule/AlwaysTrueRuleTest.mapping | 2 ++ .../rule/BlockMatchRuleTest.mapping | 2 +- .../rule/BlockStateMatchRuleTest.mapping | 2 +- .../rule/RandomBlockMatchRuleTest.mapping | 2 +- .../RandomBlockStateMatchRuleTest.mapping | 2 +- .../rule/RuleTest.mapping | 2 +- .../structure/rule/TagMatchRuleTest.mapping | 4 ++++ mappings/net/minecraft/tag/Tag.mapping | 1 + .../text/AbstractTextComponent.mapping | 2 +- .../{sortme => text}/ChatMessageType.mapping | 2 +- .../minecraft/text/ScoreTextComponent.mapping | 2 ++ .../net/minecraft/text/TextComponent.mapping | 6 ++++- .../net/minecraft/text/TextFormat.mapping | 5 +++- .../text/TranslatableTextComponent.mapping | 8 +++++++ .../minecraft/text/event/ClickEvent.mapping | 6 +++++ .../minecraft/text/event/HoverEvent.mapping | 6 +++++ .../net/minecraft/util/FileNameUtil.mapping | 9 +++++++ .../net/minecraft/util/Identifier.mapping | 5 ++++ .../{sortme => util}/ItemScatterer.mapping | 2 +- .../village/PointOfInterestSet.mapping | 2 ++ .../CommandBlockExecutor.mapping | 2 +- mappings/net/minecraft/world/IWorld.mapping | 1 + .../{sortme => world}/MobSpawnerEntry.mapping | 2 +- .../{sortme => world}/MobSpawnerLogic.mapping | 2 +- .../{sortme => world}/SpawnHelper.mapping | 2 +- .../world/explosion/Explosion.mapping | 3 +++ 90 files changed, 346 insertions(+), 91 deletions(-) rename mappings/net/minecraft/{sortme => block/entity}/Hopper.mapping (83%) rename mappings/net/minecraft/client/{sortme => gui}/ClientChatListener.mapping (55%) create mode 100644 mappings/net/minecraft/client/gui/GameInfoChatListener.mapping rename mappings/net/minecraft/{sortme => client/network}/DebugRendererInfoManager.mapping (85%) create mode 100644 mappings/net/minecraft/client/render/model/CubeFace.mapping delete mode 100644 mappings/net/minecraft/client/sortme/GameInfoChatListener.mapping rename mappings/net/minecraft/{ => client}/sortme/ServerEntryNetworkPart.mapping (82%) rename mappings/net/minecraft/client/{sortme => texture}/PlayerSkinProvider.mapping (93%) create mode 100644 mappings/net/minecraft/command/arguments/ItemStringReader.mapping rename mappings/net/minecraft/{sortme => entity}/SpawnRestriction.mapping (84%) rename mappings/net/minecraft/{sortme => item/map}/MapBannerInstance.mapping (87%) rename mappings/net/minecraft/{sortme => item/map}/MapFrameInstance.mapping (83%) rename mappings/net/minecraft/{sortme/JsonLikeTagParser.mapping => nbt/StringNbtReader.mapping} (92%) delete mode 100644 mappings/net/minecraft/network/ButtonClickServerPacket.mapping create mode 100644 mappings/net/minecraft/server/network/packet/ButtonClickC2SPacket.mapping delete mode 100644 mappings/net/minecraft/sortme/ItemStringReader.mapping delete mode 100644 mappings/net/minecraft/sortme/SomethingDirectionSomethingQuadBakery.mapping delete mode 100644 mappings/net/minecraft/sortme/WorldNameProvider.mapping delete mode 100644 mappings/net/minecraft/sortme/rule/AbstractRuleTest.mapping delete mode 100644 mappings/net/minecraft/sortme/rule/AlwaysTrueRuleTest.mapping delete mode 100644 mappings/net/minecraft/sortme/rule/TagMatchRuleTest.mapping create mode 100644 mappings/net/minecraft/structure/rule/AbstractRuleTest.mapping create mode 100644 mappings/net/minecraft/structure/rule/AlwaysTrueRuleTest.mapping rename mappings/net/minecraft/{sortme => structure}/rule/BlockMatchRuleTest.mapping (50%) rename mappings/net/minecraft/{sortme => structure}/rule/BlockStateMatchRuleTest.mapping (52%) rename mappings/net/minecraft/{sortme => structure}/rule/RandomBlockMatchRuleTest.mapping (61%) rename mappings/net/minecraft/{sortme => structure}/rule/RandomBlockStateMatchRuleTest.mapping (62%) rename mappings/net/minecraft/{sortme => structure}/rule/RuleTest.mapping (60%) create mode 100644 mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping rename mappings/net/minecraft/{sortme => text}/ChatMessageType.mapping (72%) create mode 100644 mappings/net/minecraft/util/FileNameUtil.mapping rename mappings/net/minecraft/{sortme => util}/ItemScatterer.mapping (88%) rename mappings/net/minecraft/{sortme => world}/CommandBlockExecutor.mapping (93%) rename mappings/net/minecraft/{sortme => world}/MobSpawnerEntry.mapping (71%) rename mappings/net/minecraft/{sortme => world}/MobSpawnerLogic.mapping (93%) rename mappings/net/minecraft/{sortme => world}/SpawnHelper.mapping (89%) diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index 44b3c59e5b..dd0ab1c2bc 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -2,9 +2,11 @@ CLASS o net/minecraft/SharedConstants FIELD a RESOURCE_LEAK_DETECTOR_DISABLED Lio/netty/util/ResourceLeakDetector$Level; FIELD b isDevelopment Z FIELD c INVALID_CHARS_LEVEL_NAME [C - FIELD d version Lcom/mojang/bridge/game/GameVersion; + FIELD d gameVersion Lcom/mojang/bridge/game/GameVersion; METHOD a getGameVersion ()Lcom/mojang/bridge/game/GameVersion; METHOD a isValidChar (C)Z ARG 0 chr METHOD a stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; ARG 0 s + METHOD b stripSupplementaryChars (Ljava/lang/String;)Ljava/lang/String; + ARG 0 s diff --git a/mappings/net/minecraft/block/FluidBlock.mapping b/mappings/net/minecraft/block/FluidBlock.mapping index 1ae154597c..b8cb1a3688 100644 --- a/mappings/net/minecraft/block/FluidBlock.mapping +++ b/mappings/net/minecraft/block/FluidBlock.mapping @@ -2,3 +2,10 @@ CLASS bpj net/minecraft/block/FluidBlock FIELD a LEVEL Lbwc; FIELD b fluid Lckq; FIELD c statesByLevel Ljava/util/List; + METHOD a receiveNeighborFluids (Lbha;Lev;Lbvc;)Z + ARG 1 world + ARG 2 pos + ARG 3 state + METHOD a playExtinguishSound (Lbhb;Lev;)V + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/sortme/Hopper.mapping b/mappings/net/minecraft/block/entity/Hopper.mapping similarity index 83% rename from mappings/net/minecraft/sortme/Hopper.mapping rename to mappings/net/minecraft/block/entity/Hopper.mapping index bd3e299118..856ca42835 100644 --- a/mappings/net/minecraft/sortme/Hopper.mapping +++ b/mappings/net/minecraft/block/entity/Hopper.mapping @@ -1,4 +1,4 @@ -CLASS btt net/minecraft/sortme/Hopper +CLASS btt net/minecraft/block/entity/Hopper FIELD a INSIDE_SHAPE Lcsi; FIELD b ABOVE_SHAPE Lcsi; FIELD c INPUT_AREA_SHAPE Lcsi; diff --git a/mappings/net/minecraft/client/sortme/ClientChatListener.mapping b/mappings/net/minecraft/client/gui/ClientChatListener.mapping similarity index 55% rename from mappings/net/minecraft/client/sortme/ClientChatListener.mapping rename to mappings/net/minecraft/client/gui/ClientChatListener.mapping index 1c94d7c155..7ddf8010d3 100644 --- a/mappings/net/minecraft/client/sortme/ClientChatListener.mapping +++ b/mappings/net/minecraft/client/gui/ClientChatListener.mapping @@ -1,4 +1,4 @@ -CLASS cvx net/minecraft/client/sortme/ClientChatListener +CLASS cvx net/minecraft/client/gui/ClientChatListener METHOD a onChatMessage (Ljk;Ljm;)V ARG 1 messageType ARG 2 message diff --git a/mappings/net/minecraft/client/gui/GameInfoChatListener.mapping b/mappings/net/minecraft/client/gui/GameInfoChatListener.mapping new file mode 100644 index 0000000000..efc9542c0a --- /dev/null +++ b/mappings/net/minecraft/client/gui/GameInfoChatListener.mapping @@ -0,0 +1,2 @@ +CLASS cvz net/minecraft/client/gui/GameInfoChatListener + FIELD a client Lcvb; diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index e7248fc084..e4777bb864 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -14,6 +14,7 @@ CLASS dhd net/minecraft/client/network/ClientPlayerInteractionManager ARG 1 slot METHOD a clickButton (II)V ARG 1 syncId + ARG 2 buttonId METHOD a clickRecipe (ILbec;Z)V ARG 1 syncId ARG 2 recipe diff --git a/mappings/net/minecraft/sortme/DebugRendererInfoManager.mapping b/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping similarity index 85% rename from mappings/net/minecraft/sortme/DebugRendererInfoManager.mapping rename to mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping index 5aaf2ab2cc..56a6de8b60 100644 --- a/mappings/net/minecraft/sortme/DebugRendererInfoManager.mapping +++ b/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping @@ -1,4 +1,4 @@ -CLASS np net/minecraft/sortme/DebugRendererInfoManager +CLASS np net/minecraft/client/network/DebugRendererInfoManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a sendVillagerAiDebugData (Laim;)V METHOD a sendGoalSelector (Lbha;Lain;Lamr;)V diff --git a/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping index b503545f6f..e68f209ab6 100644 --- a/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping @@ -1,7 +1,7 @@ CLASS mp net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket - FIELD a location I + FIELD a slot I FIELD b name Ljava/lang/String; METHOD (ILcsl;)V - ARG 1 location - METHOD b getLocation ()I - METHOD c getName ()Ljava/lang/String; + ARG 1 slot + METHOD b getSlot ()I + METHOD c getName ()Ljava/lang/String; \ No newline at end of file diff --git a/mappings/net/minecraft/client/render/model/CubeFace.mapping b/mappings/net/minecraft/client/render/model/CubeFace.mapping new file mode 100644 index 0000000000..488f2a316a --- /dev/null +++ b/mappings/net/minecraft/client/render/model/CubeFace.mapping @@ -0,0 +1,16 @@ +CLASS djz net/minecraft/client/render/model/CubeFace + CLASS djz$a DirectionIds + FIELD a SOUTH I + FIELD b UP I + FIELD c EAST I + FIELD d NORTH I + FIELD e DOWN I + FIELD f WEST I + CLASS djz$b Corner + FIELD a xSide I + FIELD b ySide I + FIELD c zSide I + FIELD h corners [Ldjz$b; + METHOD ([Ldjz$b;)V + ARG 1 corners + METHOD a getCorner (I)Ldjz$b; diff --git a/mappings/net/minecraft/client/sortme/GameInfoChatListener.mapping b/mappings/net/minecraft/client/sortme/GameInfoChatListener.mapping deleted file mode 100644 index f193c8f508..0000000000 --- a/mappings/net/minecraft/client/sortme/GameInfoChatListener.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cvz net/minecraft/client/sortme/GameInfoChatListener - FIELD a client Lcvb; diff --git a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping b/mappings/net/minecraft/client/sortme/ServerEntryNetworkPart.mapping similarity index 82% rename from mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping rename to mappings/net/minecraft/client/sortme/ServerEntryNetworkPart.mapping index 0df95f69ed..20b859e749 100644 --- a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping +++ b/mappings/net/minecraft/client/sortme/ServerEntryNetworkPart.mapping @@ -1,4 +1,4 @@ -CLASS dhj net/minecraft/sortme/ServerEntryNetworkPart +CLASS dhj net/minecraft/client/sortme/ServerEntryNetworkPart FIELD a ZERO_SPLITTER Lcom/google/common/base/Splitter; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c clientConnections Ljava/util/List; diff --git a/mappings/net/minecraft/client/sortme/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping similarity index 93% rename from mappings/net/minecraft/client/sortme/PlayerSkinProvider.mapping rename to mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 7ee1200429..1b01e901c8 100644 --- a/mappings/net/minecraft/client/sortme/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -1,4 +1,4 @@ -CLASS dur net/minecraft/client/sortme/PlayerSkinProvider +CLASS dur net/minecraft/client/texture/PlayerSkinProvider CLASS dur$a SkinTextureAvailableCallback FIELD a EXECUTOR_SERVICE Ljava/util/concurrent/ExecutorService; FIELD b textureManager Ldua; diff --git a/mappings/net/minecraft/command/arguments/ItemStringReader.mapping b/mappings/net/minecraft/command/arguments/ItemStringReader.mapping new file mode 100644 index 0000000000..b6d20a638c --- /dev/null +++ b/mappings/net/minecraft/command/arguments/ItemStringReader.mapping @@ -0,0 +1,17 @@ +CLASS dy net/minecraft/command/arguments/ItemStringReader + FIELD a TAG_DISALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD b ID_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD d reader Lcom/mojang/brigadier/StringReader; + FIELD g item Lbbp; + FIELD h tag Lib; + FIELD i id Lqs; + FIELD j cursor I + FIELD k suggestions Ljava/util/function/Function; + METHOD b getItem ()Lbbp; + METHOD c getTag ()Lib; + METHOD c suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 suggestionsBuilder + METHOD d getId ()Lqs; + METHOD e readItem ()V + METHOD g readTag ()V + METHOD h consume ()Ldy; diff --git a/mappings/net/minecraft/container/AnvilContainer.mapping b/mappings/net/minecraft/container/AnvilContainer.mapping index f03b3e3bd9..35beb977f1 100644 --- a/mappings/net/minecraft/container/AnvilContainer.mapping +++ b/mappings/net/minecraft/container/AnvilContainer.mapping @@ -7,5 +7,7 @@ CLASS axx net/minecraft/container/AnvilContainer FIELD i newItemName Ljava/lang/String; FIELD j player Lavr; METHOD a setNewItemName (Ljava/lang/String;)V - METHOD e setLevelCost ()V + METHOD d getNextCost (I)I + ARG 0 cost + METHOD e updateResult ()V METHOD f getLevelCost ()I diff --git a/mappings/net/minecraft/container/BrewingStandContainer.mapping b/mappings/net/minecraft/container/BrewingStandContainer.mapping index b6f72be73b..775895bc49 100644 --- a/mappings/net/minecraft/container/BrewingStandContainer.mapping +++ b/mappings/net/minecraft/container/BrewingStandContainer.mapping @@ -21,3 +21,5 @@ CLASS aya net/minecraft/container/BrewingStandContainer FIELD e ingredientSlot Lazi; METHOD (ILavq;)V ARG 1 syncId + METHOD e getFuel ()I + METHOD f getBrewTime ()I diff --git a/mappings/net/minecraft/container/CartographyTableContainer.mapping b/mappings/net/minecraft/container/CartographyTableContainer.mapping index a5a4c301a4..292b540ded 100644 --- a/mappings/net/minecraft/container/CartographyTableContainer.mapping +++ b/mappings/net/minecraft/container/CartographyTableContainer.mapping @@ -5,3 +5,7 @@ CLASS ayb net/minecraft/container/CartographyTableContainer ARG 1 syncId METHOD (ILavq;Layf;)V ARG 1 syncId + METHOD a updateResult (Lbbu;Lbbu;Lbbu;)V + ARG 1 map + ARG 2 item + ARG 3 oldResult diff --git a/mappings/net/minecraft/container/CraftingTableContainer.mapping b/mappings/net/minecraft/container/CraftingTableContainer.mapping index f5dd55a3af..e60539d302 100644 --- a/mappings/net/minecraft/container/CraftingTableContainer.mapping +++ b/mappings/net/minecraft/container/CraftingTableContainer.mapping @@ -7,3 +7,9 @@ CLASS ayi net/minecraft/container/CraftingTableContainer ARG 1 syncId METHOD (ILavq;Layf;)V ARG 1 syncId + METHOD a updateResult (ILbha;Lavr;Layh;Lazd;)V + ARG 0 syncId + ARG 1 world + ARG 2 player + ARG 3 craftingInventory + ARG 4 resultInventory diff --git a/mappings/net/minecraft/container/EnchantingTableContainer.mapping b/mappings/net/minecraft/container/EnchantingTableContainer.mapping index a0b519b645..5ae280e8b9 100644 --- a/mappings/net/minecraft/container/EnchantingTableContainer.mapping +++ b/mappings/net/minecraft/container/EnchantingTableContainer.mapping @@ -12,3 +12,5 @@ CLASS ayl net/minecraft/container/EnchantingTableContainer ARG 1 syncId METHOD a getRandomEnchantments (Lbbu;II)Ljava/util/List; ARG 1 stack + METHOD e getLapisCount ()I + METHOD f getSeed ()I diff --git a/mappings/net/minecraft/container/GrindstoneContainer.mapping b/mappings/net/minecraft/container/GrindstoneContainer.mapping index af6479777b..537f73b5e0 100644 --- a/mappings/net/minecraft/container/GrindstoneContainer.mapping +++ b/mappings/net/minecraft/container/GrindstoneContainer.mapping @@ -1,4 +1,9 @@ CLASS ayp net/minecraft/container/GrindstoneContainer + CLASS ayp$4 + METHOD a getExperience (Lbha;)I + ARG 1 world + METHOD e getExperience (Lbbu;)I + ARG 1 stack FIELD c resultInventory Lagr; FIELD d craftingInventory Lagr; FIELD e context Layf; @@ -6,3 +11,11 @@ CLASS ayp net/minecraft/container/GrindstoneContainer ARG 1 syncId METHOD (ILavq;Layf;)V ARG 1 syncId + METHOD a grind (Lbbu;II)Lbbu; + ARG 1 item + ARG 2 damage + ARG 3 amount + METHOD b transferEnchantments (Lbbu;Lbbu;)Lbbu; + ARG 1 target + ARG 2 source + METHOD e updateResult ()V diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index b99c06dae8..09732856c6 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -37,6 +37,7 @@ CLASS bfc net/minecraft/enchantment/Enchantment METHOD b onUserDamaged (Laim;Laid;I)V ARG 1 user ARG 2 attacker + ARG 3 level METHOD b isDifferent (Lbfc;)Z ARG 1 other METHOD c isCursed ()Z diff --git a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping index 23e4c7c593..d436b0a26f 100644 --- a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping @@ -12,3 +12,9 @@ CLASS bfp net/minecraft/enchantment/ProtectionEnchantment ARG 1 weight ARG 2 type ARG 3 slotTypes + METHOD a transformExplosionKnockback (Laim;D)D + ARG 0 entity + ARG 1 velocity + METHOD a transformFireDuration (Laim;I)I + ARG 0 entity + ARG 1 duration diff --git a/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping b/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping index 74fa0d3596..076eddbe18 100644 --- a/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping @@ -2,3 +2,9 @@ CLASS bfs net/minecraft/enchantment/ThornsEnchantment METHOD (Lbfc$a;[Laii;)V ARG 1 weight ARG 2 slotTypes + METHOD a shouldDamageAttacker (ILjava/util/Random;)Z + ARG 0 level + ARG 1 random + METHOD b getDamageAmount (ILjava/util/Random;)I + ARG 0 level + ARG 1 random diff --git a/mappings/net/minecraft/enchantment/UnbreakingEnchantment.mapping b/mappings/net/minecraft/enchantment/UnbreakingEnchantment.mapping index b9580481dd..f94cc3dfec 100644 --- a/mappings/net/minecraft/enchantment/UnbreakingEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/UnbreakingEnchantment.mapping @@ -2,3 +2,7 @@ CLASS bfa net/minecraft/enchantment/UnbreakingEnchantment METHOD (Lbfc$a;[Laii;)V ARG 1 weight ARG 2 slotTypes + METHOD a shouldPreventDamage (Lbbu;ILjava/util/Random;)Z + ARG 0 item + ARG 1 level + ARG 2 random diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 991ed7b5a3..bebec7ee8c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -266,7 +266,8 @@ CLASS aid net/minecraft/entity/Entity METHOD b removeScoreboardTag (Ljava/lang/String;)Z METHOD b setCustomName (Ljm;)V METHOD b onStartedTrackingBy (Lvg;)V - METHOD b isInsideFluid (Lza;)Z + METHOD b updateMovementInFluid (Lza;)Z + ARG 1 tag METHOD bA getEntityName ()Ljava/lang/String; METHOD bB canFly ()Z METHOD bC getRenderDistanceMultiplier ()D @@ -363,6 +364,7 @@ CLASS aid net/minecraft/entity/Entity METHOD f getRotationVec (F)Lcro; ARG 1 tickDelta METHOD f setOnFireFor (I)V + ARG 1 seconds METHOD f fromTag (Lib;)V METHOD f setSprinting (Z)V ARG 1 sprinting diff --git a/mappings/net/minecraft/sortme/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping similarity index 84% rename from mappings/net/minecraft/sortme/SpawnRestriction.mapping rename to mappings/net/minecraft/entity/SpawnRestriction.mapping index 564769487c..5304980da0 100644 --- a/mappings/net/minecraft/sortme/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -1,4 +1,4 @@ -CLASS aiz net/minecraft/sortme/SpawnRestriction +CLASS aiz net/minecraft/entity/SpawnRestriction CLASS aiz$a Entry FIELD a heightMapType Lbyj$a; FIELD b location Laiz$b; diff --git a/mappings/net/minecraft/sortme/MapBannerInstance.mapping b/mappings/net/minecraft/item/map/MapBannerInstance.mapping similarity index 87% rename from mappings/net/minecraft/sortme/MapBannerInstance.mapping rename to mappings/net/minecraft/item/map/MapBannerInstance.mapping index 8fcb772fc6..a1e877d176 100644 --- a/mappings/net/minecraft/sortme/MapBannerInstance.mapping +++ b/mappings/net/minecraft/item/map/MapBannerInstance.mapping @@ -1,4 +1,4 @@ -CLASS cnk net/minecraft/sortme/MapBannerInstance +CLASS cnk net/minecraft/item/map/MapBannerInstance FIELD a pos Lev; FIELD b color Lbar; FIELD c text Ljm; diff --git a/mappings/net/minecraft/sortme/MapFrameInstance.mapping b/mappings/net/minecraft/item/map/MapFrameInstance.mapping similarity index 83% rename from mappings/net/minecraft/sortme/MapFrameInstance.mapping rename to mappings/net/minecraft/item/map/MapFrameInstance.mapping index e609ab8ba1..8d0bc1003e 100644 --- a/mappings/net/minecraft/sortme/MapFrameInstance.mapping +++ b/mappings/net/minecraft/item/map/MapFrameInstance.mapping @@ -1,4 +1,4 @@ -CLASS cnm net/minecraft/sortme/MapFrameInstance +CLASS cnm net/minecraft/item/map/MapFrameInstance FIELD a pos Lev; FIELD b rotation I FIELD c entityId I diff --git a/mappings/net/minecraft/nbt/ListTag.mapping b/mappings/net/minecraft/nbt/ListTag.mapping index 4c33a4fcba..6a2621b1c1 100644 --- a/mappings/net/minecraft/nbt/ListTag.mapping +++ b/mappings/net/minecraft/nbt/ListTag.mapping @@ -11,6 +11,7 @@ CLASS ii net/minecraft/nbt/ListTag METHOD e getInt (I)I METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD f forgetTypeIfEmpty ()V METHOD f getIntArray (I)[I METHOD h getDouble (I)D METHOD i getFloat (I)F diff --git a/mappings/net/minecraft/sortme/JsonLikeTagParser.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping similarity index 92% rename from mappings/net/minecraft/sortme/JsonLikeTagParser.mapping rename to mappings/net/minecraft/nbt/StringNbtReader.mapping index 9539cdbbd6..0ca1a4407d 100644 --- a/mappings/net/minecraft/sortme/JsonLikeTagParser.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -1,4 +1,4 @@ -CLASS it net/minecraft/sortme/JsonLikeTagParser +CLASS it net/minecraft/nbt/StringNbtReader FIELD a TRAILING Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b EXPECTED_KEY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c EXPECTED_VALUE Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; @@ -14,6 +14,7 @@ CLASS it net/minecraft/sortme/JsonLikeTagParser FIELD m INT_PATTERN Ljava/util/regex/Pattern; FIELD n reader Lcom/mojang/brigadier/StringReader; METHOD a readCompoundTag ()Lib; + METHOD a readArray (BB)Ljava/util/List; METHOD a expect (C)V METHOD a parse (Ljava/lang/String;)Lib; ARG 0 string @@ -25,3 +26,4 @@ CLASS it net/minecraft/sortme/JsonLikeTagParser METHOD f parseCompoundTag ()Lib; METHOD g parseListTag ()Lis; METHOD h parseTagPrimitiveArray ()Lis; + METHOD i readComma ()Z diff --git a/mappings/net/minecraft/network/ButtonClickServerPacket.mapping b/mappings/net/minecraft/network/ButtonClickServerPacket.mapping deleted file mode 100644 index acc27a6fde..0000000000 --- a/mappings/net/minecraft/network/ButtonClickServerPacket.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS oa net/minecraft/network/ButtonClickServerPacket - FIELD a syncId I - METHOD (II)V - ARG 1 syncId - METHOD b getSyncId ()I diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 441acafbcd..a2cf0d1ab3 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -1,4 +1,7 @@ CLASS ja net/minecraft/network/ClientConnection + CLASS net/minecraft/network/ClientConnection$a PacketWrapper + FIELD a packet Lka; + FIELD b listener Lio/netty/util/concurrent/GenericFutureListener; FIELD a MARKER_NETWORK Lorg/apache/logging/log4j/Marker; FIELD b MARKER_NETWORK_PACKETS Lorg/apache/logging/log4j/Marker; FIELD c ATTR_KEY_PROTOCOL Lio/netty/util/AttributeKey; @@ -7,6 +10,7 @@ CLASS ja net/minecraft/network/ClientConnection FIELD f CLIENT_IO_GROUP_LOCAL Lzo; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; FIELD h side Lkb; + FIELD i packetQueue Ljava/util/Queue; FIELD j lock Ljava/util/concurrent/locks/ReentrantReadWriteLock; FIELD k channel Lio/netty/channel/Channel; FIELD l address Ljava/net/SocketAddress; @@ -20,8 +24,10 @@ CLASS ja net/minecraft/network/ClientConnection FIELD t avgPacketsSent F FIELD u ticks I METHOD a tick ()V - METHOD a setCompressionThreshold (I)V - ARG 1 compressionThreshold + METHOD a setMinCompressedSize (I)V + METHOD a handlePacket (Lio/netty/channel/ChannelHandlerContext;Lka;)V + ARG 1 context + ARG 2 packet METHOD a connect (Ljava/net/InetAddress;IZ)Lja; ARG 0 address ARG 1 port @@ -33,9 +39,18 @@ CLASS ja net/minecraft/network/ClientConnection METHOD a setPacketListener (Ljf;)V METHOD a disconnect (Ljm;)V ARG 1 disconnectReason - METHOD a sendPacket (Lka;)V - METHOD a sendPacket (Lka;Lio/netty/util/concurrent/GenericFutureListener;)V + METHOD a send (Lka;)V + ARG 1 packet + METHOD a send (Lka;Lio/netty/util/concurrent/GenericFutureListener;)V + ARG 1 packet + ARG 2 listener + METHOD a handlePacket (Lka;Ljf;)V + ARG 0 packet + ARG 1 listener METHOD b getAddress ()Ljava/net/SocketAddress; + METHOD b sendImmediately (Lka;Lio/netty/util/concurrent/GenericFutureListener;)V + ARG 1 packet + ARG 2 listener METHOD c isLocal ()Z METHOD f isEncrypted ()Z METHOD g isOpen ()Z @@ -46,3 +61,4 @@ CLASS ja net/minecraft/network/ClientConnection METHOD l handleDisconnection ()V METHOD m getAveragePacketsReceived ()F METHOD n getAveragePacketsSent ()F + METHOD o sendQueuedPackets ()V diff --git a/mappings/net/minecraft/network/LegacyQueryHandler.mapping b/mappings/net/minecraft/network/LegacyQueryHandler.mapping index e2ca6142b3..d56f647750 100644 --- a/mappings/net/minecraft/network/LegacyQueryHandler.mapping +++ b/mappings/net/minecraft/network/LegacyQueryHandler.mapping @@ -1 +1,10 @@ CLASS vu net/minecraft/network/LegacyQueryHandler + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b networkIo Lvw; + METHOD (Lvw;)V + ARG 1 networkIo + METHOD a reply (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)V + ARG 1 ctx + ARG 2 buf + METHOD a toBuffer (Ljava/lang/String;)Lio/netty/buffer/ByteBuf; + ARG 1 s diff --git a/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping index 8bccf8fc1d..c752c5d0a5 100644 --- a/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping +++ b/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping @@ -12,12 +12,19 @@ CLASS zi net/minecraft/network/NetworkEncryptionUtils ARG 0 opMode ARG 1 key ARG 2 data + METHOD a generateServerId (Ljava/lang/String;Ljava/security/PublicKey;Ljavax/crypto/SecretKey;)[B + ARG 0 baseServerId + ARG 1 publicKey + ARG 2 secretKey METHOD a hash (Ljava/lang/String;[[B)[B ARG 0 algorithm ARG 1 data METHOD a encrypt (Ljava/security/Key;[B)[B ARG 0 key ARG 1 data + METHOD a decryptSecretKey (Ljava/security/PrivateKey;[B)Ljavax/crypto/SecretKey; + ARG 0 privateKey + ARG 1 encryptedSecretKey METHOD a readEncodedPublicKey ([B)Ljava/security/PublicKey; METHOD b generateServerKeyPair ()Ljava/security/KeyPair; METHOD b decrypt (Ljava/security/Key;[B)[B diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index 61443a4e39..fbe5a29b54 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -1,7 +1,7 @@ CLASS jb net/minecraft/network/NetworkState - FIELD a HANDSHAKE Ljb; - FIELD b GAME Ljb; - FIELD c QUERY Ljb; + FIELD a HANDSHAKING Ljb; + FIELD b PLAY Ljb; + FIELD c STATUS Ljb; FIELD d LOGIN Ljb; FIELD e STATES [Ljb; FIELD f HANDLER_STATE_MAP Ljava/util/Map; @@ -14,5 +14,8 @@ CLASS jb net/minecraft/network/NetworkState ARG 0 handler METHOD a getPacketHandler (Lkb;I)Lka; ARG 1 side + METHOD a addPacket (Lkb;Ljava/lang/Class;)Ljb; + ARG 1 receivingSide + ARG 2 packetClass METHOD a getPacketId (Lkb;Lka;)Ljava/lang/Integer; ARG 1 side diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping index bd9a2bd850..7079eeb483 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping @@ -12,9 +12,9 @@ CLASS an net/minecraft/predicate/entity/DistancePredicate ARG 4 horizontal METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a test (DDDDDD)Z - METHOD a (Lbi$c;)Lan; + METHOD a horizontal (Lbi$c;)Lan; ARG 0 horizontal METHOD a deserialize (Lcom/google/gson/JsonElement;)Lan; ARG 0 el - METHOD b (Lbi$c;)Lan; + METHOD b y (Lbi$c;)Lan; ARG 0 y diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index e98781cf72..21f7bf9f63 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -9,4 +9,7 @@ CLASS aig net/minecraft/predicate/entity/EntityPredicates FIELD f EXCEPT_SPECTATOR Ljava/util/function/Predicate; METHOD a maximumDistance (DDDD)Ljava/util/function/Predicate; ARG 0 x - METHOD b getBottommostEntity (Laid;)Ljava/util/function/Predicate; + METHOD a canBePushedBy (Laid;)Ljava/util/function/Predicate; + ARG 0 entity + METHOD b rides (Laid;)Ljava/util/function/Predicate; + ARG 0 entity diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 5088b84d14..6ee8e8240c 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -21,12 +21,13 @@ CLASS bg net/minecraft/predicate/entity/LocationPredicate ARG 3 z ARG 4 biome ARG 5 feature + ARG 6 dimension METHOD a serialize ()Lcom/google/gson/JsonElement; - METHOD a (Lbhx;)Lbg; + METHOD a biome (Lbhx;)Lbg; ARG 0 biome - METHOD a (Lbxw;)Lbg; + METHOD a dimension (Lbxw;)Lbg; ARG 0 dimension - METHOD a (Lcec;)Lbg; + METHOD a feature (Lcec;)Lbg; ARG 0 feature METHOD a deserialize (Lcom/google/gson/JsonElement;)Lbg; ARG 0 element diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 9ba27b20fa..7b843d8e25 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -11,6 +11,8 @@ CLASS bc net/minecraft/predicate/item/ItemPredicate METHOD a enchantment (Laq;)Lbc$a; METHOD a item (Lbgz;)Lbc$a; METHOD a count (Lbi$d;)Lbc$a; + METHOD a nbt (Lib;)Lbc$a; + ARG 1 nbt METHOD a tag (Lza;)Lbc$a; METHOD b build ()Lbc; FIELD a ANY Lbc; diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index f4cf1a5ec6..5278148366 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -19,6 +19,8 @@ CLASS bdk net/minecraft/recipe/BrewingRecipeRegistry METHOD a hasRecipe (Lbbu;Lbbu;)Z ARG 0 input ARG 1 ingredient + METHOD a isBrewable (Lbdj;)Z + ARG 0 potion METHOD a registerPotionRecipe (Lbdj;Lbbp;Lbdj;)V ARG 0 input ARG 2 output diff --git a/mappings/net/minecraft/recipe/RecipeFinder.mapping b/mappings/net/minecraft/recipe/RecipeFinder.mapping index efe1dd2531..c6f092857b 100644 --- a/mappings/net/minecraft/recipe/RecipeFinder.mapping +++ b/mappings/net/minecraft/recipe/RecipeFinder.mapping @@ -1,6 +1,11 @@ CLASS avt net/minecraft/recipe/RecipeFinder - CLASS avt$a MatchableRecipe - METHOD a match (ILit/unimi/dsi/fastutil/ints/IntList;)Z + CLASS avt$a Filter + FIELD b recipe Lbec; + FIELD c ingredients Ljava/util/List; + FIELD d ingredientCount I + METHOD (Lavt;Lbec;)V + ARG 1 recipe + METHOD a find (ILit/unimi/dsi/fastutil/ints/IntList;)Z ARG 1 amount ARG 2 outMatchingInputIds METHOD b countCrafts (ILit/unimi/dsi/fastutil/ints/IntList;)I diff --git a/mappings/net/minecraft/recipe/crafting/MapExtendingRecipe.mapping b/mappings/net/minecraft/recipe/crafting/MapExtendingRecipe.mapping index b913e11c71..fad6b0327b 100644 --- a/mappings/net/minecraft/recipe/crafting/MapExtendingRecipe.mapping +++ b/mappings/net/minecraft/recipe/crafting/MapExtendingRecipe.mapping @@ -1 +1,3 @@ CLASS beb net/minecraft/recipe/crafting/MapExtendingRecipe + METHOD a matches (Lcno;)Z + ARG 1 state diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 2e40c03b7f..1f6640bc25 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -3,6 +3,12 @@ CLASS wj net/minecraft/resource/DefaultResourcePack FIELD b RESOURCE_CLASS Ljava/lang/Class; FIELD c namespaces Ljava/util/Set; FIELD d LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a getIdentifiers (ILjava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; + ARG 1 maxDepth + ARG 2 namespace + ARG 3 path + ARG 4 searchLocation + ARG 5 filter METHOD a getInputStream (Ljava/lang/String;)Ljava/io/InputStream; ARG 1 path METHOD c findInputStream (Lwh;Lqs;)Ljava/io/InputStream; diff --git a/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping b/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping index 08b8f583d0..3b1514f7f8 100644 --- a/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping +++ b/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping @@ -3,3 +3,4 @@ CLASS xa net/minecraft/resource/ResourceReloadMonitor METHOD b getProgress ()F METHOD c isLoadStageComplete ()Z METHOD d isApplyStageComplete ()Z + METHOD e throwExceptions ()V diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 820cec31f1..ebbf8bc755 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -13,12 +13,22 @@ CLASS cso net/minecraft/scoreboard/Scoreboard METHOD a updateObjective (Lcsl;)V METHOD a updateScoreboardTeamAndPlayers (Lcsm;)V METHOD a updateScore (Lcsn;)V + ARG 1 score + METHOD a forEachScore (Lcsr;Ljava/lang/String;Ljava/util/function/Consumer;)V + ARG 1 criterion + ARG 2 player + ARG 3 action METHOD a fromTag (Lii;)V METHOD a updatePlayerScore (Ljava/lang/String;)V METHOD a updatePlayerScore (Ljava/lang/String;Lcsl;)V ARG 1 playerName METHOD a addPlayerToTeam (Ljava/lang/String;Lcsm;)Z ARG 1 playerName + METHOD a addObjective (Ljava/lang/String;Lcsr;Ljm;Lcsr$a;)Lcsl; + ARG 1 name + ARG 2 criterion + ARG 3 displayName + ARG 4 renderType METHOD b getDisplaySlotName (I)Ljava/lang/String; ARG 0 slotId METHOD b updateExistingObjective (Lcsl;)V diff --git a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index f26f58a921..2af99ffcff 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -23,6 +23,10 @@ CLASS csr net/minecraft/scoreboard/ScoreboardCriterion FIELD o name Ljava/lang/String; FIELD p readOnly Z FIELD q criterionType Lcsr$a; + METHOD a createStatCriterion (Ljava/lang/String;)Ljava/util/Optional; + METHOD a createStatCriterion (Lyr;Lqs;)Ljava/util/Optional; + ARG 0 statType + ARG 1 id METHOD c getName ()Ljava/lang/String; METHOD d isReadOnly ()Z METHOD e getCriterionType ()Lcsr$a; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping index 5462ffc0c5..f3e695157a 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping @@ -3,16 +3,17 @@ CLASS csl net/minecraft/scoreboard/ScoreboardObjective FIELD b name Ljava/lang/String; FIELD c criterion Lcsr; FIELD d displayName Ljm; - FIELD e criterionType Lcsr$a; + FIELD e renderType Lcsr$a; METHOD (Lcso;Ljava/lang/String;Lcsr;Ljm;Lcsr$a;)V ARG 1 scoreboard ARG 2 name - ARG 4 criterion + ARG 3 criterion + ARG 4 displayName METHOD a getScoreboard ()Lcso; - METHOD a setCriterionType (Lcsr$a;)V + METHOD a setRenderType (Lcsr$a;)V METHOD a setDisplayName (Ljm;)V METHOD b getName ()Ljava/lang/String; METHOD c getCriterion ()Lcsr; METHOD d getDisplayName ()Ljm; METHOD e getTextComponent ()Ljm; - METHOD f getCriterionType ()Lcsr$a; + METHOD f getRenderType ()Lcsr$a; diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index 2236e9f5ef..b2e01ffab5 100644 --- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -1,6 +1,18 @@ CLASS rg net/minecraft/scoreboard/ServerScoreboard CLASS rg$a UpdateMode FIELD a server Lnet/minecraft/server/MinecraftServer; - FIELD b objectiveList Ljava/util/Set; + FIELD b objectives Ljava/util/Set; + FIELD c updateListeners [Ljava/lang/Runnable; + METHOD a addUpdateListener (Ljava/lang/Runnable;)V + ARG 1 listener + METHOD b runUpdateListeners ()V + METHOD d createChangePackets (Lcsl;)Ljava/util/List; + ARG 1 objective METHOD e addScoreboardObjective (Lcsl;)V + ARG 1 objective + METHOD f createRemovePackets (Lcsl;)Ljava/util/List; + ARG 1 objective METHOD g removeScoreboardObjective (Lcsl;)V + ARG 1 objective + METHOD h getSlot (Lcsl;)I + ARG 1 objective diff --git a/mappings/net/minecraft/scoreboard/Team.mapping b/mappings/net/minecraft/scoreboard/Team.mapping index 924aed97ec..2ca262b914 100644 --- a/mappings/net/minecraft/scoreboard/Team.mapping +++ b/mappings/net/minecraft/scoreboard/Team.mapping @@ -26,6 +26,7 @@ CLASS csm net/minecraft/scoreboard/Team METHOD b setShowFriendlyInvisibles (Z)V METHOD c getDisplayName ()Ljm; METHOD c setSuffix (Ljm;)V + METHOD d getFormattedName ()Ljm; METHOD e getPrefix ()Ljm; METHOD f getSuffix ()Ljm; METHOD m getFriendlyFlagsBitwise ()I diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 9770355aea..a664090244 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -49,7 +49,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD l gameDir Ljava/io/File; FIELD m tickables Ljava/util/List; FIELD n profiler Lafy; - FIELD o networkIO Lvw; + FIELD o networkIo Lvw; FIELD p metadata Lqc; FIELD q random Ljava/util/Random; FIELD r dataFixer Lcom/mojang/datafixers/DataFixer; @@ -129,7 +129,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD ac isStopped ()Z METHOD ad getPlayerManager ()Lxp; METHOD ae isRemote ()Z - METHOD af getNetworkIO ()Lvw; + METHOD af getNetworkIo ()Lvw; METHOD ah hasGui ()Z METHOD ai getTicks ()I METHOD ak getSnooper ()Lahf; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index d743070edd..60086adb1f 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -24,6 +24,8 @@ CLASS xp net/minecraft/server/PlayerManager ARG 1 server METHOD a reloadWhitelist ()V METHOD a setViewDistance (II)V + METHOD a createStatHandler (Lavr;)Lyo; + ARG 1 player METHOD a sendToAround (Lavr;DDDDLbxw;Lka;)V ARG 2 x ARG 4 y @@ -42,6 +44,9 @@ CLASS xp net/minecraft/server/PlayerManager METHOD a sendToAll (Lka;)V METHOD a sendToDimension (Lka;Lbxw;)V ARG 1 packet + METHOD a sendCommandTree (Lvg;I)V + ARG 1 player + ARG 2 permissionLevel METHOD a respawnPlayer (Lvg;Lbxw;Z)Lvg; ARG 3 alive METHOD a setWhitelistEnabled (Z)V @@ -53,6 +58,8 @@ CLASS xp net/minecraft/server/PlayerManager METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; METHOD c setCheatsAllowed (Z)V METHOD d updatePlayerLatency ()V + METHOD d sendCommandTree (Lvg;)V + ARG 1 player METHOD e getPlayerNames ()[Ljava/lang/String; METHOD e isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z METHOD f canBypassPlayerLimit (Lcom/mojang/authlib/GameProfile;)Z diff --git a/mappings/net/minecraft/server/ServerNetworkIO.mapping b/mappings/net/minecraft/server/ServerNetworkIO.mapping index 16f2b98e2c..f48de38615 100644 --- a/mappings/net/minecraft/server/ServerNetworkIO.mapping +++ b/mappings/net/minecraft/server/ServerNetworkIO.mapping @@ -1,4 +1,4 @@ -CLASS vw net/minecraft/server/ServerNetworkIO +CLASS vw net/minecraft/server/ServerNetworkIo FIELD a DEFAULT_CHANNEL Lzo; FIELD b EPOLL_CHANNEL Lzo; FIELD c active Z diff --git a/mappings/net/minecraft/server/network/packet/ButtonClickC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/ButtonClickC2SPacket.mapping new file mode 100644 index 0000000000..b0d954bdde --- /dev/null +++ b/mappings/net/minecraft/server/network/packet/ButtonClickC2SPacket.mapping @@ -0,0 +1,8 @@ +CLASS oa net/minecraft/server/network/packet/ButtonClickC2SPacket + FIELD a syncId I + FIELD b buttonId I + METHOD (II)V + ARG 1 syncId + ARG 2 buttonId + METHOD b getSyncId ()I + METHOD c getButtonId ()I diff --git a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping index 935a094fa6..20044fdd5a 100644 --- a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping @@ -1,2 +1,7 @@ CLASS pw net/minecraft/server/network/packet/LoginKeyC2SPacket - METHOD b calculateNonce (Ljava/security/PrivateKey;)[B + FIELD a encryptedSecretKey [B + FIELD b encryptedNonce [B + METHOD a decryptSecretKey (Ljava/security/PrivateKey;)Ljavax/crypto/SecretKey; + ARG 1 privateKey + METHOD calculateNonce decryptNonce (Ljava/security/PrivateKey;)[B + ARG 1 privateKey \ No newline at end of file diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index e7e3883fd7..57268eed78 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -95,6 +95,7 @@ CLASS vf net/minecraft/server/world/ServerWorld ARG 1 x ARG 2 z ARG 3 forced + METHOD b checkChunk (Laid;)V METHOD b tickBlock (Lbhq;)V ARG 1 tick METHOD b_ isNearOccupiedPointOfInterest (Lev;)Z diff --git a/mappings/net/minecraft/sortme/ItemStringReader.mapping b/mappings/net/minecraft/sortme/ItemStringReader.mapping deleted file mode 100644 index feea99487a..0000000000 --- a/mappings/net/minecraft/sortme/ItemStringReader.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS dy net/minecraft/sortme/ItemStringReader - FIELD a TAG_DISALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD b ID_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD d reader Lcom/mojang/brigadier/StringReader; - FIELD g item Lbbp; - FIELD j cursor I - METHOD b getItem ()Lbbp; - METHOD h consume ()Ldy; diff --git a/mappings/net/minecraft/sortme/SomethingDirectionSomethingQuadBakery.mapping b/mappings/net/minecraft/sortme/SomethingDirectionSomethingQuadBakery.mapping deleted file mode 100644 index f7b0d51341..0000000000 --- a/mappings/net/minecraft/sortme/SomethingDirectionSomethingQuadBakery.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS djz net/minecraft/sortme/SomethingDirectionSomethingQuadBakery - CLASS djz$a DirectionIds - FIELD a SOUTH I - FIELD b UP I - FIELD c EAST I - FIELD d NORTH I - FIELD e DOWN I - FIELD f WEST I diff --git a/mappings/net/minecraft/sortme/WorldNameProvider.mapping b/mappings/net/minecraft/sortme/WorldNameProvider.mapping deleted file mode 100644 index 06a480b29a..0000000000 --- a/mappings/net/minecraft/sortme/WorldNameProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS k net/minecraft/sortme/WorldNameProvider - FIELD b RESERVED_WINDOWS_NAMES Ljava/util/regex/Pattern; - METHOD a transformWorldName (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/rule/AbstractRuleTest.mapping b/mappings/net/minecraft/sortme/rule/AbstractRuleTest.mapping deleted file mode 100644 index fca4b37e91..0000000000 --- a/mappings/net/minecraft/sortme/rule/AbstractRuleTest.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS civ net/minecraft/sortme/rule/AbstractRuleTest - METHOD a getRuleTest ()Lciw; - METHOD a test (Lbvc;Ljava/util/Random;)Z diff --git a/mappings/net/minecraft/sortme/rule/AlwaysTrueRuleTest.mapping b/mappings/net/minecraft/sortme/rule/AlwaysTrueRuleTest.mapping deleted file mode 100644 index 863d526b75..0000000000 --- a/mappings/net/minecraft/sortme/rule/AlwaysTrueRuleTest.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cij net/minecraft/sortme/rule/AlwaysTrueRuleTest - FIELD a INSTANCE Lcij; diff --git a/mappings/net/minecraft/sortme/rule/TagMatchRuleTest.mapping b/mappings/net/minecraft/sortme/rule/TagMatchRuleTest.mapping deleted file mode 100644 index a38f788d9a..0000000000 --- a/mappings/net/minecraft/sortme/rule/TagMatchRuleTest.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS cjc net/minecraft/sortme/rule/TagMatchRuleTest - FIELD a tag Lza; - METHOD (Lza;)V - ARG 1 tag diff --git a/mappings/net/minecraft/stat/ServerStatHandler.mapping b/mappings/net/minecraft/stat/ServerStatHandler.mapping index 5718a2daaa..a00053ad6d 100644 --- a/mappings/net/minecraft/stat/ServerStatHandler.mapping +++ b/mappings/net/minecraft/stat/ServerStatHandler.mapping @@ -2,6 +2,8 @@ CLASS yo net/minecraft/stat/ServerStatHandler FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c server Lnet/minecraft/server/MinecraftServer; FIELD d file Ljava/io/File; + FIELD e pendingStats Ljava/util/Set; + FIELD f lastStatsUpdate I METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;)V ARG 1 server METHOD a save ()V @@ -9,4 +11,12 @@ CLASS yo net/minecraft/stat/ServerStatHandler METHOD a parse (Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;)V ARG 1 dataFixer ARG 2 json + METHOD a sendStats (Lvg;)V + ARG 1 player + METHOD a createStat (Lyr;Ljava/lang/String;)Ljava/util/Optional; + ARG 1 type + ARG 2 id METHOD b asString ()Ljava/lang/String; + METHOD b getStatId (Lyp;)Lqs; + METHOD c updateStatSet ()V + METHOD d takePendingStats ()Ljava/util/Set; diff --git a/mappings/net/minecraft/stat/StatHandler.mapping b/mappings/net/minecraft/stat/StatHandler.mapping index 60cd59be94..4ef03c96eb 100644 --- a/mappings/net/minecraft/stat/StatHandler.mapping +++ b/mappings/net/minecraft/stat/StatHandler.mapping @@ -6,6 +6,9 @@ CLASS yt net/minecraft/stat/StatHandler ARG 3 value METHOD a getStat (Lyp;)I ARG 1 stat + METHOD a getStat (Lyr;Ljava/lang/Object;)I + ARG 1 type + ARG 2 stat METHOD b increaseStat (Lavr;Lyp;I)V ARG 1 player ARG 2 stat diff --git a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping index bf744e7741..c1b98e8a5d 100644 --- a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping +++ b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping @@ -1,12 +1,27 @@ CLASS bvb net/minecraft/state/AbstractPropertyContainer + CLASS bvb$1 + METHOD a valueToString (Lbwf;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 1 property + ARG 2 value FIELD a owner Ljava/lang/Object; FIELD c PROPERTY_MAP_PRINTER Ljava/util/function/Function; FIELD d entries Lcom/google/common/collect/ImmutableMap; - FIELD e computedHashCode I - FIELD f entryWithTable Lcom/google/common/collect/Table; + FIELD e hashCode I + FIELD f withTable Lcom/google/common/collect/Table; METHOD (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)V ARG 1 owner + ARG 2 entries METHOD a getProperties ()Ljava/util/Collection; + METHOD a cycle (Lbwf;)Ljava/lang/Object; + ARG 1 property + METHOD a getNext (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 values + ARG 1 value + METHOD a createWithTable (Ljava/util/Map;)V + ARG 1 states METHOD b contains (Lbwf;)Z + METHOD c toMapWith (Lbwf;Ljava/lang/Comparable;)Ljava/util/Map; + ARG 1 property + ARG 2 value METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/structure/rule/AbstractRuleTest.mapping b/mappings/net/minecraft/structure/rule/AbstractRuleTest.mapping new file mode 100644 index 0000000000..40bb28684f --- /dev/null +++ b/mappings/net/minecraft/structure/rule/AbstractRuleTest.mapping @@ -0,0 +1,4 @@ +CLASS civ net/minecraft/structure/rule/AbstractRuleTest + METHOD a getRuleTest ()Lciw; + METHOD a test (Lbvc;Ljava/util/Random;)Z + METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/structure/rule/AlwaysTrueRuleTest.mapping b/mappings/net/minecraft/structure/rule/AlwaysTrueRuleTest.mapping new file mode 100644 index 0000000000..4134eb9aa0 --- /dev/null +++ b/mappings/net/minecraft/structure/rule/AlwaysTrueRuleTest.mapping @@ -0,0 +1,2 @@ +CLASS cij net/minecraft/structure/rule/AlwaysTrueRuleTest + FIELD a INSTANCE Lcij; diff --git a/mappings/net/minecraft/sortme/rule/BlockMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/BlockMatchRuleTest.mapping similarity index 50% rename from mappings/net/minecraft/sortme/rule/BlockMatchRuleTest.mapping rename to mappings/net/minecraft/structure/rule/BlockMatchRuleTest.mapping index cefd116175..542f54c4fb 100644 --- a/mappings/net/minecraft/sortme/rule/BlockMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/BlockMatchRuleTest.mapping @@ -1,4 +1,4 @@ -CLASS cil net/minecraft/sortme/rule/BlockMatchRuleTest +CLASS cil net/minecraft/structure/rule/BlockMatchRuleTest FIELD a block Lbme; METHOD (Lbme;)V ARG 1 block diff --git a/mappings/net/minecraft/sortme/rule/BlockStateMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/BlockStateMatchRuleTest.mapping similarity index 52% rename from mappings/net/minecraft/sortme/rule/BlockStateMatchRuleTest.mapping rename to mappings/net/minecraft/structure/rule/BlockStateMatchRuleTest.mapping index de1c293635..933c70ddb4 100644 --- a/mappings/net/minecraft/sortme/rule/BlockStateMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/BlockStateMatchRuleTest.mapping @@ -1,4 +1,4 @@ -CLASS cin net/minecraft/sortme/rule/BlockStateMatchRuleTest +CLASS cin net/minecraft/structure/rule/BlockStateMatchRuleTest FIELD a blockState Lbvc; METHOD (Lbvc;)V ARG 1 blockState diff --git a/mappings/net/minecraft/sortme/rule/RandomBlockMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/RandomBlockMatchRuleTest.mapping similarity index 61% rename from mappings/net/minecraft/sortme/rule/RandomBlockMatchRuleTest.mapping rename to mappings/net/minecraft/structure/rule/RandomBlockMatchRuleTest.mapping index aeb380fa29..26e6e97255 100644 --- a/mappings/net/minecraft/sortme/rule/RandomBlockMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RandomBlockMatchRuleTest.mapping @@ -1,4 +1,4 @@ -CLASS cis net/minecraft/sortme/rule/RandomBlockMatchRuleTest +CLASS cis net/minecraft/structure/rule/RandomBlockMatchRuleTest FIELD a block Lbme; FIELD b probability F METHOD (Lbme;F)V diff --git a/mappings/net/minecraft/sortme/rule/RandomBlockStateMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/RandomBlockStateMatchRuleTest.mapping similarity index 62% rename from mappings/net/minecraft/sortme/rule/RandomBlockStateMatchRuleTest.mapping rename to mappings/net/minecraft/structure/rule/RandomBlockStateMatchRuleTest.mapping index b950c70800..f01a48f314 100644 --- a/mappings/net/minecraft/sortme/rule/RandomBlockStateMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RandomBlockStateMatchRuleTest.mapping @@ -1,4 +1,4 @@ -CLASS cit net/minecraft/sortme/rule/RandomBlockStateMatchRuleTest +CLASS cit net/minecraft/structure/rule/RandomBlockStateMatchRuleTest FIELD a blockState Lbvc; FIELD b probability F METHOD (Lbvc;F)V diff --git a/mappings/net/minecraft/sortme/rule/RuleTest.mapping b/mappings/net/minecraft/structure/rule/RuleTest.mapping similarity index 60% rename from mappings/net/minecraft/sortme/rule/RuleTest.mapping rename to mappings/net/minecraft/structure/rule/RuleTest.mapping index 49e022b5c4..3a93755211 100644 --- a/mappings/net/minecraft/sortme/rule/RuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RuleTest.mapping @@ -1,4 +1,4 @@ -CLASS ciw net/minecraft/sortme/rule/RuleTest +CLASS ciw net/minecraft/structure/rule/RuleTest METHOD a register (Ljava/lang/String;Lciw;)Lciw; ARG 0 id ARG 1 test diff --git a/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping new file mode 100644 index 0000000000..432dd12f23 --- /dev/null +++ b/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping @@ -0,0 +1,4 @@ +CLASS cjc net/minecraft/structure/rule/TagMatchRuleTest + FIELD a tag Lza; + METHOD (Lza;)V + ARG 1 tag diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index 48fd8f3fff..c53f03ace5 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -23,6 +23,7 @@ CLASS za net/minecraft/tag/Tag METHOD a getId ()Lqs; CLASS za$d CollectionEntry FIELD a values Ljava/util/Collection; + METHOD a getValues ()Ljava/util/Collection; FIELD a id Lqs; FIELD b values Ljava/util/Set; FIELD c entries Ljava/util/Collection; diff --git a/mappings/net/minecraft/text/AbstractTextComponent.mapping b/mappings/net/minecraft/text/AbstractTextComponent.mapping index 9a08011c56..be39374c93 100644 --- a/mappings/net/minecraft/text/AbstractTextComponent.mapping +++ b/mappings/net/minecraft/text/AbstractTextComponent.mapping @@ -1,5 +1,5 @@ CLASS jj net/minecraft/text/AbstractTextComponent - FIELD a children Ljava/util/List; + FIELD a siblings Ljava/util/List; FIELD b style Lju; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/sortme/ChatMessageType.mapping b/mappings/net/minecraft/text/ChatMessageType.mapping similarity index 72% rename from mappings/net/minecraft/sortme/ChatMessageType.mapping rename to mappings/net/minecraft/text/ChatMessageType.mapping index f57529b655..2ddd27d430 100644 --- a/mappings/net/minecraft/sortme/ChatMessageType.mapping +++ b/mappings/net/minecraft/text/ChatMessageType.mapping @@ -1,4 +1,4 @@ -CLASS jk net/minecraft/sortme/ChatMessageType +CLASS jk net/minecraft/text/ChatMessageType FIELD d id B METHOD (Ljava/lang/String;IBZ)V ARG 3 id diff --git a/mappings/net/minecraft/text/ScoreTextComponent.mapping b/mappings/net/minecraft/text/ScoreTextComponent.mapping index d60ac17a50..411625f11b 100644 --- a/mappings/net/minecraft/text/ScoreTextComponent.mapping +++ b/mappings/net/minecraft/text/ScoreTextComponent.mapping @@ -5,6 +5,8 @@ CLASS js net/minecraft/text/ScoreTextComponent FIELD e text Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name + METHOD b resolve (Lcd;)V + ARG 1 source METHOD b setText (Ljava/lang/String;)V METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/text/TextComponent.mapping b/mappings/net/minecraft/text/TextComponent.mapping index f29b6c1c10..c30d3b27d4 100644 --- a/mappings/net/minecraft/text/TextComponent.mapping +++ b/mappings/net/minecraft/text/TextComponent.mapping @@ -8,9 +8,13 @@ CLASS jm net/minecraft/text/TextComponent METHOD a fromJsonString (Lcom/mojang/brigadier/StringReader;)Ljm; METHOD a fromJsonString (Ljava/lang/String;)Ljm; METHOD a toJsonString (Ljm;)Ljava/lang/String; + METHOD a addStyle (Lju;Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V + ARG 1 style + ARG 2 json + ARG 3 context METHOD b fromLenientJsonString (Ljava/lang/String;)Ljm; METHOD b toJson (Ljm;)Lcom/google/gson/JsonElement; - METHOD a getChildren ()Ljava/util/List; + METHOD a getSiblings ()Ljava/util/List; METHOD a getStringTruncated (I)Ljava/lang/String; METHOD a applyFormat (Lc;)Ljm; METHOD a append (Ljava/lang/String;)Ljm; diff --git a/mappings/net/minecraft/text/TextFormat.mapping b/mappings/net/minecraft/text/TextFormat.mapping index d3f72404ef..309f2733d5 100644 --- a/mappings/net/minecraft/text/TextFormat.mapping +++ b/mappings/net/minecraft/text/TextFormat.mapping @@ -11,6 +11,9 @@ CLASS c net/minecraft/text/TextFormat ARG 0 code METHOD a byId (I)Lc; ARG 0 id + METHOD a getNames (ZZ)Ljava/util/Collection; + ARG 0 colors + ARG 1 modifiers METHOD b getId ()I METHOD b stripFormatting (Ljava/lang/String;)Ljava/lang/String; ARG 0 str @@ -22,4 +25,4 @@ CLASS c net/minecraft/text/TextFormat ARG 0 name METHOD e getColor ()Ljava/lang/Integer; METHOD f affectsGlyphWidth ()Z - METHOD g getFormatName ()Ljava/lang/String; + METHOD g getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/TranslatableTextComponent.mapping b/mappings/net/minecraft/text/TranslatableTextComponent.mapping index 8069cc9435..53b17ca875 100644 --- a/mappings/net/minecraft/text/TranslatableTextComponent.mapping +++ b/mappings/net/minecraft/text/TranslatableTextComponent.mapping @@ -1,10 +1,18 @@ CLASS jw net/minecraft/text/TranslatableTextComponent + FIELD b translatedText Ljava/util/List; FIELD c PARAM_PATTERN Ljava/util/regex/Pattern; FIELD d EMPTY_LANGUAGE Lhw; FIELD e LANGUAGE Lhw; FIELD f key Ljava/lang/String; FIELD g params [Ljava/lang/Object; + FIELD h lock Ljava/lang/Object; + FIELD i languageTimeLoaded J + METHOD b getArgument (I)Ljm; + ARG 1 index + METHOD b setTranslatedText (Ljava/lang/String;)V + ARG 1 text METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD i updateTranslation ()V METHOD k getKey ()Ljava/lang/String; METHOD l getParams ()[Ljava/lang/Object; diff --git a/mappings/net/minecraft/text/event/ClickEvent.mapping b/mappings/net/minecraft/text/event/ClickEvent.mapping index e2b0e567f6..5eb87d6d34 100644 --- a/mappings/net/minecraft/text/event/ClickEvent.mapping +++ b/mappings/net/minecraft/text/event/ClickEvent.mapping @@ -5,7 +5,13 @@ CLASS jl net/minecraft/text/event/ClickEvent FIELD c RUN_COMMAND Ljl$a; FIELD d SUGGEST_COMMAND Ljl$a; FIELD e CHANGE_PAGE Ljl$a; + FIELD f ACTIONS Ljava/util/Map; + FIELD g safe Z FIELD h name Ljava/lang/String; + METHOD (Ljava/lang/String;Z)V + ARG 1 name + ARG 2 safe + METHOD a isSafe ()Z METHOD a get (Ljava/lang/String;)Ljl$a; METHOD b getName ()Ljava/lang/String; FIELD a action Ljl$a; diff --git a/mappings/net/minecraft/text/event/HoverEvent.mapping b/mappings/net/minecraft/text/event/HoverEvent.mapping index fbe0998160..309afca026 100644 --- a/mappings/net/minecraft/text/event/HoverEvent.mapping +++ b/mappings/net/minecraft/text/event/HoverEvent.mapping @@ -3,7 +3,13 @@ CLASS jp net/minecraft/text/event/HoverEvent FIELD a SHOW_TEXT Ljp$a; FIELD b SHOW_ITEM Ljp$a; FIELD c SHOW_ENTITY Ljp$a; + FIELD d ACTIONS Ljava/util/Map; + FIELD e safe Z FIELD f name Ljava/lang/String; + METHOD (Ljava/lang/String;Z)V + ARG 1 name + ARG 2 safe + METHOD a isSafe ()Z METHOD a get (Ljava/lang/String;)Ljp$a; METHOD b getName ()Ljava/lang/String; FIELD a action Ljp$a; diff --git a/mappings/net/minecraft/util/FileNameUtil.mapping b/mappings/net/minecraft/util/FileNameUtil.mapping new file mode 100644 index 0000000000..92a5d275fa --- /dev/null +++ b/mappings/net/minecraft/util/FileNameUtil.mapping @@ -0,0 +1,9 @@ +CLASS k net/minecraft/util/FileNameUtil + FIELD b RESERVED_WINDOWS_NAMES Ljava/util/regex/Pattern; + METHOD a isNormal (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD a getNextUniqueName (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + ARG 1 name + ARG 2 extension + METHOD b isAllowedName (Ljava/nio/file/Path;)Z diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index ea9e5eb74e..eff6422b54 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -3,6 +3,11 @@ CLASS qs net/minecraft/util/Identifier FIELD a namespace Ljava/lang/String; FIELD b path Ljava/lang/String; FIELD c EXCEPTION_INVALID Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD (Ljava/lang/String;)V + ARG 1 id + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 namespace + ARG 2 name METHOD a getPath ()Ljava/lang/String; METHOD a isValidChar (C)Z ARG 0 chr diff --git a/mappings/net/minecraft/sortme/ItemScatterer.mapping b/mappings/net/minecraft/util/ItemScatterer.mapping similarity index 88% rename from mappings/net/minecraft/sortme/ItemScatterer.mapping rename to mappings/net/minecraft/util/ItemScatterer.mapping index c0b162c986..f1faa110d7 100644 --- a/mappings/net/minecraft/sortme/ItemScatterer.mapping +++ b/mappings/net/minecraft/util/ItemScatterer.mapping @@ -1,4 +1,4 @@ -CLASS agu net/minecraft/sortme/ItemScatterer +CLASS agu net/minecraft/util/ItemScatterer FIELD a RANDOM Ljava/util/Random; METHOD a spawn (Lbha;DDDLagr;)V ARG 0 world diff --git a/mappings/net/minecraft/village/PointOfInterestSet.mapping b/mappings/net/minecraft/village/PointOfInterestSet.mapping index 6ac5ef724c..7c9b45c9f8 100644 --- a/mappings/net/minecraft/village/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/village/PointOfInterestSet.mapping @@ -6,7 +6,9 @@ CLASS aqc net/minecraft/village/PointOfInterestSet FIELD e valid Z METHOD (Ljava/lang/Runnable;)V ARG 1 updateListener + METHOD a clear ()V METHOD a add (Laqb;)Z + ARG 1 poi METHOD a remove (Lev;)V ARG 1 pos METHOD a add (Lev;Laqd;)V diff --git a/mappings/net/minecraft/sortme/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping similarity index 93% rename from mappings/net/minecraft/sortme/CommandBlockExecutor.mapping rename to mappings/net/minecraft/world/CommandBlockExecutor.mapping index c72062e143..8c263638ef 100644 --- a/mappings/net/minecraft/sortme/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -1,4 +1,4 @@ -CLASS bgh net/minecraft/sortme/CommandBlockExecutor +CLASS bgh net/minecraft/world/CommandBlockExecutor FIELD b DATE_FORMAT Ljava/text/SimpleDateFormat; FIELD c lastExecution J FIELD d updateLastExecution Z diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 6d7c29a9a8..41dddca913 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -16,6 +16,7 @@ CLASS bhb net/minecraft/world/IWorld METHOD aa getMoonSize ()F METHOD ab getMoonPhase ()I METHOD ac getDifficulty ()Lagv; + METHOD c playLevelEvent (ILev;I)V METHOD e getLocalDifficulty (Lev;)Lagw; ARG 1 pos METHOD j getSkyAngle (F)F diff --git a/mappings/net/minecraft/sortme/MobSpawnerEntry.mapping b/mappings/net/minecraft/world/MobSpawnerEntry.mapping similarity index 71% rename from mappings/net/minecraft/sortme/MobSpawnerEntry.mapping rename to mappings/net/minecraft/world/MobSpawnerEntry.mapping index fd8e651ea8..2bf8125540 100644 --- a/mappings/net/minecraft/sortme/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/world/MobSpawnerEntry.mapping @@ -1,4 +1,4 @@ -CLASS bho net/minecraft/sortme/MobSpawnerEntry +CLASS bho net/minecraft/world/MobSpawnerEntry FIELD b entityTag Lib; METHOD (ILib;)V ARG 1 weight diff --git a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping similarity index 93% rename from mappings/net/minecraft/sortme/MobSpawnerLogic.mapping rename to mappings/net/minecraft/world/MobSpawnerLogic.mapping index 6f157de5fd..1b3920199c 100644 --- a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -1,4 +1,4 @@ -CLASS bgi net/minecraft/sortme/MobSpawnerLogic +CLASS bgi net/minecraft/world/MobSpawnerLogic FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b spawnDelay I FIELD c spawnPotentials Ljava/util/List; diff --git a/mappings/net/minecraft/sortme/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping similarity index 89% rename from mappings/net/minecraft/sortme/SpawnHelper.mapping rename to mappings/net/minecraft/world/SpawnHelper.mapping index a15c950ba4..bdb975c9e4 100644 --- a/mappings/net/minecraft/sortme/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -1,4 +1,4 @@ -CLASS bhk net/minecraft/sortme/SpawnHelper +CLASS bhk net/minecraft/world/SpawnHelper FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a spawnEntitiesInChunk (Laio;Lbha;Lbxc;Lev;)V ARG 0 category diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 9f46dafc18..b041276313 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -34,6 +34,9 @@ CLASS bgt net/minecraft/world/explosion/Explosion ARG 7 z METHOD a collectBlocksAndDamageEntities ()V METHOD a setDamageSource (Lahm;)V + METHOD a getExposure (Lcro;Laid;)F + ARG 0 source + ARG 1 entity METHOD a affectWorld (Z)V METHOD b getDamageSource ()Lahm; METHOD c getAffectedPlayers ()Ljava/util/Map;