From a5a8021370914c3e186dd6caded7b3baa137beb7 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 10 Aug 2023 17:52:54 -0500 Subject: [PATCH] drop invalid mappings --- gradle/libs.versions.toml | 2 +- .../net/minecraft/client/network/PlayerListEntry.mapping | 7 ------- mappings/net/minecraft/network/ClientConnection.mapping | 5 ----- .../packet/s2c/login/LoginQueryRequestS2CPacket.mapping | 2 -- ...eDebugCustomPayload.mapping => BeeDebugPayload.mapping} | 0 .../packet/s2c/payload/BrainDebugCustomPayload.mapping | 2 -- .../{BrandCustomPayload.mapping => BrandPayload.mapping} | 0 .../packet/s2c/payload/GameEventDebugCustomPayload.mapping | 1 - .../payload/GameEventListenersDebugCustomPayload.mapping | 1 - .../s2c/payload/GameTestClearDebugCustomPayload.mapping | 1 - .../GameTestMarkerAdditionDebugCustomPayload.mapping | 1 - .../s2c/payload/GoalSelectorDebugCustomPayload.mapping | 1 - .../packet/s2c/payload/HiveDebugCustomPayload.mapping | 1 - .../s2c/payload/NeighborsUpdateDebugCustomPayload.mapping | 1 - .../packet/s2c/payload/PathDebugCustomPayload.mapping | 1 - .../packet/s2c/payload/PoiAddedDebugCustomPayload.mapping | 1 - .../s2c/payload/PoiRemovedDebugCustomPayload.mapping | 1 - .../s2c/payload/PoiTicketCountDebugCustomPayload.mapping | 1 - .../packet/s2c/payload/RaidsDebugCustomPayload.mapping | 1 - .../s2c/payload/StructuresDebugCustomPayload.mapping | 1 - .../s2c/payload/VillageSectionsDebugCustomPayload.mapping | 1 - .../s2c/payload/WorldgenAttemptDebugCustomPayload.mapping | 1 - mappings/net/minecraft/util/dynamic/Codecs.mapping | 2 -- 23 files changed, 1 insertion(+), 34 deletions(-) rename mappings/net/minecraft/network/packet/s2c/payload/{BeeDebugCustomPayload.mapping => BeeDebugPayload.mapping} (100%) delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/BrainDebugCustomPayload.mapping rename mappings/net/minecraft/network/packet/s2c/payload/{BrandCustomPayload.mapping => BrandPayload.mapping} (100%) delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/GameEventDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/GameEventListenersDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/GameTestClearDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/GameTestMarkerAdditionDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/GoalSelectorDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/HiveDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/NeighborsUpdateDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/PathDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/PoiAddedDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/PoiRemovedDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/PoiTicketCountDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/RaidsDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/StructuresDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/VillageSectionsDebugCustomPayload.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/payload/WorldgenAttemptDebugCustomPayload.mapping diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cd1f8bac90..3057d4d185 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ download_task = "4.1.1" guava = "31.1-jre" jackson_xml = "2.14.1" launchermeta_parser = "1.0.0" -enigma = "1.8.8" +enigma = "1.8.9" enigma_plugin = "1.3.2" tiny_remapper = "0.7.2" stitch = "0.6.1" diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index 854288002d..35f57d559c 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -9,10 +9,6 @@ CLASS net/minecraft/unmapped/C_rdnfmxue net/minecraft/client/network/PlayerListE METHOD (Lcom/mojang/authlib/GameProfile;Z)V ARG 1 profile ARG 2 rejectAllMessages - METHOD m_advxzpiq fetchSkin (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/unmapped/C_pyciilvf;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Ljava/util/concurrent/CompletableFuture; - ARG 0 gameProfile - ARG 1 skinProvider - ARG 2 sessionService METHOD m_aikjdrgv setDisplayName (Lnet/minecraft/unmapped/C_rdaqiwdt;)V ARG 1 displayName METHOD m_bzpvpkyx getScoreboardTeam ()Lnet/minecraft/unmapped/C_dvkwmbxw; @@ -25,9 +21,6 @@ CLASS net/minecraft/unmapped/C_rdnfmxue net/minecraft/client/network/PlayerListE METHOD m_ibtfyfdo getMessageVerifier ()Lnet/minecraft/unmapped/C_kwrnipty; METHOD m_kamimtck setMessageVerifier (Z)V ARG 1 rejectAll - METHOD m_ktxkluwh putSessionProperties (Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lcom/mojang/authlib/GameProfile; - ARG 0 gameProfile - ARG 1 sessionService METHOD m_luhtdkqd getSkin ()Lnet/minecraft/unmapped/C_idvschhb; METHOD m_ntpxbqia hasChatSession ()Z METHOD m_sgoenlav getChatSession ()Lnet/minecraft/unmapped/C_sdodhjzp; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 5734fdcc48..77fbe1af0f 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -86,9 +86,6 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection ARG 2 port ARG 3 listener ARG 4 intent - METHOD m_hmamwxog sendWithoutFlush (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;)V - ARG 1 packet - ARG 2 sendListener METHOD m_honyjhko (Lorg/slf4j/Marker;)V ARG 0 marker METHOD m_iopaivkv addValidatorInternal (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;)V @@ -105,8 +102,6 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection COMMENT sent by this connection. METHOD m_kxmmachs setHandshakeListener (Lnet/minecraft/unmapped/C_tkgdawqw;)V ARG 1 listener - METHOD m_lpkwetce sendWithoutFlush (Lnet/minecraft/unmapped/C_zyjtrjrl;)V - ARG 1 packet METHOD m_lyptmghi connectLocal (Ljava/net/SocketAddress;)Lnet/minecraft/unmapped/C_oasmcckk; ARG 0 address METHOD m_myzbxovj connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_jsvwwjov;)V diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping index 6e8d6edb30..6cc86d370a 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping @@ -3,7 +3,5 @@ CLASS net/minecraft/unmapped/C_wbrofkyq net/minecraft/network/packet/s2c/login/L FIELD f_ygpbvhkj MAX_PAYLOAD_SIZE I METHOD (Lnet/minecraft/unmapped/C_idfydwco;)V ARG 1 buf - METHOD m_lhquoxvk readPayload (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_fcgdvhnd; - ARG 0 id METHOD m_nfiqfzci readUnknownPayload (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_fcgdvhnd; ARG 0 id diff --git a/mappings/net/minecraft/network/packet/s2c/payload/BeeDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/BeeDebugPayload.mapping similarity index 100% rename from mappings/net/minecraft/network/packet/s2c/payload/BeeDebugCustomPayload.mapping rename to mappings/net/minecraft/network/packet/s2c/payload/BeeDebugPayload.mapping diff --git a/mappings/net/minecraft/network/packet/s2c/payload/BrainDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/BrainDebugCustomPayload.mapping deleted file mode 100644 index f9fa3e0332..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/BrainDebugCustomPayload.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/unmapped/C_tlditsxa net/minecraft/network/packet/s2c/payload/BrainDebugPayload - FIELD f_vttdgtgh ID Lnet/minecraft/unmapped/C_ncpywfca; diff --git a/mappings/net/minecraft/network/packet/s2c/payload/BrandCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/BrandPayload.mapping similarity index 100% rename from mappings/net/minecraft/network/packet/s2c/payload/BrandCustomPayload.mapping rename to mappings/net/minecraft/network/packet/s2c/payload/BrandPayload.mapping diff --git a/mappings/net/minecraft/network/packet/s2c/payload/GameEventDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/GameEventDebugCustomPayload.mapping deleted file mode 100644 index 8d013daab1..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/GameEventDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_avmcnpdc net/minecraft/network/packet/s2c/payload/GameEventDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/GameEventListenersDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/GameEventListenersDebugCustomPayload.mapping deleted file mode 100644 index fc5f75701e..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/GameEventListenersDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_jcphmavb net/minecraft/network/packet/s2c/payload/GameEventListenersDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/GameTestClearDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/GameTestClearDebugCustomPayload.mapping deleted file mode 100644 index 6bbf376f00..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/GameTestClearDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_ylnjwyso net/minecraft/network/packet/s2c/payload/GameTestClearDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/GameTestMarkerAdditionDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/GameTestMarkerAdditionDebugCustomPayload.mapping deleted file mode 100644 index 58cc33939d..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/GameTestMarkerAdditionDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_oyolgusa net/minecraft/network/packet/s2c/payload/GameTestMarkerAdditionDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/GoalSelectorDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/GoalSelectorDebugCustomPayload.mapping deleted file mode 100644 index fffcef6190..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/GoalSelectorDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_bvezrjxv net/minecraft/network/packet/s2c/payload/GoalSelectorDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/HiveDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/HiveDebugCustomPayload.mapping deleted file mode 100644 index 1a9a83bd2d..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/HiveDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_rtwzcqhy net/minecraft/network/packet/s2c/payload/HiveDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/NeighborsUpdateDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/NeighborsUpdateDebugCustomPayload.mapping deleted file mode 100644 index c7530d7356..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/NeighborsUpdateDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_lyxmhfsc net/minecraft/network/packet/s2c/payload/NeighborsUpdateDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/PathDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/PathDebugCustomPayload.mapping deleted file mode 100644 index 0407e4499d..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/PathDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_rvqaifaf net/minecraft/network/packet/s2c/payload/PathDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/PoiAddedDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/PoiAddedDebugCustomPayload.mapping deleted file mode 100644 index 070ce9e5f0..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/PoiAddedDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_bxadaxpd net/minecraft/network/packet/s2c/payload/PoiAddedDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/PoiRemovedDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/PoiRemovedDebugCustomPayload.mapping deleted file mode 100644 index 755b552727..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/PoiRemovedDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_ovwalqod net/minecraft/network/packet/s2c/payload/PoiRemovedDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/PoiTicketCountDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/PoiTicketCountDebugCustomPayload.mapping deleted file mode 100644 index d442c9d568..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/PoiTicketCountDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_rgclxlhl net/minecraft/network/packet/s2c/payload/PoiTicketCountDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/RaidsDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/RaidsDebugCustomPayload.mapping deleted file mode 100644 index 908aa179bd..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/RaidsDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_wfemmhfs net/minecraft/network/packet/s2c/payload/RaidsDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/StructuresDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/StructuresDebugCustomPayload.mapping deleted file mode 100644 index 10540014ea..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/StructuresDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_djjgdtqh net/minecraft/network/packet/s2c/payload/StructuresDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/VillageSectionsDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/VillageSectionsDebugCustomPayload.mapping deleted file mode 100644 index 289a9c20cb..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/VillageSectionsDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_jdnmugdl net/minecraft/network/packet/s2c/payload/VillageSectionsDebugPayload diff --git a/mappings/net/minecraft/network/packet/s2c/payload/WorldgenAttemptDebugCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/payload/WorldgenAttemptDebugCustomPayload.mapping deleted file mode 100644 index 98bd9cc6f3..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/payload/WorldgenAttemptDebugCustomPayload.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_djufnofa net/minecraft/network/packet/s2c/payload/WorldgenAttemptDebugPayload diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 3470469ab9..8f3a44ddde 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -98,8 +98,6 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs ARG 5 rightFunction METHOD m_pqmgxbkr (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lcom/mojang/serialization/DataResult; ARG 0 text - METHOD m_rigpzump (Ljava/util/function/Function;Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object; - ARG 1 either METHOD m_sltnwzrc createRangedFloat (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 min ARG 1 max