From 932eb276b0646f722f23ad016d2f1025541ddc44 Mon Sep 17 00:00:00 2001 From: asie Date: Thu, 25 Oct 2018 17:03:13 +0200 Subject: [PATCH] work on items, bring back 1.12 rcon mappings, etc. --- mappings/bma.mapping | 1 - mappings/cag.mapping | 2 - mappings/fh.mapping | 7 ++ mappings/net/minecraft/block/Block.mapping | 18 ++- mappings/net/minecraft/block/Material.mapping | 3 + .../minecraft/block/state/BlockState.mapping | 1 + mappings/net/minecraft/data/Main.mapping | 8 ++ .../minecraft/item/ItemBoneMeal.mapping} | 2 +- .../minecraft/item/ItemDye.mapping} | 2 +- mappings/net/minecraft/item/ItemFish.mapping | 22 ++++ .../network/NetworkEncryptionUtils.mapping | 24 ++++ .../minecraft/reference/LootTables.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 2 +- .../server/dedicated/DedicatedServer.mapping} | 21 +++- .../DedicatedServerProperties.mapping | 16 +++ .../server/dedicated/EulaReader.mapping | 10 ++ .../server/dedicated/IDedicatedServer.mapping | 29 +++++ .../server/rcon/BufferHelper.mapping | 17 +++ .../server/rcon/DataStreamHelper.mapping | 15 +++ .../server/rcon/QueryResponseHandler.mapping | 13 +++ .../minecraft/server/rcon/RconBase.mapping | 34 ++++++ .../minecraft/server/rcon/RconClient.mapping | 11 ++ .../minecraft/server/rcon/RconServer.mapping | 11 ++ .../net/minecraft/state/StateFactory.mapping | 13 +++ mappings/net/minecraft/util/DyeColor.mapping | 1 + mappings/net/minecraft/util/MapColor.mapping | 45 ++++++++ .../net/minecraft/util/SystemUtils.mapping | 34 ++++++ mappings/net/minecraft/util/TagHelper.mapping | 1 + .../minecraft/util/math/MathHelper.mapping | 109 ++++++++++++++++++ .../minecraft/util/snooper/Snooper.mapping | 1 + mappings/qh.mapping | 15 --- mappings/tv.mapping | 2 + mappings/wc.mapping | 2 + mappings/ye.mapping | 1 - 34 files changed, 469 insertions(+), 25 deletions(-) delete mode 100644 mappings/bma.mapping delete mode 100644 mappings/cag.mapping create mode 100644 mappings/net/minecraft/block/Material.mapping create mode 100644 mappings/net/minecraft/data/Main.mapping rename mappings/{asj.mapping => net/minecraft/item/ItemBoneMeal.mapping} (68%) rename mappings/{ata.mapping => net/minecraft/item/ItemDye.mapping} (74%) create mode 100644 mappings/net/minecraft/network/NetworkEncryptionUtils.mapping rename mappings/{th.mapping => net/minecraft/server/dedicated/DedicatedServer.mapping} (57%) create mode 100644 mappings/net/minecraft/server/dedicated/DedicatedServerProperties.mapping create mode 100644 mappings/net/minecraft/server/dedicated/EulaReader.mapping create mode 100644 mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping create mode 100644 mappings/net/minecraft/server/rcon/BufferHelper.mapping create mode 100644 mappings/net/minecraft/server/rcon/DataStreamHelper.mapping create mode 100644 mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping create mode 100644 mappings/net/minecraft/server/rcon/RconBase.mapping create mode 100644 mappings/net/minecraft/server/rcon/RconClient.mapping create mode 100644 mappings/net/minecraft/server/rcon/RconServer.mapping create mode 100644 mappings/net/minecraft/state/StateFactory.mapping create mode 100644 mappings/net/minecraft/util/MapColor.mapping create mode 100644 mappings/net/minecraft/util/SystemUtils.mapping create mode 100644 mappings/net/minecraft/util/math/MathHelper.mapping delete mode 100644 mappings/qh.mapping create mode 100644 mappings/tv.mapping create mode 100644 mappings/wc.mapping delete mode 100644 mappings/ye.mapping diff --git a/mappings/bma.mapping b/mappings/bma.mapping deleted file mode 100644 index 0024e49a68..0000000000 --- a/mappings/bma.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bma diff --git a/mappings/cag.mapping b/mappings/cag.mapping deleted file mode 100644 index 841ed4e1e1..0000000000 --- a/mappings/cag.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cag - METHOD h getPistonBehavior ()Lcai; diff --git a/mappings/fh.mapping b/mappings/fh.mapping index d67f877868..34fefa129a 100644 --- a/mappings/fh.mapping +++ b/mappings/fh.mapping @@ -1,4 +1,11 @@ CLASS fh + FIELD e LOGGER Lorg/apache/logging/log4j/Logger; + FIELD j BLOCKS Leu; + FIELD k ENCHANTMENTS Lfh; + FIELD m ITEMS Leu; + FIELD n POTIONS Lfh; + FIELD s BIOMES Lfh; + FIELD v BLOCK_ENTITIES Lfh; METHOD a getDefaultId ()Lpt; METHOD a getRawId (Ljava/lang/Object;)I ARG 1 rawId diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 04b9924ca4..9ddf691281 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -9,14 +9,28 @@ CLASS bdx net/minecraft/block/Block CLASS bdx$c Builder FIELD a material Lcag; FIELD b mapColor Lcah; + FIELD d soundGroup Lbio; FIELD e lightOpacityLevel I + METHOD (Lcag;Lcah;)V + ARG 0 material + ARG 1 mapColor + METHOD a lightOpacityLevel (I)Lbdx$c; + METHOD a copy (Lbdx;)Lbdx$c; + METHOD a soundGroup (Lbio;)Lbdx$c; + METHOD a create (Lcag;)Lbdx$c; + METHOD a create (Lcag;Lasz;)Lbdx$c; + METHOD a create (Lcag;Lcah;)Lbdx$c; FIELD c defaultState Lblz; FIELD f translationKey Ljava/lang/String; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; FIELD h BLOCKSTATE_ID_LIST Lez; FIELD i lightOpacityLevel I + FIELD m soundGroup Lbio; FIELD n material Lcag; FIELD o mapColor Lcah; + FIELD p stateFactory Lbma; + METHOD (Lbdx$c;)V + ARG 0 builder METHOD Y_ getOffsetType ()Lbdx$b; METHOD a canMobSpawnInside ()Z METHOD a getBlockFromItem (Latx;)Lbdx; @@ -197,6 +211,7 @@ CLASS bdx net/minecraft/block/Block METHOD i canCollideWith ()Z METHOD i emitsRedstonePower (Lblz;)Z ARG 0 state + METHOD j ()Lpt; METHOD j getPistonBehavior (Lblz;)Lcai; ARG 0 state METHOD l getTextComponent ()Liw; @@ -213,7 +228,7 @@ CLASS bdx net/minecraft/block/Block METHOD p getDefaultState ()Lblz; METHOD p isSimpleFullBlock (Lblz;)Z ARG 0 state - METHOD q hasMiningStats ()Z + METHOD q ()Z METHOD q canSuffocate (Lblz;)Z ARG 0 state METHOD r hasSolidTopSurface (Lblz;)Z @@ -222,3 +237,4 @@ CLASS bdx net/minecraft/block/Block ARG 0 state METHOD u setDefaultState (Lblz;)V ARG 0 state + METHOD v getSoundGroup (Lblz;)Lbio; diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping new file mode 100644 index 0000000000..8e047bd94f --- /dev/null +++ b/mappings/net/minecraft/block/Material.mapping @@ -0,0 +1,3 @@ +CLASS cag net/minecraft/block/Material + METHOD h getPistonBehavior ()Lcai; + METHOD i getMapColor ()Lcah; diff --git a/mappings/net/minecraft/block/state/BlockState.mapping b/mappings/net/minecraft/block/state/BlockState.mapping index f1d65e65f9..92768705bb 100644 --- a/mappings/net/minecraft/block/state/BlockState.mapping +++ b/mappings/net/minecraft/block/state/BlockState.mapping @@ -8,3 +8,4 @@ CLASS blz net/minecraft/block/state/BlockState ARG 0 pos METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos + METHOD d ()Lbdx; diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping new file mode 100644 index 0000000000..a88c8840ce --- /dev/null +++ b/mappings/net/minecraft/data/Main.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/data/Main + METHOD a (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZ)Lfv; + ARG 0 output + ARG 1 inputs + ARG 2 includeClient + ARG 3 includeServer + ARG 4 includeDev + ARG 5 includeReports diff --git a/mappings/asj.mapping b/mappings/net/minecraft/item/ItemBoneMeal.mapping similarity index 68% rename from mappings/asj.mapping rename to mappings/net/minecraft/item/ItemBoneMeal.mapping index d87b93a2de..3eab85ad92 100644 --- a/mappings/asj.mapping +++ b/mappings/net/minecraft/item/ItemBoneMeal.mapping @@ -1,4 +1,4 @@ -CLASS asj +CLASS asj net/minecraft/item/ItemBoneMeal METHOD (Latx$a;)V ARG 0 builder METHOD a activate (Lavp;)Laec; diff --git a/mappings/ata.mapping b/mappings/net/minecraft/item/ItemDye.mapping similarity index 74% rename from mappings/ata.mapping rename to mappings/net/minecraft/item/ItemDye.mapping index f819e1e788..ebdf441c2b 100644 --- a/mappings/ata.mapping +++ b/mappings/net/minecraft/item/ItemDye.mapping @@ -1,4 +1,4 @@ -CLASS ata +CLASS ata net/minecraft/item/ItemDye METHOD a interactWithEntity (Lauc;Lapb;Lafq;Laea;)Z ARG 0 stack ARG 1 player diff --git a/mappings/net/minecraft/item/ItemFish.mapping b/mappings/net/minecraft/item/ItemFish.mapping index 229ab369d0..c7eb508a32 100644 --- a/mappings/net/minecraft/item/ItemFish.mapping +++ b/mappings/net/minecraft/item/ItemFish.mapping @@ -1,5 +1,27 @@ CLASS atp net/minecraft/item/ItemFish + CLASS atp$a Type + FIELD a COD Latp$a; + FIELD b SALMON Latp$a; + FIELD c TROPICAL_FISH Latp$a; + FIELD d PUFFERFISH Latp$a; + FIELD e hungerRestored I + FIELD f saturationRestored F + FIELD g hungerRestoredCooked I + FIELD h saturationRestoredCooked F + FIELD i cookedVariant Z + METHOD a getHungerRestored ()I + METHOD a fromStack (Lauc;)Latp$a; + ARG 0 stack + METHOD b getSaturationRestored ()F + METHOD c getHungerRestoredCooked ()I + METHOD d getSaturationRestoredCooked ()F + METHOD e hasCookedVariant ()Z FIELD a cooked Z + FIELD b type Latp$a; + METHOD (Latp$a;ZLatx$a;)V + ARG 0 type + ARG 1 cooked + ARG 2 builder METHOD a onConsumed (Lauc;Laza;Lapb;)V ARG 0 stack ARG 1 world diff --git a/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping new file mode 100644 index 0000000000..1a7fcddef4 --- /dev/null +++ b/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping @@ -0,0 +1,24 @@ +CLASS xv net/minecraft/network/NetworkEncryptionUtils + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a generateKey ()Ljavax/crypto/SecretKey; + METHOD a crypt (ILjava/lang/String;Ljava/security/Key;)Ljavax/crypto/Cipher; + ARG 0 opMode + ARG 1 algorithm + ARG 2 key + METHOD a cipherFromKey (ILjava/security/Key;)Ljavax/crypto/Cipher; + ARG 0 opMode + ARG 1 key + METHOD a crypt (ILjava/security/Key;[B)[B + ARG 0 opMode + ARG 1 key + ARG 2 data + 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 b generateServerKeyPair ()Ljava/security/KeyPair; + METHOD b decrypt (Ljava/security/Key;[B)[B + ARG 0 key + ARG 1 data diff --git a/mappings/net/minecraft/reference/LootTables.mapping b/mappings/net/minecraft/reference/LootTables.mapping index fa20a29796..3d7e212c37 100644 --- a/mappings/net/minecraft/reference/LootTables.mapping +++ b/mappings/net/minecraft/reference/LootTables.mapping @@ -28,6 +28,7 @@ CLASS cdt net/minecraft/reference/LootTables FIELD aF ENTITY_PARROT Lpt; FIELD aH ENTITY_VEX Lpt; FIELD aI ENTITY_ENDER_DRAGON Lpt; + FIELD a EMPTY Lpt; FIELD aQ GAMEPLAY_FISHING Lpt; FIELD aa ENTITY_SHEEP_MAGENTA Lpt; FIELD ab ENTITY_SHEEP_LIGHT_BLUE Lpt; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 806d8da5c2..2f0414baa7 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -89,7 +89,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD ab isStopped ()Z METHOD ac getConfigurationManager ()Lwc; METHOD ae getServerNetworkManager ()Luo; - METHOD ag hasGui ()Z + METHOD ag ()Z METHOD ah getTicks ()I METHOD aj getSnooper ()Laek; METHOD al getSpawnProtectionRadius ()I diff --git a/mappings/th.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping similarity index 57% rename from mappings/th.mapping rename to mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 5c7bd582c1..7f83020045 100644 --- a/mappings/th.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -1,4 +1,6 @@ -CLASS th +CLASS th net/minecraft/server/dedicated/DedicatedServer + FIELD h LOGGER_DEDICATED Lorg/apache/logging/log4j/Logger; + FIELD n properties Lqj; METHOD C_ shouldBroadcastConsoleToOps ()Z METHOD K isMonsterSpawningEnabled ()Z METHOD P isSnooperEnabled ()Z @@ -9,8 +11,18 @@ CLASS th ARG 0 atlas METHOD a setDefaultGameMode (Layx;)V ARG 0 gameMode + METHOD a getInteger (Ljava/lang/String;I)I + ARG 0 key + ARG 1 defaultValue + METHOD a put (Ljava/lang/String;Ljava/lang/Object;)V + ARG 0 key + ARG 1 value + METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 key + ARG 1 defaultValue + METHOD aY getMaxTickTime ()J METHOD ac getConfigurationManager ()Lwc; - METHOD ag hasGui ()Z + METHOD ag ()Z METHOD al getSpawnProtectionRadius ()I METHOD au getMaxWorldBorderRadius ()I METHOD ax getNetworkCompressionThreshold ()I @@ -19,11 +31,16 @@ CLASS th METHOD c setPlayerIdleTimeout (I)V ARG 0 value METHOD d setupServer ()Z + METHOD d_ saveProperties ()V + METHOD e getHostname ()Ljava/lang/String; + METHOD e_ getPropertiesFilename ()Ljava/lang/String; METHOD f shouldGenerateStructures ()Z + METHOD f_ getPort ()I METHOD g getDefaultGameMode ()Layx; METHOD h getDefaultDifficulty ()Lady; METHOD i isHardcore ()Z METHOD j getOpPermissionLevel ()I METHOD k shouldBroadcastRconToOps ()Z + METHOD m getMotd ()Ljava/lang/String; METHOD t exit ()V METHOD u isNetherAllowed ()Z diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerProperties.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerProperties.mapping new file mode 100644 index 0000000000..03f02fd690 --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerProperties.mapping @@ -0,0 +1,16 @@ +CLASS qj net/minecraft/server/dedicated/DedicatedServerProperties + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b properties Ljava/util/Properties; + FIELD c file Ljava/io/File; + METHOD (Ljava/io/File;)V + ARG 0 file + METHOD a generate ()V + METHOD a containsKey (Ljava/lang/String;)Z + METHOD a getInteger (Ljava/lang/String;I)I + METHOD a getLong (Ljava/lang/String;J)J + METHOD a put (Ljava/lang/String;Ljava/lang/Object;)V + METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + METHOD a getBoolean (Ljava/lang/String;Z)Z + METHOD b save ()V + METHOD b remove (Ljava/lang/String;)V + METHOD c getFile ()Ljava/io/File; diff --git a/mappings/net/minecraft/server/dedicated/EulaReader.mapping b/mappings/net/minecraft/server/dedicated/EulaReader.mapping new file mode 100644 index 0000000000..5ba20abdbf --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/EulaReader.mapping @@ -0,0 +1,10 @@ +CLASS qb net/minecraft/server/dedicated/EulaReader + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b eulaFile Ljava/io/File; + FIELD c eulaAgreedTo Z + METHOD (Ljava/io/File;)V + ARG 0 eulaFile + METHOD a isEulaAgreedTo ()Z + METHOD a checkEulaAgreement (Ljava/io/File;)Z + ARG 0 eulaFile + METHOD b createEulaFile ()V diff --git a/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping new file mode 100644 index 0000000000..8b5696676c --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping @@ -0,0 +1,29 @@ +CLASS qh net/minecraft/server/dedicated/IDedicatedServer + METHOD A getPlayerNames ()[Ljava/lang/String; + METHOD C isDebuggingEnabled ()Z + METHOD I getLevelName ()Ljava/lang/String; + METHOD a getInteger (Ljava/lang/String;I)I + ARG 0 key + ARG 1 defaultValue + METHOD a put (Ljava/lang/String;Ljava/lang/Object;)V + ARG 0 key + ARG 1 value + METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 key + ARG 1 defaultValue + METHOD d info (Ljava/lang/String;)V + ARG 0 msg + METHOD d_ saveProperties ()V + METHOD e getHostname ()Ljava/lang/String; + METHOD e warn (Ljava/lang/String;)V + ARG 0 msg + METHOD e_ getPropertiesFilename ()Ljava/lang/String; + METHOD f logError (Ljava/lang/String;)V + ARG 0 message + METHOD f_ getPort ()I + METHOD g log (Ljava/lang/String;)V + ARG 0 message + METHOD m getMotd ()Ljava/lang/String; + METHOD x getVersion ()Ljava/lang/String; + METHOD y getCurrentPlayerCount ()I + METHOD z getMaxPlayerCount ()I diff --git a/mappings/net/minecraft/server/rcon/BufferHelper.mapping b/mappings/net/minecraft/server/rcon/BufferHelper.mapping new file mode 100644 index 0000000000..8fdda971e2 --- /dev/null +++ b/mappings/net/minecraft/server/rcon/BufferHelper.mapping @@ -0,0 +1,17 @@ +CLASS wn net/minecraft/server/rcon/BufferHelper + FIELD a HEX_CHARS_LOOKUP [C + METHOD a toHex (B)Ljava/lang/String; + ARG 0 b + METHOD a getString ([BII)Ljava/lang/String; + ARG 0 buf + METHOD b getIntLE ([BI)I + ARG 0 buf + ARG 1 start + METHOD b gutIntLE ([BII)I + ARG 0 buf + ARG 1 start + ARG 2 limit + METHOD c getIntBE ([BII)I + ARG 0 buf + ARG 1 start + ARG 2 limit diff --git a/mappings/net/minecraft/server/rcon/DataStreamHelper.mapping b/mappings/net/minecraft/server/rcon/DataStreamHelper.mapping new file mode 100644 index 0000000000..1827f77247 --- /dev/null +++ b/mappings/net/minecraft/server/rcon/DataStreamHelper.mapping @@ -0,0 +1,15 @@ +CLASS wm net/minecraft/server/rcon/DataStreamHelper + FIELD a byteArrayOutputStream Ljava/io/ByteArrayOutputStream; + FIELD b dataOutputStream Ljava/io/DataOutputStream; + METHOD (I)V + ARG 0 bufferSize + METHOD a bytes ()[B + METHOD a write (I)V + ARG 0 i + METHOD a writeBytes (Ljava/lang/String;)V + ARG 0 s + METHOD a writeShort (S)V + ARG 0 s + METHOD a write ([B)V + ARG 0 buf + METHOD b reset ()V diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping new file mode 100644 index 0000000000..3e3b2c9376 --- /dev/null +++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping @@ -0,0 +1,13 @@ +CLASS wr net/minecraft/server/rcon/QueryResponseHandler + FIELD i queryPort I + FIELD n socket Ljava/net/DatagramSocket; + FIELD o packetBuffer [B + FIELD p currentPacket Ljava/net/DatagramPacket; + FIELD s hostname Ljava/lang/String; + FIELD v streamHelper Lpt; + METHOD (Lns;)V + ARG 0 server + METHOD a start ()V + METHOD a reply ([BLjava/net/DatagramPacket;)V + ARG 0 buf + METHOD run run ()V diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping new file mode 100644 index 0000000000..e2b61a9e9c --- /dev/null +++ b/mappings/net/minecraft/server/rcon/RconBase.mapping @@ -0,0 +1,34 @@ +CLASS wq net/minecraft/server/rcon/RconBase + FIELD a running Z + FIELD b server Lns; + FIELD c description Ljava/lang/String; + FIELD d thread Ljava/lang/Thread; + FIELD f sockets Ljava/util/List; + FIELD g serverSockets Ljava/util/List; + METHOD (Lns;Ljava/lang/String;)V + ARG 0 server + ARG 1 description + METHOD a start ()V + METHOD a log (Ljava/lang/String;)V + ARG 0 msg + METHOD a registerSocket (Ljava/net/DatagramSocket;)V + ARG 0 socket + METHOD a closeSocket (Ljava/net/DatagramSocket;Z)Z + ARG 0 socket + ARG 1 unregister + METHOD a closeSocket (Ljava/net/ServerSocket;Z)Z + ARG 0 socket + ARG 1 unregister + METHOD a forceClose (Z)V + ARG 0 emitWarn + METHOD b info (Ljava/lang/String;)V + ARG 0 msg + METHOD b closeSocket (Ljava/net/ServerSocket;)Z + ARG 0 socket + METHOD c isRunning ()Z + METHOD c warn (Ljava/lang/String;)V + ARG 0 msg + METHOD d getCurrentPlayerCount ()I + METHOD d logError (Ljava/lang/String;)V + ARG 0 msg + METHOD e forceClose ()V diff --git a/mappings/net/minecraft/server/rcon/RconClient.mapping b/mappings/net/minecraft/server/rcon/RconClient.mapping new file mode 100644 index 0000000000..86e6dbffbb --- /dev/null +++ b/mappings/net/minecraft/server/rcon/RconClient.mapping @@ -0,0 +1,11 @@ +CLASS ws net/minecraft/server/rcon/RconClient + FIELD h LOGGER Lorg/apache/logging/log4j/Logger; + FIELD i authenticated Z + FIELD j socket Ljava/net/Socket; + FIELD k packetBuffer [B + FIELD l password Ljava/lang/String; + METHOD (Lns;Ljava/net/Socket;)V + ARG 0 server + ARG 1 socket + METHOD g close ()V + METHOD run run ()V diff --git a/mappings/net/minecraft/server/rcon/RconServer.mapping b/mappings/net/minecraft/server/rcon/RconServer.mapping new file mode 100644 index 0000000000..680193dc7c --- /dev/null +++ b/mappings/net/minecraft/server/rcon/RconServer.mapping @@ -0,0 +1,11 @@ +CLASS wt net/minecraft/server/rcon/RconServer + FIELD h port I + FIELD i serverPort I + FIELD k listener Ljava/net/ServerSocket; + FIELD m clients Ljava/util/Map; + METHOD (Lns;)V + ARG 0 server + METHOD a start ()V + METHOD f cleanClientList ()V + METHOD g removeStoppedClients ()V + METHOD run run ()V diff --git a/mappings/net/minecraft/state/StateFactory.mapping b/mappings/net/minecraft/state/StateFactory.mapping new file mode 100644 index 0000000000..ee5ab1c024 --- /dev/null +++ b/mappings/net/minecraft/state/StateFactory.mapping @@ -0,0 +1,13 @@ +CLASS bma net/minecraft/state/StateFactory + CLASS bma$a + FIELD b propertyMap Ljava/util/Map; + FIELD a NAME_MATCHER Ljava/util/regex/Pattern; + FIELD b baseObject Ljava/lang/Object; + FIELD c propertyMap Lcom/google/common/collect/ImmutableSortedMap; + FIELD d states Lcom/google/common/collect/ImmutableList; + METHOD a getStates ()Lcom/google/common/collect/ImmutableList; + METHOD a getProperty (Ljava/lang/String;)Lbnj; + ARG 0 name + METHOD b getDefaultState ()Lbmb; + METHOD c getBaseObject ()Ljava/lang/Object; + METHOD d getProperties ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 448e33e1a4..57a67dbd3c 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -9,4 +9,5 @@ CLASS asz net/minecraft/util/DyeColor METHOD a getDyeColor (I)Lasz; ARG 0 id METHOD b getTranslationKey ()Ljava/lang/String; + METHOD e getMapColor ()Lcah; METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/MapColor.mapping b/mappings/net/minecraft/util/MapColor.mapping new file mode 100644 index 0000000000..b6afff7716 --- /dev/null +++ b/mappings/net/minecraft/util/MapColor.mapping @@ -0,0 +1,45 @@ +CLASS cah net/minecraft/util/MapColor + FIELD z PURPLE Lcah; + FIELD A BLUE Lcah; + FIELD B BROWN Lcah; + FIELD C GREEN Lcah; + FIELD D RED Lcah; + FIELD E BLACK Lcah; + FIELD F GOLD Lcah; + FIELD G DIAMOND Lcah; + FIELD H LAPIS Lcah; + FIELD I EMERALD Lcah; + FIELD J SPRUCE Lcah; + FIELD K NETHER Lcah; + FIELD a COLORS [Lcah; + FIELD ab color I + FIELD ac id I + FIELD b AIR Lcah; + FIELD c GRASS Lcah; + FIELD d SAND Lcah; + FIELD e WEB Lcah; + FIELD f LAVA Lcah; + FIELD g ICE Lcah; + FIELD h IRON Lcah; + FIELD i LEAVES Lcah; + FIELD j WHITE Lcah; + FIELD k CLAY Lcah; + FIELD l DIRT Lcah; + FIELD m STONE Lcah; + FIELD n WATER Lcah; + FIELD o WOOD Lcah; + FIELD p QUARTZ Lcah; + FIELD q ORANGE Lcah; + FIELD r MAGENTA Lcah; + FIELD s LIGHT_BLUE Lcah; + FIELD t YELLOW Lcah; + FIELD u LIME Lcah; + FIELD v PINK Lcah; + FIELD w GRAY Lcah; + FIELD x LIGHT_GRAY Lcah; + FIELD y CYAN Lcah; + METHOD (II)V + ARG 0 id + ARG 1 color + METHOD a getRenderColor (I)I + ARG 0 shade diff --git a/mappings/net/minecraft/util/SystemUtils.mapping b/mappings/net/minecraft/util/SystemUtils.mapping new file mode 100644 index 0000000000..dd338b1e46 --- /dev/null +++ b/mappings/net/minecraft/util/SystemUtils.mapping @@ -0,0 +1,34 @@ +CLASS k net/minecraft/util/SystemUtils + CLASS k$a IdentityHashStrategy + FIELD a INSTANCE Lk$a; + CLASS k$b OperatingSystem + CLASS k$b$1 + METHOD b getURLOpenCommand (Ljava/net/URL;)[Ljava/lang/String; + CLASS k$b$2 + METHOD b getURLOpenCommand (Ljava/net/URL;)[Ljava/lang/String; + FIELD a UNIX Lk$b; + FIELD b SOLARIS Lk$b; + FIELD c WINDOWS Lk$b; + FIELD d MAC Lk$b; + FIELD e UNKNOWN Lk$b; + METHOD a open (Ljava/io/File;)V + ARG 0 file + METHOD a open (Ljava/lang/String;)V + ARG 0 url + METHOD a open (Ljava/net/URI;)V + ARG 0 uri + METHOD a open (Ljava/net/URL;)V + ARG 0 url + METHOD b getURLOpenCommand (Ljava/net/URL;)[Ljava/lang/String; + FIELD a NANO_TIME_SUPPLIER Ljava/util/function/LongSupplier; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a createTranslationKey (Ljava/lang/String;Lpt;)Ljava/lang/String; + ARG 0 type + ARG 1 id + METHOD a get (Ljava/util/function/Supplier;)Ljava/lang/Object; + ARG 0 supplier + METHOD b getTimeMiliseconds ()J + METHOD c getTimeNanoseconds ()J + METHOD e getOperatingSystem ()Lk$b; + METHOD g identityHashStrategy ()Lit/unimi/dsi/fastutil/Hash$Strategy; + METHOD h getLogger ()Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/TagHelper.mapping b/mappings/net/minecraft/util/TagHelper.mapping index 41442711bd..354f07cb6b 100644 --- a/mappings/net/minecraft/util/TagHelper.mapping +++ b/mappings/net/minecraft/util/TagHelper.mapping @@ -1,4 +1,5 @@ CLASS hx net/minecraft/util/TagHelper + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a withProperty (Lbmb;Lbnj;Ljava/lang/String;Lhl;Lhl;)Lbmb; ARG 0 state ARG 1 property diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping new file mode 100644 index 0000000000..940ba207a1 --- /dev/null +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -0,0 +1,109 @@ +CLASS ye net/minecraft/util/math/MathHelper + FIELD a SQUARE_ROOT_OF_TWO F + FIELD b sinTable [F + FIELD c rand Ljava/util/Random; + FIELD d MULTIPLY_DE_BRUJIN_BIT_POSITION [I + FIELD e SMALLEST_FRACTION_FREE_DOUBLE D + FIELD f asinTable [D + FIELD g cosTable [D + METHOD a randomUUID ()Ljava/util/UUID; + METHOD a sqrt (D)F + METHOD a absMax (DD)D + METHOD a clamp (DDD)D + ARG 0 value + ARG 1 min + ARG 2 max + METHOD a sin (F)F + METHOD a equalsApproximate (FF)Z + METHOD a clamp (FFF)F + ARG 0 value + ARG 1 min + ARG 2 max + METHOD a abs (I)I + METHOD a floorDiv (II)I + METHOD a clamp (III)I + ARG 0 value + ARG 1 min + ARG 2 max + METHOD a hashCode (Lfk;)J + ARG 0 vec + METHOD a parseDouble (Ljava/lang/String;D)D + ARG 0 string + ARG 1 fallback + METHOD a parseDouble (Ljava/lang/String;DD)D + ARG 0 string + ARG 1 fallback + ARG 2 minimum + METHOD a parseInt (Ljava/lang/String;I)I + ARG 0 string + ARG 1 fallback + METHOD a parseInt (Ljava/lang/String;II)I + ARG 0 string + ARG 1 fallback + ARG 2 minimum + METHOD a randomUUID (Ljava/util/Random;)Ljava/util/UUID; + ARG 0 rand + METHOD a nextDouble (Ljava/util/Random;DD)D + ARG 0 rand + ARG 1 min + ARG 2 max + METHOD a nextFloat (Ljava/util/Random;FF)F + ARG 0 rand + ARG 1 min + ARG 2 max + METHOD a nextInt (Ljava/util/Random;II)I + ARG 0 rand + ARG 1 min + ARG 2 max + METHOD a average ([J)D + ARG 0 array + METHOD b fastFloor (D)I + METHOD b floorMod (DD)D + METHOD b lerpClamped (DDD)D + ARG 0 first + ARG 1 second + ARG 2 amountSecond + METHOD b cos (F)F + METHOD b floorMod (FF)F + METHOD b wrapDegrees (I)I + METHOD b floorMOd (II)I + METHOD b packRgb (III)I + ARG 0 r + ARG 1 g + ARG 2 b + METHOD c floor (D)I + METHOD c atan2 (DD)D + METHOD c sqrt (F)F + METHOD c smallestEncompassingPowerOfTwo (I)I + ARG 0 value + METHOD c roundUp (II)I + METHOD c hashCode (III)J + ARG 0 x + ARG 1 y + ARG 2 z + METHOD d lfloor (D)J + METHOD d floor (F)I + METHOD d packRgb (FFF)I + ARG 0 r + ARG 1 g + ARG 2 b + METHOD d log2DeBrujin (I)I + METHOD d multiplyColors (II)I + ARG 0 first + ARG 1 second + METHOD e absFloor (D)I + METHOD e abs (F)F + METHOD e hsvToRgb (FFF)I + ARG 0 hue + ARG 1 saturation + ARG 2 value + METHOD e log2 (I)I + METHOD f ceil (D)I + METHOD f ceil (F)I + METHOD g wrapDegrees (D)D + METHOD g wrapDegrees (F)F + METHOD g isPowerOfTwo (I)Z + METHOD h fractionalPart (D)D + ARG 0 value + METHOD i fastInverseSqrt (D)D + ARG 0 value diff --git a/mappings/net/minecraft/util/snooper/Snooper.mapping b/mappings/net/minecraft/util/snooper/Snooper.mapping index b2d510f772..79004189df 100644 --- a/mappings/net/minecraft/util/snooper/Snooper.mapping +++ b/mappings/net/minecraft/util/snooper/Snooper.mapping @@ -2,6 +2,7 @@ CLASS aek net/minecraft/util/snooper/Snooper FIELD a initialInfo Ljava/util/Map; FIELD b info Ljava/util/Map; FIELD c token Ljava/lang/String; + FIELD d snooperUrl Ljava/net/URL; FIELD f timer Ljava/util/Timer; FIELD g syncObject Ljava/lang/Object; FIELD h startTime J diff --git a/mappings/qh.mapping b/mappings/qh.mapping deleted file mode 100644 index cec6fb1c8e..0000000000 --- a/mappings/qh.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS qh - METHOD A getPlayerNames ()[Ljava/lang/String; - METHOD C isDebuggingEnabled ()Z - METHOD I getLevelName ()Ljava/lang/String; - METHOD d info (Ljava/lang/String;)V - ARG 0 msg - METHOD e warn (Ljava/lang/String;)V - ARG 0 msg - METHOD f logError (Ljava/lang/String;)V - ARG 0 message - METHOD g log (Ljava/lang/String;)V - ARG 0 message - METHOD x getVersion ()Ljava/lang/String; - METHOD y getCurrentPlayerCount ()I - METHOD z getMaxPlayerCount ()I diff --git a/mappings/tv.mapping b/mappings/tv.mapping new file mode 100644 index 0000000000..44f5e33727 --- /dev/null +++ b/mappings/tv.mapping @@ -0,0 +1,2 @@ +CLASS tv + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/wc.mapping b/mappings/wc.mapping new file mode 100644 index 0000000000..79cd59e979 --- /dev/null +++ b/mappings/wc.mapping @@ -0,0 +1,2 @@ +CLASS wc + METHOD r isEnabled ()Z diff --git a/mappings/ye.mapping b/mappings/ye.mapping deleted file mode 100644 index 3207ba19ca..0000000000 --- a/mappings/ye.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ye