diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index 04bef12eae..7282919d1a 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity FIELD field_12046 editor Lnet/minecraft/class_1657; FIELD field_12048 editable Z - FIELD field_12049 textBeingEdited [Lnet/minecraft/class_5481; - FIELD field_12050 text [Lnet/minecraft/class_2561; + FIELD field_12049 textsBeingEdited [Lnet/minecraft/class_5481; + FIELD field_12050 texts [Lnet/minecraft/class_2561; FIELD field_16419 textColor Lnet/minecraft/class_1767; + FIELD field_28905 TEXT_KEYS [Ljava/lang/String; + FIELD field_28906 FILTERED_TEXT_KEYS [Ljava/lang/String; + FIELD field_28907 filteredTexts [Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -24,3 +27,14 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity ARG 1 value METHOD method_30843 getTextOnRow (IZ)Lnet/minecraft/class_2561; ARG 1 row + ARG 2 filtered + METHOD method_33384 unparsedTextFromJson (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 json + METHOD method_33827 setTextOnRow (ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 row + ARG 2 text + ARG 3 filteredText + METHOD method_33828 parseTextFromJson (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 json + METHOD method_33830 getTexts (Z)[Lnet/minecraft/class_2561; + ARG 1 filtered diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 59bf579356..64c9cccc7a 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -392,6 +392,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 2 runArgs METHOD method_31974 getEntityModelLoader ()Lnet/minecraft/class_5599; METHOD method_31975 getBlockEntityRenderDispatcher ()Lnet/minecraft/class_824; + METHOD method_33883 filtersText ()Z METHOD method_33884 getChatRestriction ()Lnet/minecraft/class_310$class_5859; CLASS class_5366 WorldLoadAction CLASS class_5367 IntegratedResourceManager diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping index 32ea96ffe4..43333cad7a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping @@ -8,4 +8,5 @@ CLASS net/minecraft/class_498 net/minecraft/client/gui/screen/ingame/SignEditScr FIELD field_3032 selectionManager Lnet/minecraft/class_3728; METHOD (Lnet/minecraft/class_2625;Z)V ARG 1 sign + ARG 2 filtered METHOD method_2526 finishEditing ()V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping index 91a925972b..f1773aae86 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSetti FIELD field_12780 viewDistance I FIELD field_12781 chatVisibility Lnet/minecraft/class_1659; FIELD field_12782 mainArm Lnet/minecraft/class_1306; + FIELD field_28961 filtersText Z METHOD (Ljava/lang/String;ILnet/minecraft/class_1659;ZILnet/minecraft/class_1306;Z)V ARG 1 language ARG 2 viewDistance @@ -18,3 +19,4 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSetti METHOD method_12134 getChatVisibility ()Lnet/minecraft/class_1659; METHOD method_12135 hasChatColors ()Z METHOD method_12136 getPlayerModelBitMask ()I + METHOD method_33894 filtersText ()Z diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index b51d22953b..cc5b7452f3 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -134,3 +134,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14617 saveAllPlayerData ()V METHOD method_18241 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; ARG 1 vehicle + METHOD method_33810 broadcast (Lnet/minecraft/class_2561;Ljava/util/function/Function;Lnet/minecraft/class_2556;Ljava/util/UUID;)V + ARG 1 serverMessage + ARG 2 playerMessageFactory + ARG 3 playerMessageType + ARG 4 sender diff --git a/mappings/net/minecraft/server/command/MeCommand.mapping b/mappings/net/minecraft/server/command/MeCommand.mapping index a3d5afac34..240abc1b66 100644 --- a/mappings/net/minecraft/server/command/MeCommand.mapping +++ b/mappings/net/minecraft/server/command/MeCommand.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_3045 net/minecraft/server/command/MeCommand METHOD method_13237 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_31373 getMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561; + METHOD method_13238 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - ARG 1 text + METHOD method_31373 getEmoteText (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 0 context + ARG 1 arg + METHOD method_31374 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3222;)Lnet/minecraft/class_2561; + ARG 3 player + METHOD method_31375 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_5513$class_5837;)V + ARG 4 message diff --git a/mappings/net/minecraft/server/filter/TextFilterer.mapping b/mappings/net/minecraft/server/filter/TextFilterer.mapping index 825755a978..ef5ce68204 100644 --- a/mappings/net/minecraft/server/filter/TextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/TextFilterer.mapping @@ -10,6 +10,12 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer FIELD field_26831 serverId Ljava/lang/String; FIELD field_26832 ignorer Lnet/minecraft/class_5514$class_5515; FIELD field_26833 executor Ljava/util/concurrent/ExecutorService; + METHOD (Ljava/net/URI;Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_5514$class_5515;I)V + ARG 1 apiUrl + ARG 2 apiKey + ARG 3 ruleId + ARG 4 serverId + ARG 5 ignorer METHOD method_31295 sendJsonRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)Lcom/google/gson/JsonObject; ARG 1 payload ARG 2 endpoint @@ -32,9 +38,15 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer METHOD method_31306 createConnection (Lcom/google/gson/JsonObject;Ljava/net/URL;)Ljava/net/HttpURLConnection; ARG 1 payload ARG 2 endpoint + METHOD method_33805 load (Ljava/lang/String;)Lnet/minecraft/class_5514; + ARG 0 config CLASS class_5515 HashIgnorer FIELD field_26834 NEVER_IGNORE Lnet/minecraft/class_5514$class_5515; FIELD field_26835 IGNORE_IF_MATCHES_ALL Lnet/minecraft/class_5514$class_5515; + METHOD method_33806 internalDropHashes (I)Lnet/minecraft/class_5514$class_5515; + ARG 0 hashesToDrop + METHOD method_33808 dropHashes (I)Lnet/minecraft/class_5514$class_5515; + ARG 0 hashesToDrop METHOD shouldIgnore (Ljava/lang/String;I)Z ARG 1 hashes ARG 2 hashesSize diff --git a/mappings/net/minecraft/server/filter/TextStream.mapping b/mappings/net/minecraft/server/filter/TextStream.mapping index fdbf4e4fbe..f92028ac21 100644 --- a/mappings/net/minecraft/server/filter/TextStream.mapping +++ b/mappings/net/minecraft/server/filter/TextStream.mapping @@ -1,7 +1,21 @@ CLASS net/minecraft/class_5513 net/minecraft/server/filter/TextStream + FIELD field_28862 DEFAULT Lnet/minecraft/class_5513; METHOD method_31287 onConnect ()V METHOD method_31288 filterText (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 1 text METHOD method_31289 filterTexts (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 1 texts METHOD method_31290 onDisconnect ()V + CLASS class_5837 Message + FIELD field_28863 EMPTY Lnet/minecraft/class_5513$class_5837; + FIELD field_28864 raw Ljava/lang/String; + FIELD field_28865 filtered Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 raw + ARG 2 filtered + METHOD method_33801 getRaw ()Ljava/lang/String; + METHOD method_33802 permitted (Ljava/lang/String;)Lnet/minecraft/class_5513$class_5837; + ARG 0 text + METHOD method_33803 getFiltered ()Ljava/lang/String; + METHOD method_33804 censored (Ljava/lang/String;)Lnet/minecraft/class_5513$class_5837; + ARG 0 raw diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 29390ccd73..985f14c3ce 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -78,14 +78,14 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 text ARG 2 consumer ARG 3 backingFilterer - METHOD method_31276 signWrittenBook (Ljava/lang/String;Ljava/util/List;I)V + METHOD method_31276 addBook (Lnet/minecraft/class_5513$class_5837;Ljava/util/List;I)V ARG 1 title ARG 2 pages ARG 3 slotId METHOD method_31277 filterText (Ljava/lang/String;Ljava/util/function/Consumer;)V ARG 1 text ARG 2 consumer - METHOD method_31278 addTextToBook (Ljava/util/List;I)V + METHOD method_31278 updateBookContent (Ljava/util/List;I)V ARG 1 pages ARG 2 slotId METHOD method_31279 filterTexts (Ljava/util/List;Ljava/util/function/Consumer;)V @@ -110,6 +110,10 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 8 pitch ARG 9 flags ARG 10 shouldDismount + METHOD method_33796 setTextToBook (Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/class_1799;)V + ARG 1 messages + ARG 2 postProcessor + ARG 3 book CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index fa49f4da10..0ff10cccef 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_23193 spawnPointSet Z FIELD field_26353 spawnAngle F FIELD field_26821 textStream Lnet/minecraft/class_5513; + FIELD field_28860 filtersText Z METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;)V ARG 1 server ARG 2 world @@ -163,5 +164,10 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 tag METHOD method_32749 writeGameModeToNbt (Lnet/minecraft/class_2487;)V ARG 1 tag + METHOD method_33793 filtersText ()Z + METHOD method_33794 acceptsMessage (Lnet/minecraft/class_2556;)Z + ARG 1 type + METHOD method_33795 shouldFilterText (Lnet/minecraft/class_3222;)Z + ARG 1 from METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode