From 510f8cbc08f6f7a537732ff80d8e751f919d6b97 Mon Sep 17 00:00:00 2001 From: Chloe Dawn Date: Fri, 7 Jun 2019 12:18:04 +0100 Subject: [PATCH] Text refactoring + related mappings (#737) * Text refactoring + related mappings * Add a more explicit name for the truncated string getter * Move Formatting to util package and fully map members * Advancement#toHoverableText * Correct mappings in ScoreboardObjective * Various changes in NbtText and subclasses * JSONREADER -> JSON_READER * Shorten TranslatableText argument getter to getArg * Cleanup mappings in Difficulty class * Fix Style$Serializer#deserialize json parameter name * Cleanup some field names in TranslatableText * More changes to NbtText * Fix incorrect method name in Texts * toGreenText -> join * Use more semantically correct name joinOrdered * Fix method name in Entity * Actually fix the method names.. derp --- mappings/net/minecraft/ChatFormat.mapping | 27 -------- .../minecraft/advancement/Advancement.mapping | 4 +- mappings/net/minecraft/block/Block.mapping | 2 +- .../minecraft/client/gui/hud/ChatHud.mapping | 2 +- .../client/gui/hud/ChatHudLine.mapping | 12 ++-- .../client/options/ServerEntry.mapping | 6 +- .../render/entity/PlayerModelPart.mapping | 4 +- .../command/CommandException.mapping | 4 +- ...tType.mapping => TextArgumentType.mapping} | 4 +- .../minecraft/enchantment/Enchantment.mapping | 4 +- mappings/net/minecraft/entity/Entity.mapping | 2 +- .../net/minecraft/entity/EntityType.mapping | 4 +- .../entity/boss/CommandBossBar.mapping | 4 +- .../entity/player/PlayerEntity.mapping | 4 +- mappings/net/minecraft/nbt/Tag.mapping | 4 +- ...essageType.mapping => MessageType.mapping} | 3 +- .../minecraft/network/chat/ClickEvent.mapping | 16 ----- .../minecraft/network/chat/Component.mapping | 36 ----------- .../chat/ComponentWithSelectors.mapping | 3 - .../minecraft/network/chat/Components.mapping | 14 ----- .../minecraft/network/chat/HoverEvent.mapping | 16 ----- .../network/chat/KeybindComponent.mapping | 5 -- .../network/chat/NbtComponent.mapping | 32 ---------- .../network/chat/TextComponent.mapping | 5 -- .../chat/TranslatableComponent.mapping | 18 ------ .../network/chat/TranslationException.mapping | 7 --- .../scoreboard/ScoreboardObjective.mapping | 7 ++- .../net/minecraft/server/BanEntry.mapping | 2 +- .../BaseText.mapping} | 4 +- .../net/minecraft/text/ClickEvent.mapping | 23 +++++++ .../net/minecraft/text/HoverEvent.mapping | 23 +++++++ .../net/minecraft/text/KeybindText.mapping | 11 ++++ .../net/minecraft/text/LiteralText.mapping | 7 +++ mappings/net/minecraft/text/NbtText.mapping | 61 +++++++++++++++++++ .../net/minecraft/text/ParsableText.mapping | 5 ++ .../ScoreText.mapping} | 10 +-- .../SelectorText.mapping} | 5 +- .../{network/chat => text}/Style.mapping | 26 +++++--- mappings/net/minecraft/text/Text.mapping | 57 +++++++++++++++++ mappings/net/minecraft/text/Texts.mapping | 25 ++++++++ .../minecraft/text/TranslatableText.mapping | 21 +++++++ .../text/TranslationException.mapping | 10 +++ .../net/minecraft/util/Formatting.mapping | 49 +++++++++++++++ .../net/minecraft/util/PacketByteBuf.mapping | 5 +- .../net/minecraft/world/Difficulty.mapping | 17 +++--- mappings/net/minecraft/world/GameMode.mapping | 2 +- .../net/minecraft/world/biome/Biome.mapping | 2 +- .../world/level/storage/LevelSummary.mapping | 2 +- 48 files changed, 380 insertions(+), 236 deletions(-) delete mode 100644 mappings/net/minecraft/ChatFormat.mapping rename mappings/net/minecraft/command/arguments/{ComponentArgumentType.mapping => TextArgumentType.mapping} (55%) rename mappings/net/minecraft/network/{chat/ChatMessageType.mapping => MessageType.mapping} (72%) delete mode 100644 mappings/net/minecraft/network/chat/ClickEvent.mapping delete mode 100644 mappings/net/minecraft/network/chat/Component.mapping delete mode 100644 mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping delete mode 100644 mappings/net/minecraft/network/chat/Components.mapping delete mode 100644 mappings/net/minecraft/network/chat/HoverEvent.mapping delete mode 100644 mappings/net/minecraft/network/chat/KeybindComponent.mapping delete mode 100644 mappings/net/minecraft/network/chat/NbtComponent.mapping delete mode 100644 mappings/net/minecraft/network/chat/TextComponent.mapping delete mode 100644 mappings/net/minecraft/network/chat/TranslatableComponent.mapping delete mode 100644 mappings/net/minecraft/network/chat/TranslationException.mapping rename mappings/net/minecraft/{network/chat/BaseComponent.mapping => text/BaseText.mapping} (60%) create mode 100644 mappings/net/minecraft/text/ClickEvent.mapping create mode 100644 mappings/net/minecraft/text/HoverEvent.mapping create mode 100644 mappings/net/minecraft/text/KeybindText.mapping create mode 100644 mappings/net/minecraft/text/LiteralText.mapping create mode 100644 mappings/net/minecraft/text/NbtText.mapping create mode 100644 mappings/net/minecraft/text/ParsableText.mapping rename mappings/net/minecraft/{network/chat/ScoreComponent.mapping => text/ScoreText.mapping} (64%) rename mappings/net/minecraft/{network/chat/SelectorComponent.mapping => text/SelectorText.mapping} (59%) rename mappings/net/minecraft/{network/chat => text}/Style.mapping (81%) create mode 100644 mappings/net/minecraft/text/Text.mapping create mode 100644 mappings/net/minecraft/text/Texts.mapping create mode 100644 mappings/net/minecraft/text/TranslatableText.mapping create mode 100644 mappings/net/minecraft/text/TranslationException.mapping create mode 100644 mappings/net/minecraft/util/Formatting.mapping diff --git a/mappings/net/minecraft/ChatFormat.mapping b/mappings/net/minecraft/ChatFormat.mapping deleted file mode 100644 index 471e8bdd9a..0000000000 --- a/mappings/net/minecraft/ChatFormat.mapping +++ /dev/null @@ -1,27 +0,0 @@ -CLASS c net/minecraft/ChatFormat - FIELD A modifier Z - FIELD B code Ljava/lang/String; - FIELD C id I - FIELD D color Ljava/lang/Integer; - FIELD x FORMAT_PATTERN Ljava/util/regex/Pattern; - FIELD z sectionSignCode C - METHOD a bySectionSignCode (C)Lc; - ARG 0 code - METHOD a byId (I)Lc; - ARG 0 id - METHOD a getFormatAtEnd (Ljava/lang/String;)Ljava/lang/String; - 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 - METHOD c isModifier ()Z - METHOD c getFormatByName (Ljava/lang/String;)Lc; - ARG 0 name - METHOD d isColor ()Z - METHOD d sanitizeName (Ljava/lang/String;)Ljava/lang/String; - ARG 0 name - METHOD e getColor ()Ljava/lang/Integer; - METHOD f affectsGlyphWidth ()Z - METHOD g getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index e999288601..20465849d6 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -40,7 +40,7 @@ CLASS q net/minecraft/advancement/Advancement FIELD e criteria Ljava/util/Map; FIELD f requirements [[Ljava/lang/String; FIELD g children Ljava/util/Set; - FIELD h textComponent Ljm; + FIELD h text Ljm; METHOD a createTask ()Lq$a; METHOD a addChild (Lq;)V METHOD b getParent ()Lq; @@ -53,4 +53,4 @@ CLASS q net/minecraft/advancement/Advancement METHOD g getRequirementCount ()I METHOD h getId ()Lqs; METHOD i getRequirements ()[[Ljava/lang/String; - METHOD j getTextComponent ()Ljm; + METHOD j toHoverableText ()Ljm; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 03c62fde87..888cd69741 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -449,7 +449,7 @@ CLASS bmn net/minecraft/block/Block ARG 1 state ARG 2 view ARG 3 pos - METHOD k getTextComponent ()Ljm; + METHOD k getName ()Ljm; METHOD k getRawIdFromState (Lbvl;)I ARG 0 state METHOD k getLightSubtracted (Lbvl;Lbgt;Lev;)I diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index c30765588a..3f63d49730 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -6,7 +6,7 @@ CLASS cws net/minecraft/client/gui/hud/ChatHud METHOD (Lcvl;)V ARG 1 client METHOD a reset ()V - METHOD a getTextComponentAt (DD)Ljm; + METHOD a getText (DD)Ljm; ARG 1 x ARG 3 y METHOD a draw (I)V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping index 34e3b61dfa..bc2475dab8 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping @@ -1,11 +1,11 @@ CLASS cvg net/minecraft/client/gui/hud/ChatHudLine - FIELD a tickCreated I - FIELD b contents Ljm; + FIELD a timestamp I + FIELD b text Ljm; FIELD c id I METHOD (ILjm;I)V - ARG 1 tickCreated - ARG 2 contents + ARG 1 timestamp + ARG 2 text ARG 3 id - METHOD a getContents ()Ljm; - METHOD b getTickCreated ()I + METHOD a getText ()Ljm; + METHOD b getTimestamp ()I METHOD c getId ()I diff --git a/mappings/net/minecraft/client/options/ServerEntry.mapping b/mappings/net/minecraft/client/options/ServerEntry.mapping index ba6667ccf7..2bbb26a18b 100644 --- a/mappings/net/minecraft/client/options/ServerEntry.mapping +++ b/mappings/net/minecraft/client/options/ServerEntry.mapping @@ -1,7 +1,9 @@ CLASS dhr net/minecraft/client/options/ServerEntry CLASS dhr$a ResourcePackState - FIELD d component Ljm; - METHOD a getComponent ()Ljm; + FIELD d name Ljm; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD a getName ()Ljm; FIELD a name Ljava/lang/String; FIELD b address Ljava/lang/String; FIELD c playerCountLabel Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping index 8edd9a87e0..f505ae5133 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping @@ -2,10 +2,10 @@ CLASS awa net/minecraft/client/render/entity/PlayerModelPart FIELD h id I FIELD i bitFlag I FIELD j name Ljava/lang/String; - FIELD k localizedName Ljm; + FIELD k optionName Ljm; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 name METHOD a getBitFlag ()I METHOD c getName ()Ljava/lang/String; - METHOD d getLocalizedName ()Ljm; + METHOD d getOptionName ()Ljm; diff --git a/mappings/net/minecraft/command/CommandException.mapping b/mappings/net/minecraft/command/CommandException.mapping index 4191134cea..86a9e88f02 100644 --- a/mappings/net/minecraft/command/CommandException.mapping +++ b/mappings/net/minecraft/command/CommandException.mapping @@ -1,3 +1,5 @@ CLASS cb net/minecraft/command/CommandException FIELD a message Ljm; - METHOD a getMessageComponent ()Ljm; + METHOD (Ljm;)V + ARG 1 message + METHOD a getMessageText ()Ljm; diff --git a/mappings/net/minecraft/command/arguments/ComponentArgumentType.mapping b/mappings/net/minecraft/command/arguments/TextArgumentType.mapping similarity index 55% rename from mappings/net/minecraft/command/arguments/ComponentArgumentType.mapping rename to mappings/net/minecraft/command/arguments/TextArgumentType.mapping index fbcb4bc6f4..c9ee15a110 100644 --- a/mappings/net/minecraft/command/arguments/ComponentArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/TextArgumentType.mapping @@ -1,7 +1,7 @@ -CLASS ch net/minecraft/command/arguments/ComponentArgumentType +CLASS ch net/minecraft/command/arguments/TextArgumentType FIELD a INVALID_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lch; - METHOD a getComponent (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljm; + METHOD a getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljm; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 230f8a5af9..00d72d004a 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -6,7 +6,7 @@ CLASS bfk net/minecraft/enchantment/Enchantment METHOD a getWeight ()I FIELD a slotTypes [Laio; FIELD b type Lbfl; - FIELD c translationName Ljava/lang/String; + FIELD c translationKey Ljava/lang/String; FIELD d weight Lbfk$a; METHOD (Lbfk$a;Lbfl;[Laio;)V ARG 1 weight @@ -41,7 +41,7 @@ CLASS bfk net/minecraft/enchantment/Enchantment METHOD c byRawId (I)Lbfk; ARG 0 id METHOD d getWeight ()Lbfk$a; - METHOD d getTextComponent (I)Ljm; + METHOD d getName (I)Ljm; ARG 1 level METHOD e getMinimumLevel ()I METHOD f getOrCreateTranslationKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index ba8cea7e05..3dc4af0b64 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -335,7 +335,7 @@ CLASS aij net/minecraft/entity/Entity METHOD bG shouldRenderName ()Z METHOD bH getHorizontalFacing ()Lfa; METHOD bI getMovementDirection ()Lfa; - METHOD bJ getComponentHoverEvent ()Ljp; + METHOD bJ getHoverEvent ()Ljp; METHOD bK getBoundingBox ()Lcrt; METHOD bL getVisibilityBoundingBox ()Lcrt; METHOD bM getStandingEyeHeight ()F diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 6d3d859e1d..b75620df76 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -33,7 +33,7 @@ CLASS ain net/minecraft/entity/EntityType FIELD bc summonable Z FIELD bd fireImmune Z FIELD be translationKey Ljava/lang/String; - FIELD bf textComponent Ljm; + FIELD bf name Ljm; FIELD bg lootTableId Lqs; FIELD bh dataFixerType Lcom/mojang/datafixers/types/Type; FIELD bi size Laik; @@ -111,7 +111,7 @@ CLASS ain net/minecraft/entity/EntityType METHOD c isFireImmune ()Z METHOD d getCategory ()Laiu; METHOD e getTranslationKey ()Ljava/lang/String; - METHOD f getTextComponent ()Ljm; + METHOD f getName ()Ljm; METHOD g getLootTableId ()Lqs; METHOD h getWidth ()F METHOD i getHeight ()F diff --git a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping index 2020b97baa..897e5d79cd 100644 --- a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping @@ -16,6 +16,8 @@ CLASS ri net/minecraft/entity/boss/CommandBossBar ARG 1 players METHOD a addPlayer (Ljava/util/UUID;)V ARG 1 uuid + METHOD a (Lju;)V + ARG 1 style METHOD b setMaxValue (I)V ARG 1 maxValue METHOD c getValue ()I @@ -24,5 +26,5 @@ CLASS ri net/minecraft/entity/boss/CommandBossBar METHOD d getMaxValue ()I METHOD d onPlayerDisconnect (Lvh;)V ARG 1 player - METHOD e getTextComponent ()Ljm; + METHOD e toHoverableText ()Ljm; METHOD f toTag ()Lib; diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index f050bb93c2..032141bdc1 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -1,7 +1,9 @@ CLASS avz net/minecraft/entity/player/PlayerEntity CLASS avz$a SleepFailureReason FIELD g text Ljm; - METHOD a getText ()Ljm; + METHOD (Ljava/lang/String;ILjm;)V + ARG 3 text + METHOD a toText ()Ljm; FIELD bA container Layd; FIELD bB hungerManager Laxz; FIELD bF experiencePickUpDelay I diff --git a/mappings/net/minecraft/nbt/Tag.mapping b/mappings/net/minecraft/nbt/Tag.mapping index 118291b2da..3bebbc2b08 100644 --- a/mappings/net/minecraft/nbt/Tag.mapping +++ b/mappings/net/minecraft/nbt/Tag.mapping @@ -11,10 +11,10 @@ CLASS is net/minecraft/nbt/Tag ARG 1 input ARG 2 depth METHOD a write (Ljava/io/DataOutput;)V - METHOD a toTextComponent (Ljava/lang/String;I)Ljm; + METHOD a toText (Ljava/lang/String;I)Ljm; ARG 1 indent METHOD b copy ()Lis; METHOD c_ asString ()Ljava/lang/String; - METHOD k toTextComponent ()Ljm; + METHOD k toText ()Ljm; METHOD l idToString (I)Ljava/lang/String; ARG 0 id diff --git a/mappings/net/minecraft/network/chat/ChatMessageType.mapping b/mappings/net/minecraft/network/MessageType.mapping similarity index 72% rename from mappings/net/minecraft/network/chat/ChatMessageType.mapping rename to mappings/net/minecraft/network/MessageType.mapping index 7202a2eae0..a8074ffb0b 100644 --- a/mappings/net/minecraft/network/chat/ChatMessageType.mapping +++ b/mappings/net/minecraft/network/MessageType.mapping @@ -1,8 +1,9 @@ -CLASS jk net/minecraft/network/chat/ChatMessageType +CLASS jk net/minecraft/network/MessageType FIELD d id B FIELD e interruptsNarration Z METHOD (Ljava/lang/String;IBZ)V ARG 3 id + ARG 4 interruptsNarration METHOD a getId ()B METHOD a byId (B)Ljk; ARG 0 id diff --git a/mappings/net/minecraft/network/chat/ClickEvent.mapping b/mappings/net/minecraft/network/chat/ClickEvent.mapping deleted file mode 100644 index 12553db005..0000000000 --- a/mappings/net/minecraft/network/chat/ClickEvent.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS jl net/minecraft/network/chat/ClickEvent - CLASS jl$a Action - FIELD f ACTIONS Ljava/util/Map; - FIELD g safe Z - FIELD h name Ljava/lang/String; - METHOD a isSafe ()Z - METHOD a get (Ljava/lang/String;)Ljl$a; - METHOD b getName ()Ljava/lang/String; - FIELD a action Ljl$a; - FIELD b value Ljava/lang/String; - METHOD (Ljl$a;Ljava/lang/String;)V - ARG 1 action - METHOD a getAction ()Ljl$a; - METHOD b getValue ()Ljava/lang/String; - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/network/chat/Component.mapping b/mappings/net/minecraft/network/chat/Component.mapping deleted file mode 100644 index a0617b7cde..0000000000 --- a/mappings/net/minecraft/network/chat/Component.mapping +++ /dev/null @@ -1,36 +0,0 @@ -CLASS jm net/minecraft/network/chat/Component - CLASS jm$a Serializer - FIELD a GSON Lcom/google/gson/Gson; - FIELD b POS_FIELD Ljava/lang/reflect/Field; - FIELD c LINE_START_FIELD Ljava/lang/reflect/Field; - METHOD a fromJson (Lcom/google/gson/JsonElement;)Ljm; - METHOD a getReaderPosition (Lcom/google/gson/stream/JsonReader;)I - 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 deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson - ARG 2 unused - ARG 3 context - 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; - METHOD a modifyStyle (Ljava/util/function/Consumer;)Ljm; - METHOD a append (Ljm;)Ljm; - METHOD a setStyle (Lju;)Ljm; - METHOD a applyFormat ([Lc;)Ljm; - METHOD b getStyle ()Lju; - METHOD b copyWithoutChildren (Ljm;)Ljm; - METHOD c stream ()Ljava/util/stream/Stream; - METHOD d getText ()Ljava/lang/String; - METHOD e getFormattedText ()Ljava/lang/String; - METHOD f streamCopied ()Ljava/util/stream/Stream; - METHOD g copyShallow ()Ljm; - METHOD h copy ()Ljm; diff --git a/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping b/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping deleted file mode 100644 index ebf0ead5b7..0000000000 --- a/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS jo net/minecraft/network/chat/ComponentWithSelectors - METHOD a resolve (Lcd;Laij;I)Ljm; - ARG 1 source diff --git a/mappings/net/minecraft/network/chat/Components.mapping b/mappings/net/minecraft/network/chat/Components.mapping deleted file mode 100644 index 26bb48c519..0000000000 --- a/mappings/net/minecraft/network/chat/Components.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS jn net/minecraft/network/chat/Components - METHOD a resolveAndStyle (Lcd;Ljm;Laij;I)Ljm; - ARG 0 source - ARG 1 component - ARG 2 entity - METHOD a profile (Lcom/mojang/authlib/GameProfile;)Ljm; - METHOD a message (Lcom/mojang/brigadier/Message;)Ljm; - METHOD a sortedJoin (Ljava/util/Collection;)Ljm; - METHOD a sortedJoin (Ljava/util/Collection;Ljava/util/function/Function;)Ljm; - METHOD a bracketed (Ljm;)Ljm; - METHOD a style (Ljm;Lju;)Ljm; - ARG 0 component - ARG 1 style - METHOD b join (Ljava/util/Collection;Ljava/util/function/Function;)Ljm; diff --git a/mappings/net/minecraft/network/chat/HoverEvent.mapping b/mappings/net/minecraft/network/chat/HoverEvent.mapping deleted file mode 100644 index 60e3de45b5..0000000000 --- a/mappings/net/minecraft/network/chat/HoverEvent.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS jp net/minecraft/network/chat/HoverEvent - CLASS jp$a Action - FIELD d ACTIONS Ljava/util/Map; - FIELD e safe Z - FIELD f name Ljava/lang/String; - METHOD a isSafe ()Z - METHOD a get (Ljava/lang/String;)Ljp$a; - METHOD b getName ()Ljava/lang/String; - FIELD a action Ljp$a; - FIELD b value Ljm; - METHOD (Ljp$a;Ljm;)V - ARG 1 action - METHOD a getAction ()Ljp$a; - METHOD b getValue ()Ljm; - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/network/chat/KeybindComponent.mapping b/mappings/net/minecraft/network/chat/KeybindComponent.mapping deleted file mode 100644 index 03ac426389..0000000000 --- a/mappings/net/minecraft/network/chat/KeybindComponent.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS jq net/minecraft/network/chat/KeybindComponent - FIELD c keybind Ljava/lang/String; - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD j getKeybind ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/chat/NbtComponent.mapping b/mappings/net/minecraft/network/chat/NbtComponent.mapping deleted file mode 100644 index e1aacfd297..0000000000 --- a/mappings/net/minecraft/network/chat/NbtComponent.mapping +++ /dev/null @@ -1,32 +0,0 @@ -CLASS jr net/minecraft/network/chat/NbtComponent - CLASS jr$a BlockPosArgument - FIELD e pos Ljava/lang/String; - FIELD f parsedPos Ldl; - METHOD b parsePos (Ljava/lang/String;)Ldl; - ARG 1 pos - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD k getPos ()Ljava/lang/String; - CLASS jr$b EntityNbtComponent - FIELD e selector Ljava/lang/String; - FIELD f parsedSelector Lec; - METHOD b parseSelector (Ljava/lang/String;)Lec; - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD k getSelector ()Ljava/lang/String; - FIELD b componentJson Z - FIELD c path Ljava/lang/String; - FIELD d parsedPath Lcr$h; - FIELD e LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Ljava/lang/String;Lcr$h;Z)V - ARG 1 path - ARG 2 parsedPath - ARG 3 componentJson - METHOD (Ljava/lang/String;Z)V - ARG 1 path - METHOD a resolve (Lcd;)Ljava/util/stream/Stream; - ARG 1 source - METHOD b parsePath (Ljava/lang/String;)Lcr$h; - ARG 0 string - METHOD i getPath ()Ljava/lang/String; - METHOD j isComponentJson ()Z diff --git a/mappings/net/minecraft/network/chat/TextComponent.mapping b/mappings/net/minecraft/network/chat/TextComponent.mapping deleted file mode 100644 index eae7976dda..0000000000 --- a/mappings/net/minecraft/network/chat/TextComponent.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS jv net/minecraft/network/chat/TextComponent - FIELD b text Ljava/lang/String; - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD i getTextField ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/chat/TranslatableComponent.mapping b/mappings/net/minecraft/network/chat/TranslatableComponent.mapping deleted file mode 100644 index 4af4413320..0000000000 --- a/mappings/net/minecraft/network/chat/TranslatableComponent.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS jw net/minecraft/network/chat/TranslatableComponent - 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/network/chat/TranslationException.mapping b/mappings/net/minecraft/network/chat/TranslationException.mapping deleted file mode 100644 index 95ae11a941..0000000000 --- a/mappings/net/minecraft/network/chat/TranslationException.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS jx net/minecraft/network/chat/TranslationException - METHOD (Ljw;I)V - ARG 1 component - METHOD (Ljw;Ljava/lang/String;)V - ARG 1 component - METHOD (Ljw;Ljava/lang/Throwable;)V - ARG 1 component diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping index 122380b205..7363fab316 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping @@ -9,11 +9,16 @@ CLASS csv net/minecraft/scoreboard/ScoreboardObjective ARG 2 name ARG 3 criterion ARG 4 displayName + ARG 5 renderType METHOD a getScoreboard ()Lcsy; METHOD a setRenderType (Lctb$a;)V + ARG 1 renderType METHOD a setDisplayName (Ljm;)V + ARG 1 name + METHOD a (Lju;)V + ARG 1 style METHOD b getName ()Ljava/lang/String; METHOD c getCriterion ()Lctb; METHOD d getDisplayName ()Ljm; - METHOD e getTextComponent ()Ljm; + METHOD e toHoverableText ()Ljm; METHOD f getRenderType ()Lctb$a; diff --git a/mappings/net/minecraft/server/BanEntry.mapping b/mappings/net/minecraft/server/BanEntry.mapping index 1f7ed55609..17a6b0b955 100644 --- a/mappings/net/minecraft/server/BanEntry.mapping +++ b/mappings/net/minecraft/server/BanEntry.mapping @@ -7,4 +7,4 @@ CLASS xm net/minecraft/server/BanEntry METHOD b getSource ()Ljava/lang/String; METHOD c getExpiryDate ()Ljava/util/Date; METHOD d getReason ()Ljava/lang/String; - METHOD e asTextComponent ()Ljm; + METHOD e toText ()Ljm; diff --git a/mappings/net/minecraft/network/chat/BaseComponent.mapping b/mappings/net/minecraft/text/BaseText.mapping similarity index 60% rename from mappings/net/minecraft/network/chat/BaseComponent.mapping rename to mappings/net/minecraft/text/BaseText.mapping index db7e5b1c28..d461620fa0 100644 --- a/mappings/net/minecraft/network/chat/BaseComponent.mapping +++ b/mappings/net/minecraft/text/BaseText.mapping @@ -1,5 +1,5 @@ -CLASS jj net/minecraft/network/chat/BaseComponent +CLASS jj net/minecraft/text/BaseText FIELD a siblings Ljava/util/List; FIELD b style Lju; METHOD equals (Ljava/lang/Object;)Z - ARG 1 o + ARG 1 obj diff --git a/mappings/net/minecraft/text/ClickEvent.mapping b/mappings/net/minecraft/text/ClickEvent.mapping new file mode 100644 index 0000000000..8f076a3a29 --- /dev/null +++ b/mappings/net/minecraft/text/ClickEvent.mapping @@ -0,0 +1,23 @@ +CLASS jl net/minecraft/text/ClickEvent + CLASS jl$a Action + FIELD f BY_NAME Ljava/util/Map; + FIELD g userDefinable Z + FIELD h name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;Z)V + ARG 3 name + ARG 4 userDefinable + METHOD a isUserDefinable ()Z + METHOD a byName (Ljava/lang/String;)Ljl$a; + ARG 0 name + METHOD a (Ljl$a;)Ljl$a; + ARG 0 a + METHOD b getName ()Ljava/lang/String; + FIELD a action Ljl$a; + FIELD b value Ljava/lang/String; + METHOD (Ljl$a;Ljava/lang/String;)V + ARG 1 action + ARG 2 value + METHOD a getAction ()Ljl$a; + METHOD b getValue ()Ljava/lang/String; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 obj diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping new file mode 100644 index 0000000000..276f8f9e38 --- /dev/null +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -0,0 +1,23 @@ +CLASS jp net/minecraft/text/HoverEvent + CLASS jp$a Action + FIELD d BY_NAME Ljava/util/Map; + FIELD e userDefinable Z + FIELD f name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;Z)V + ARG 3 name + ARG 4 userDefinable + METHOD a isUserDefinable ()Z + METHOD a byName (Ljava/lang/String;)Ljp$a; + ARG 0 name + METHOD a (Ljp$a;)Ljp$a; + ARG 0 a + METHOD b getName ()Ljava/lang/String; + FIELD a action Ljp$a; + FIELD b value Ljm; + METHOD (Ljp$a;Ljm;)V + ARG 1 action + ARG 2 value + METHOD a getAction ()Ljp$a; + METHOD b getValue ()Ljm; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 obj diff --git a/mappings/net/minecraft/text/KeybindText.mapping b/mappings/net/minecraft/text/KeybindText.mapping new file mode 100644 index 0000000000..b5de721a6b --- /dev/null +++ b/mappings/net/minecraft/text/KeybindText.mapping @@ -0,0 +1,11 @@ +CLASS jq net/minecraft/text/KeybindText + FIELD b i18n Ljava/util/function/Function; + FIELD c key Ljava/lang/String; + FIELD d name Ljava/util/function/Supplier; + METHOD (Ljava/lang/String;)V + ARG 1 key + METHOD b (Ljava/lang/String;)Ljava/util/function/Supplier; + ARG 0 key + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD j getKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/LiteralText.mapping b/mappings/net/minecraft/text/LiteralText.mapping new file mode 100644 index 0000000000..ea332194c3 --- /dev/null +++ b/mappings/net/minecraft/text/LiteralText.mapping @@ -0,0 +1,7 @@ +CLASS jv net/minecraft/text/LiteralText + FIELD b string Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 string + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD i getRawString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/NbtText.mapping b/mappings/net/minecraft/text/NbtText.mapping new file mode 100644 index 0000000000..6d44b81489 --- /dev/null +++ b/mappings/net/minecraft/text/NbtText.mapping @@ -0,0 +1,61 @@ +CLASS jr net/minecraft/text/NbtText + CLASS jr$a BlockNbtText + FIELD e rawPos Ljava/lang/String; + FIELD f pos Ldl; + METHOD (Ljava/lang/String;Lcr$h;ZLjava/lang/String;Ldl;)V + ARG 1 rawPath + ARG 2 path + ARG 3 interpret + ARG 4 rawPos + ARG 5 pos + METHOD (Ljava/lang/String;ZLjava/lang/String;)V + ARG 1 rawPath + ARG 2 rawJson + ARG 3 rawPos + METHOD b parsePos (Ljava/lang/String;)Ldl; + ARG 1 rawPos + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD k getPos ()Ljava/lang/String; + CLASS jr$b EntityNbtText + FIELD e rawSelector Ljava/lang/String; + FIELD f selector Lec; + METHOD (Ljava/lang/String;Lcr$h;ZLjava/lang/String;Lec;)V + ARG 1 rawPath + ARG 2 path + ARG 3 interpret + ARG 4 rawSelector + ARG 5 selector + METHOD (Ljava/lang/String;ZLjava/lang/String;)V + ARG 1 rawPath + ARG 2 interpret + ARG 3 rawSelector + METHOD b parseSelector (Ljava/lang/String;)Lec; + ARG 0 rawSelector + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD k getSelector ()Ljava/lang/String; + FIELD b interpret Z + FIELD c rawPath Ljava/lang/String; + FIELD d path Lcr$h; + FIELD e LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/lang/String;Lcr$h;Z)V + ARG 1 rawPath + ARG 2 path + ARG 3 interpret + METHOD (Ljava/lang/String;Z)V + ARG 1 rawPath + ARG 2 interpret + METHOD a toNbt (Lcd;)Ljava/util/stream/Stream; + ARG 1 source + METHOD a (Lcd;Laij;ILjava/lang/String;)Ljava/util/stream/Stream; + ARG 3 text + METHOD a (Lib;)Ljava/util/stream/Stream; + ARG 1 nbt + METHOD a (Ljm;Ljm;)Ljm; + ARG 0 a + ARG 1 b + METHOD b parsePath (Ljava/lang/String;)Lcr$h; + ARG 0 rawPath + METHOD i getPath ()Ljava/lang/String; + METHOD j shouldInterpret ()Z diff --git a/mappings/net/minecraft/text/ParsableText.mapping b/mappings/net/minecraft/text/ParsableText.mapping new file mode 100644 index 0000000000..5c7c96c41b --- /dev/null +++ b/mappings/net/minecraft/text/ParsableText.mapping @@ -0,0 +1,5 @@ +CLASS jo net/minecraft/text/ParsableText + METHOD a parse (Lcd;Laij;I)Ljm; + ARG 1 source + ARG 2 sender + ARG 3 depth diff --git a/mappings/net/minecraft/network/chat/ScoreComponent.mapping b/mappings/net/minecraft/text/ScoreText.mapping similarity index 64% rename from mappings/net/minecraft/network/chat/ScoreComponent.mapping rename to mappings/net/minecraft/text/ScoreText.mapping index a7edf8ba19..acea13a0de 100644 --- a/mappings/net/minecraft/network/chat/ScoreComponent.mapping +++ b/mappings/net/minecraft/text/ScoreText.mapping @@ -1,13 +1,15 @@ -CLASS js net/minecraft/network/chat/ScoreComponent +CLASS js net/minecraft/text/ScoreText FIELD b name Ljava/lang/String; FIELD c selector Lec; FIELD d objective Ljava/lang/String; - FIELD e text Ljava/lang/String; + FIELD e score Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name - METHOD b resolve (Lcd;)V + ARG 2 objective + METHOD b parse (Lcd;)V ARG 1 source - METHOD b setText (Ljava/lang/String;)V + METHOD b setScore (Ljava/lang/String;)V + ARG 1 score METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD i getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/chat/SelectorComponent.mapping b/mappings/net/minecraft/text/SelectorText.mapping similarity index 59% rename from mappings/net/minecraft/network/chat/SelectorComponent.mapping rename to mappings/net/minecraft/text/SelectorText.mapping index bc11a378e9..81b57d70bf 100644 --- a/mappings/net/minecraft/network/chat/SelectorComponent.mapping +++ b/mappings/net/minecraft/text/SelectorText.mapping @@ -1,6 +1,9 @@ -CLASS jt net/minecraft/network/chat/SelectorComponent +CLASS jt net/minecraft/text/SelectorText FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c pattern Ljava/lang/String; + FIELD d selector Lec; + METHOD (Ljava/lang/String;)V + ARG 1 pattern METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD i getPattern ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/chat/Style.mapping b/mappings/net/minecraft/text/Style.mapping similarity index 81% rename from mappings/net/minecraft/network/chat/Style.mapping rename to mappings/net/minecraft/text/Style.mapping index 6d6ca62d19..5a9e300ff7 100644 --- a/mappings/net/minecraft/network/chat/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -1,12 +1,12 @@ -CLASS ju net/minecraft/network/chat/Style +CLASS ju net/minecraft/text/Style CLASS ju$a Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson - ARG 2 unused + ARG 1 json + ARG 2 type ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused + ARG 1 style + ARG 2 type ARG 3 context FIELD a parent Lju; FIELD b color Lc; @@ -21,27 +21,37 @@ CLASS ju net/minecraft/network/chat/Style FIELD k ROOT Lju; METHOD a getColor ()Lc; METHOD a setColor (Lc;)Lju; + ARG 1 color METHOD a setBold (Ljava/lang/Boolean;)Lju; + ARG 1 bold METHOD a setInsertion (Ljava/lang/String;)Lju; + ARG 1 insertion METHOD a setClickEvent (Ljl;)Lju; + ARG 1 clickEvent METHOD a setHoverEvent (Ljp;)Lju; + ARG 1 clickEvent METHOD a setParent (Lju;)Lju; + ARG 1 parent METHOD b isBold ()Z METHOD b setItalic (Ljava/lang/Boolean;)Lju; + ARG 1 italic METHOD c isItalic ()Z METHOD c setStrikethrough (Ljava/lang/Boolean;)Lju; + ARG 1 strikethrough METHOD d isStrikethrough ()Z METHOD d setUnderline (Ljava/lang/Boolean;)Lju; + ARG 1 underline METHOD e isUnderlined ()Z METHOD e setObfuscated (Ljava/lang/Boolean;)Lju; + ARG 1 obfuscated METHOD equals (Ljava/lang/Object;)Z - ARG 1 o + ARG 1 obj METHOD f isObfuscated ()Z METHOD g isEmpty ()Z METHOD h getClickEvent ()Ljl; METHOD i getHoverEvent ()Ljp; METHOD j getInsertion ()Ljava/lang/String; - METHOD k getFormatString ()Ljava/lang/String; - METHOD m clone ()Lju; + METHOD k asString ()Ljava/lang/String; + METHOD m deepCopy ()Lju; METHOD n copy ()Lju; METHOD o getParent ()Lju; diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping new file mode 100644 index 0000000000..272eae8cdb --- /dev/null +++ b/mappings/net/minecraft/text/Text.mapping @@ -0,0 +1,57 @@ +CLASS jm net/minecraft/text/Text + CLASS jm$a Serializer + FIELD a GSON Lcom/google/gson/Gson; + FIELD b JSON_READER_POS Ljava/lang/reflect/Field; + FIELD c JSON_READER_LINE_START Ljava/lang/reflect/Field; + METHOD a fromJson (Lcom/google/gson/JsonElement;)Ljm; + ARG 0 json + METHOD a getPosition (Lcom/google/gson/stream/JsonReader;)I + ARG 0 reader + METHOD a fromJson (Lcom/mojang/brigadier/StringReader;)Ljm; + ARG 0 reader + METHOD a fromJson (Ljava/lang/String;)Ljm; + ARG 0 json + METHOD a toJson (Ljm;)Ljava/lang/String; + ARG 0 text + METHOD a addStyle (Lju;Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V + ARG 1 style + ARG 2 json + ARG 3 context + METHOD b fromLenientJson (Ljava/lang/String;)Ljm; + ARG 0 json + METHOD b toJsonTree (Ljm;)Lcom/google/gson/JsonElement; + ARG 0 text + METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; + ARG 1 json + ARG 2 type + ARG 3 context + METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; + ARG 1 text + ARG 2 type + ARG 3 context + METHOD a getSiblings ()Ljava/util/List; + METHOD a asTruncatedString (I)Ljava/lang/String; + ARG 1 length + METHOD a formatted (Lc;)Ljm; + ARG 1 formatting + METHOD a append (Ljava/lang/String;)Ljm; + ARG 1 text + METHOD a (Ljava/lang/StringBuilder;Ljm;)V + ARG 1 text + METHOD a styled (Ljava/util/function/Consumer;)Ljm; + ARG 1 transformer + METHOD a append (Ljm;)Ljm; + ARG 1 text + METHOD a setStyle (Lju;)Ljm; + ARG 1 style + METHOD a formatted ([Lc;)Ljm; + ARG 1 formatting + METHOD b getStyle ()Lju; + METHOD b copyWithoutChildren (Ljm;)Ljm; + ARG 0 text + METHOD c stream ()Ljava/util/stream/Stream; + METHOD d asString ()Ljava/lang/String; + METHOD e asFormattedString ()Ljava/lang/String; + METHOD f streamCopied ()Ljava/util/stream/Stream; + METHOD g copy ()Ljm; + METHOD h deepCopy ()Ljm; diff --git a/mappings/net/minecraft/text/Texts.mapping b/mappings/net/minecraft/text/Texts.mapping new file mode 100644 index 0000000000..b4448aac50 --- /dev/null +++ b/mappings/net/minecraft/text/Texts.mapping @@ -0,0 +1,25 @@ +CLASS jn net/minecraft/text/Texts + METHOD a parse (Lcd;Ljm;Laij;I)Ljm; + ARG 0 source + ARG 1 text + ARG 2 sender + ARG 3 depth + METHOD a toText (Lcom/mojang/authlib/GameProfile;)Ljm; + ARG 0 profile + METHOD a toText (Lcom/mojang/brigadier/Message;)Ljm; + ARG 0 message + METHOD a (Ljava/lang/String;)Ljm; + ARG 0 string + METHOD a joinOrdered (Ljava/util/Collection;)Ljm; + ARG 0 strings + METHOD a joinOrdered (Ljava/util/Collection;Ljava/util/function/Function;)Ljm; + ARG 0 elements + ARG 1 transformer + METHOD a bracketed (Ljm;)Ljm; + ARG 0 text + METHOD a setStyleIfAbsent (Ljm;Lju;)Ljm; + ARG 0 text + ARG 1 style + METHOD b join (Ljava/util/Collection;Ljava/util/function/Function;)Ljm; + ARG 0 elements + ARG 1 transformer diff --git a/mappings/net/minecraft/text/TranslatableText.mapping b/mappings/net/minecraft/text/TranslatableText.mapping new file mode 100644 index 0000000000..b6db07bf82 --- /dev/null +++ b/mappings/net/minecraft/text/TranslatableText.mapping @@ -0,0 +1,21 @@ +CLASS jw net/minecraft/text/TranslatableText + FIELD b translations Ljava/util/List; + FIELD c ARG_FORMAT Ljava/util/regex/Pattern; + FIELD d EMPTY_LANGUAGE Lhw; + FIELD e LANGUAGE Lhw; + FIELD f key Ljava/lang/String; + FIELD g args [Ljava/lang/Object; + FIELD h lock Ljava/lang/Object; + FIELD i languageReloadTimestamp J + METHOD (Ljava/lang/String;[Ljava/lang/Object;)V + ARG 1 key + ARG 2 args + METHOD b getArg (I)Ljm; + ARG 1 index + METHOD b setTranslation (Ljava/lang/String;)V + ARG 1 translation + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD i updateTranslations ()V + METHOD k getKey ()Ljava/lang/String; + METHOD l getArgs ()[Ljava/lang/Object; diff --git a/mappings/net/minecraft/text/TranslationException.mapping b/mappings/net/minecraft/text/TranslationException.mapping new file mode 100644 index 0000000000..8949cfe967 --- /dev/null +++ b/mappings/net/minecraft/text/TranslationException.mapping @@ -0,0 +1,10 @@ +CLASS jx net/minecraft/text/TranslationException + METHOD (Ljw;I)V + ARG 1 text + ARG 2 index + METHOD (Ljw;Ljava/lang/String;)V + ARG 1 text + ARG 2 message + METHOD (Ljw;Ljava/lang/Throwable;)V + ARG 1 text + ARG 2 cause diff --git a/mappings/net/minecraft/util/Formatting.mapping b/mappings/net/minecraft/util/Formatting.mapping new file mode 100644 index 0000000000..0664f2382f --- /dev/null +++ b/mappings/net/minecraft/util/Formatting.mapping @@ -0,0 +1,49 @@ +CLASS c net/minecraft/util/Formatting + FIELD A modifier Z + FIELD B stringValue Ljava/lang/String; + FIELD C colorIndex I + FIELD D colorValue Ljava/lang/Integer; + FIELD w BY_NAME Ljava/util/Map; + FIELD x FORMATTING_CODE_PATTERN Ljava/util/regex/Pattern; + FIELD y name Ljava/lang/String; + FIELD z code C + METHOD (Ljava/lang/String;ILjava/lang/String;CILjava/lang/Integer;)V + ARG 3 name + ARG 4 code + ARG 5 colorIndex + ARG 6 colorValue + METHOD (Ljava/lang/String;ILjava/lang/String;CZ)V + ARG 3 name + ARG 4 code + ARG 5 modifier + METHOD (Ljava/lang/String;ILjava/lang/String;CZILjava/lang/Integer;)V + ARG 3 name + ARG 4 code + ARG 5 modifier + ARG 6 colorIndex + ARG 7 colorValue + METHOD a byCode (C)Lc; + ARG 0 code + METHOD a byColorIndex (I)Lc; + ARG 0 colorIndex + METHOD a (Lc;)Lc; + ARG 0 f + METHOD a getFormatAtEnd (Ljava/lang/String;)Ljava/lang/String; + ARG 0 string + METHOD a getNames (ZZ)Ljava/util/Collection; + ARG 0 colors + ARG 1 modifiers + METHOD b getColorIndex ()I + METHOD b (Lc;)Ljava/lang/String; + ARG 0 f + METHOD b strip (Ljava/lang/String;)Ljava/lang/String; + ARG 0 string + METHOD c isModifier ()Z + METHOD c byName (Ljava/lang/String;)Lc; + ARG 0 name + METHOD d isColor ()Z + METHOD d sanitize (Ljava/lang/String;)Ljava/lang/String; + ARG 0 name + METHOD e getColorValue ()Ljava/lang/Integer; + METHOD f affectsGlyphWidth ()Z + METHOD g getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/PacketByteBuf.mapping b/mappings/net/minecraft/util/PacketByteBuf.mapping index 0b9322b8fb..eb492b9af2 100644 --- a/mappings/net/minecraft/util/PacketByteBuf.mapping +++ b/mappings/net/minecraft/util/PacketByteBuf.mapping @@ -12,7 +12,8 @@ CLASS jc net/minecraft/util/PacketByteBuf METHOD a writeString (Ljava/lang/String;I)Ljc; METHOD a writeDate (Ljava/util/Date;)Ljc; METHOD a writeUuid (Ljava/util/UUID;)Ljc; - METHOD a writeTextComponent (Ljm;)Ljc; + METHOD a writeText (Ljm;)Ljc; + ARG 1 text METHOD a writeIdentifier (Lqs;)Ljc; METHOD a writeByteArray ([B)Ljc; METHOD a writeIntArray ([I)Ljc; @@ -28,7 +29,7 @@ CLASS jc net/minecraft/util/PacketByteBuf METHOD e readBlockPos ()Lev; METHOD e readString (I)Ljava/lang/String; METHOD g readChunkSectionPos ()Lfo; - METHOD h readTextComponent ()Ljm; + METHOD h readText ()Ljm; METHOD i readVarInt ()I METHOD j readVarLong ()J METHOD k readUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/world/Difficulty.mapping b/mappings/net/minecraft/world/Difficulty.mapping index ad4d4b5459..49d4398898 100644 --- a/mappings/net/minecraft/world/Difficulty.mapping +++ b/mappings/net/minecraft/world/Difficulty.mapping @@ -1,13 +1,14 @@ CLASS ahb net/minecraft/world/Difficulty - FIELD e DIFFICULTIES [Lahb; + FIELD e BY_NAME [Lahb; FIELD f id I - FIELD g translationKey Ljava/lang/String; + FIELD g name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id + ARG 4 name METHOD a getId ()I - METHOD a getDifficulty (I)Lahb; - ARG 0 difficulty - METHOD a getDifficulty (Ljava/lang/String;)Lahb; - ARG 0 translationKey - METHOD b toTextComponent ()Ljm; - METHOD c getTranslationKey ()Ljava/lang/String; + METHOD a byOrdinal (I)Lahb; + ARG 0 ordinal + METHOD a byName (Ljava/lang/String;)Lahb; + ARG 0 name + METHOD b getTranslatableName ()Ljm; + METHOD c getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/GameMode.mapping b/mappings/net/minecraft/world/GameMode.mapping index 123178bbcc..c41cd8a270 100644 --- a/mappings/net/minecraft/world/GameMode.mapping +++ b/mappings/net/minecraft/world/GameMode.mapping @@ -18,7 +18,7 @@ CLASS bhg net/minecraft/world/GameMode ARG 0 name ARG 1 defaultMode METHOD b getName ()Ljava/lang/String; - METHOD c getTextComponent ()Ljm; + METHOD c getTranslatableName ()Ljm; METHOD d shouldLimitWorldModification ()Z METHOD e isCreative ()Z METHOD f isSurvivalLike ()Z diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index b3c15c9361..e3fc9b9b52 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -140,7 +140,7 @@ CLASS big net/minecraft/world/biome/Biome METHOD f getTemperatureGroup ()Lbig$c; METHOD g getDepth ()F METHOD h getRainfall ()F - METHOD i getTextComponent ()Ljm; + METHOD i getName ()Ljm; METHOD j getTranslationKey ()Ljava/lang/String; METHOD k getScale ()F METHOD l getTemperature ()F diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index f0798f09ef..2a024a1149 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -25,7 +25,7 @@ CLASS coh net/minecraft/world/level/storage/LevelSummary METHOD f getGameMode ()Lbhg; METHOD g isHardcore ()Z METHOD h hasCheats ()Z - METHOD i getVersionTextComponent ()Ljm; + METHOD i getVersion ()Ljm; METHOD l isDifferentVersion ()Z METHOD m isFutureLevel ()Z METHOD n isLegacyCustomizedWorld ()Z