From 27247c41f0d578f50e15209878df4d2a6dfb9eaa Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Thu, 1 Nov 2018 20:19:00 +0100 Subject: [PATCH 1/3] fix getNameComponent --- mappings/net/minecraft/entity/Entity.mapping | 2 +- mappings/net/minecraft/entity/mob/IMonster.mapping | 1 - mappings/net/minecraft/entity/mob/Monster.mapping | 1 + mappings/net/minecraft/entity/passive/EntityVillager.mapping | 2 +- mappings/net/minecraft/entity/player/EntityPlayer.mapping | 2 +- mappings/net/minecraft/util/CustomNameable.mapping | 2 +- mappings/net/minecraft/village/SimpleVillager.mapping | 2 +- .../minecraft/village/{IVillager.mapping => Villager.mapping} | 4 ++-- 8 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 mappings/net/minecraft/entity/mob/IMonster.mapping create mode 100644 mappings/net/minecraft/entity/mob/Monster.mapping rename mappings/net/minecraft/village/{IVillager.mapping => Villager.mapping} (81%) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 3afc1e0733..3bc2b1e3db 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -65,7 +65,7 @@ CLASS afv net/minecraft/entity/Entity METHOD E updatePortalCooldown ()V METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z - METHOD Q ()Lix; + METHOD Q getDisplayedName ()Lix; METHOD R getFactory ()Lafz; METHOD S getEntityId ()I METHOD S_ update ()V diff --git a/mappings/net/minecraft/entity/mob/IMonster.mapping b/mappings/net/minecraft/entity/mob/IMonster.mapping deleted file mode 100644 index 3baac38d0f..0000000000 --- a/mappings/net/minecraft/entity/mob/IMonster.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS aog net/minecraft/entity/mob/IMonster diff --git a/mappings/net/minecraft/entity/mob/Monster.mapping b/mappings/net/minecraft/entity/mob/Monster.mapping new file mode 100644 index 0000000000..14a98b1a98 --- /dev/null +++ b/mappings/net/minecraft/entity/mob/Monster.mapping @@ -0,0 +1 @@ +CLASS aog net/minecraft/entity/mob/Monster diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping index 6e2d9f0d95..054e08bc2a 100644 --- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping @@ -11,7 +11,7 @@ CLASS apm net/minecraft/entity/passive/EntityVillager METHOD F getLootTableId ()Lpu; METHOD I mobTick ()V METHOD N_ getCurrentCustomer ()Lapr; - METHOD Q ()Lix; + METHOD Q getDisplayedName ()Lix; METHOD a onDeath (Lafe;)V ARG 0 damageSource METHOD a createChild (Lafs;)Lafs; diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 00e9198e8d..89e74e030b 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -41,7 +41,7 @@ CLASS apr net/minecraft/entity/player/EntityPlayer FIELD e spawnPosition Leq; FIELD f spawnForced Z METHOD O_ getName ()Lix; - METHOD Q ()Lix; + METHOD Q getDisplayedName ()Lix; METHOD S_ update ()V METHOD T_ stopRiding ()V METHOD X invalidate ()V diff --git a/mappings/net/minecraft/util/CustomNameable.mapping b/mappings/net/minecraft/util/CustomNameable.mapping index 40361ab763..85f60126a7 100644 --- a/mappings/net/minecraft/util/CustomNameable.mapping +++ b/mappings/net/minecraft/util/CustomNameable.mapping @@ -1,4 +1,4 @@ CLASS aev net/minecraft/util/CustomNameable METHOD O_ getName ()Lix; METHOD P_ hasCustomName ()Z - METHOD Q ()Lix; + METHOD Q getDisplayedName ()Lix; diff --git a/mappings/net/minecraft/village/SimpleVillager.mapping b/mappings/net/minecraft/village/SimpleVillager.mapping index 0375b6b8e7..69e6832d61 100644 --- a/mappings/net/minecraft/village/SimpleVillager.mapping +++ b/mappings/net/minecraft/village/SimpleVillager.mapping @@ -7,7 +7,7 @@ CLASS apk net/minecraft/village/SimpleVillager ARG 0 player ARG 1 displayName METHOD N_ getCurrentCustomer ()Lapr; - METHOD Q getNameComponent ()Lix; + METHOD Q getDisplayedName ()Lix; METHOD a onSellingItem (Lauv;)V ARG 0 stack METHOD a useRecipe (Layz;)V diff --git a/mappings/net/minecraft/village/IVillager.mapping b/mappings/net/minecraft/village/Villager.mapping similarity index 81% rename from mappings/net/minecraft/village/IVillager.mapping rename to mappings/net/minecraft/village/Villager.mapping index a83e04773c..f4b04513a6 100644 --- a/mappings/net/minecraft/village/IVillager.mapping +++ b/mappings/net/minecraft/village/Villager.mapping @@ -1,6 +1,6 @@ -CLASS ayy net/minecraft/village/IVillager +CLASS ayy net/minecraft/village/Villager METHOD N_ getCurrentCustomer ()Lapr; - METHOD Q getNameComponent ()Lix; + METHOD Q getDisplayedName ()Lix; METHOD a onSellingItem (Lauv;)V ARG 0 stack METHOD a useRecipe (Layz;)V From f48822e1eb3b552633c47c1e2ee43555d97d67d8 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Thu, 1 Nov 2018 20:25:43 +0100 Subject: [PATCH 2/3] fix DedicatedServer unmapping itself --- .../minecraft/server/MinecraftServer.mapping | 2 + .../dedicated/DedicatedServerWatchdog.mapping | 4 ++ .../MinecraftDedicatedServer.mapping | 55 +++++++++++++++++++ .../minecraft/util/ThreadTaskQueue.mapping | 4 +- .../util/UncaughtExceptionHandler.mapping | 2 + 5 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping create mode 100644 mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping create mode 100644 mappings/net/minecraft/util/UncaughtExceptionHandler.mapping diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 29b5767ec1..d1d40bc4ee 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -184,6 +184,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD n getServerIp ()Ljava/lang/String; METHOD o isRunning ()Z METHOD p stop ()V + METHOD q getTaskQueueSize ()I + METHOD r executeQueuedTask ()Z METHOD s hasIconFile ()Z METHOD t getIconFile ()Ljava/io/File; METHOD u getRunDirectory ()Ljava/io/File; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping new file mode 100644 index 0000000000..afbec13be3 --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping @@ -0,0 +1,4 @@ +CLASS tj net/minecraft/server/dedicated/DedicatedServerWatchdog + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b server Lti; + FIELD c maxTickTime J diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping new file mode 100644 index 0000000000..c9aad5c063 --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -0,0 +1,55 @@ +CLASS ti net/minecraft/server/dedicated/MinecraftDedicatedServer + FIELD g LOGGER_DEDICATED Lorg/apache/logging/log4j/Logger; + FIELD l rconServer Lwu; + FIELD m properties Lqk; + FIELD n eulaReader Lqc; + FIELD o generateStructures Z + FIELD p defaultGameMode Lazq; + FIELD q hasGui Z + METHOD C_ shouldBroadcastConsoleToOps ()Z + METHOD N isMonsterSpawningEnabled ()Z + METHOD S isSnooperEnabled ()Z + METHOD T isDedicated ()Z + METHOD Y isUsingNativeTransport ()Z + METHOD a addSnooperInfo (Laey;)V + ARG 0 snooper + METHOD a setDefaultGameMode (Lazq;)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 a getBoolean (Ljava/lang/String;Z)Z + METHOD aA getNetworkCompressionThreshold ()I + METHOD ab areCommandBlocksEnabled ()Z + METHOD af getConfigurationManager ()Lwd; + METHOD ag isRemote ()Z + METHOD aj hasGui ()Z + METHOD ao getSpawnProtectionRadius ()I + METHOD ax getMaxWorldBorderRadius ()I + METHOD b addServerInfoToCrashReport (Lb;)Lb; + ARG 0 report + METHOD ba getConfigurationManager ()Lth; + METHOD bb createGui ()V + METHOD bd getMaxTickTime ()J + 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 ()Lazq; + METHOD h getDefaultDifficulty ()Laem; + METHOD i isHardcore ()Z + METHOD j getOpPermissionLevel ()I + METHOD k shouldBroadcastRconToOps ()Z + METHOD m getMotd ()Ljava/lang/String; + METHOD v exit ()V + METHOD w isNetherAllowed ()Z diff --git a/mappings/net/minecraft/util/ThreadTaskQueue.mapping b/mappings/net/minecraft/util/ThreadTaskQueue.mapping index b45d744157..162b096d19 100644 --- a/mappings/net/minecraft/util/ThreadTaskQueue.mapping +++ b/mappings/net/minecraft/util/ThreadTaskQueue.mapping @@ -5,4 +5,6 @@ CLASS aeb net/minecraft/util/ThreadTaskQueue METHOD a executeFuture (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; METHOD ay isOffThread ()Z METHOD az isMainThread ()Z - METHOD bf executeQueuedTasks ()V + METHOD bf executeTaskQueue ()V + METHOD q getTaskQueueSize ()I + METHOD r executeQueuedTask ()Z diff --git a/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping b/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping new file mode 100644 index 0000000000..a07926c0e2 --- /dev/null +++ b/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping @@ -0,0 +1,2 @@ +CLASS f net/minecraft/util/UncaughtExceptionHandler + FIELD a logger Lorg/apache/logging/log4j/Logger; From 416b84f5f8a187360b9926a8eaaf590d45723e76 Mon Sep 17 00:00:00 2001 From: Max Gurela Date: Fri, 2 Nov 2018 01:07:35 -0700 Subject: [PATCH 3/3] Map NBT classes (#181) * Map NBT classes * prettyPrint -> toTextComponent * CompoundWrapper -> PersistedState --- mappings/azo.mapping | 2 +- mappings/bzi.mapping | 2 +- .../net/minecraft/item/map/MapState.mapping | 2 +- ...Wrapper.mapping => PersistedState.mapping} | 7 ++++--- mappings/net/minecraft/nbt/Tag.mapping | 10 +++++++++ .../net/minecraft/nbt/TagAbstractList.mapping | 1 + mappings/net/minecraft/nbt/TagByte.mapping | 3 +++ .../net/minecraft/nbt/TagByteArray.mapping | 9 ++++++++ .../net/minecraft/nbt/TagCompound.mapping | 21 +++++++++++++++++++ mappings/net/minecraft/nbt/TagDouble.mapping | 3 +++ mappings/net/minecraft/nbt/TagEnd.mapping | 3 +++ mappings/net/minecraft/nbt/TagFloat.mapping | 3 +++ mappings/net/minecraft/nbt/TagInt.mapping | 3 +++ .../net/minecraft/nbt/TagIntArray.mapping | 6 ++++++ mappings/net/minecraft/nbt/TagList.mapping | 10 +++++++++ mappings/net/minecraft/nbt/TagLong.mapping | 3 +++ .../net/minecraft/nbt/TagLongArray.mapping | 14 +++++++++++++ mappings/net/minecraft/nbt/TagShort.mapping | 3 +++ mappings/net/minecraft/nbt/TagString.mapping | 6 ++++++ .../scoreboard/ScoreboardState.mapping | 2 +- .../net/minecraft/text/TextComponent.mapping | 2 ++ .../net/minecraft/text/TextFormat.mapping | 3 +++ .../world/WorldVillageManager.mapping | 2 +- 23 files changed, 112 insertions(+), 8 deletions(-) rename mappings/net/minecraft/nbt/{CompoundWrapper.mapping => PersistedState.mapping} (64%) diff --git a/mappings/azo.mapping b/mappings/azo.mapping index b840c9979b..a49ee5aa50 100644 --- a/mappings/azo.mapping +++ b/mappings/azo.mapping @@ -1,6 +1,6 @@ CLASS azo METHOD (Ljava/lang/String;)V - ARG 0 baseTag + ARG 0 key METHOD a deserialize (Lhm;)V ARG 0 tag METHOD b serialize (Lhm;)Lhm; diff --git a/mappings/bzi.mapping b/mappings/bzi.mapping index c538c1ace9..c34697c436 100644 --- a/mappings/bzi.mapping +++ b/mappings/bzi.mapping @@ -1,6 +1,6 @@ CLASS bzi METHOD (Ljava/lang/String;)V - ARG 0 baseTag + ARG 0 key METHOD a deserialize (Lhm;)V ARG 0 tag METHOD b serialize (Lhm;)Lhm; diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index c390269f54..d05c0b9f83 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -4,7 +4,7 @@ CLASS cei net/minecraft/item/map/MapState FIELD g colorArray [B FIELD i icons Ljava/util/Map; METHOD (Ljava/lang/String;)V - ARG 0 baseTag + ARG 0 key METHOD a deserialize (Lhm;)V ARG 0 tag METHOD b serialize (Lhm;)Lhm; diff --git a/mappings/net/minecraft/nbt/CompoundWrapper.mapping b/mappings/net/minecraft/nbt/PersistedState.mapping similarity index 64% rename from mappings/net/minecraft/nbt/CompoundWrapper.mapping rename to mappings/net/minecraft/nbt/PersistedState.mapping index 2bdb19a46b..037d996c25 100644 --- a/mappings/net/minecraft/nbt/CompoundWrapper.mapping +++ b/mappings/net/minecraft/nbt/PersistedState.mapping @@ -1,8 +1,8 @@ -CLASS cee net/minecraft/nbt/CompoundWrapper - FIELD a baseTag Ljava/lang/String; +CLASS cee net/minecraft/nbt/PersistedState + FIELD a key Ljava/lang/String; FIELD b dirty Z METHOD (Ljava/lang/String;)V - ARG 0 baseTag + ARG 0 key METHOD a deserialize (Lhm;)V ARG 0 tag METHOD a setDirty (Z)V @@ -11,3 +11,4 @@ CLASS cee net/minecraft/nbt/CompoundWrapper ARG 0 tag METHOD c markDirty ()V METHOD d getDirty ()Z + METHOD e getKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/nbt/Tag.mapping b/mappings/net/minecraft/nbt/Tag.mapping index e018c98a1d..c121074218 100644 --- a/mappings/net/minecraft/nbt/Tag.mapping +++ b/mappings/net/minecraft/nbt/Tag.mapping @@ -1,5 +1,9 @@ CLASS ic net/minecraft/nbt/Tag FIELD a TYPES [Ljava/lang/String; + FIELD b AQUA La; + FIELD c GREEN La; + FIELD d GOLD La; + FIELD e RED La; METHOD a getType ()B METHOD a createTag (B)Lic; ARG 0 id @@ -9,5 +13,11 @@ CLASS ic net/minecraft/nbt/Tag ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c_ asString ()Ljava/lang/String; + METHOD k toTextComponent ()Lix; + METHOD n idToString (I)Ljava/lang/String; + ARG 0 id diff --git a/mappings/net/minecraft/nbt/TagAbstractList.mapping b/mappings/net/minecraft/nbt/TagAbstractList.mapping index 9dc53d72e8..162d915930 100644 --- a/mappings/net/minecraft/nbt/TagAbstractList.mapping +++ b/mappings/net/minecraft/nbt/TagAbstractList.mapping @@ -19,3 +19,4 @@ CLASS hl net/minecraft/nbt/TagAbstractList METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 0 index ARG 1 value + METHOD size ()I diff --git a/mappings/net/minecraft/nbt/TagByte.mapping b/mappings/net/minecraft/nbt/TagByte.mapping index 75b61e55b4..61989c16ec 100644 --- a/mappings/net/minecraft/nbt/TagByte.mapping +++ b/mappings/net/minecraft/nbt/TagByte.mapping @@ -9,6 +9,9 @@ CLASS hk net/minecraft/nbt/TagByte ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c copy ()Lhk; METHOD d getLong ()J diff --git a/mappings/net/minecraft/nbt/TagByteArray.mapping b/mappings/net/minecraft/nbt/TagByteArray.mapping index 33083b281d..a8a1f87d92 100644 --- a/mappings/net/minecraft/nbt/TagByteArray.mapping +++ b/mappings/net/minecraft/nbt/TagByteArray.mapping @@ -1,5 +1,7 @@ CLASS hj net/minecraft/nbt/TagByteArray FIELD f value [B + METHOD (Ljava/util/List;)V + ARG 0 list METHOD ([B)V ARG 0 value METHOD a getType ()B @@ -14,6 +16,11 @@ CLASS hj net/minecraft/nbt/TagByteArray ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth + METHOD a toArray (Ljava/util/List;)[B + ARG 0 list METHOD b copy ()Lic; METHOD b remove (I)V ARG 0 index @@ -23,5 +30,7 @@ CLASS hj net/minecraft/nbt/TagByteArray METHOD c getByteArray ()[B METHOD c getRaw (I)Lic; ARG 0 index + METHOD clear ()V METHOD equals (Ljava/lang/Object;)Z ARG 0 object + METHOD size ()I diff --git a/mappings/net/minecraft/nbt/TagCompound.mapping b/mappings/net/minecraft/nbt/TagCompound.mapping index db056508a6..10bf89d5f4 100644 --- a/mappings/net/minecraft/nbt/TagCompound.mapping +++ b/mappings/net/minecraft/nbt/TagCompound.mapping @@ -1,4 +1,6 @@ CLASS hm net/minecraft/nbt/TagCompound + FIELD f LOGGER Lorg/apache/logging/log4j/Logger; + FIELD g PATTERN Ljava/util/regex/Pattern; FIELD h tags Ljava/util/Map; METHOD a getType ()B METHOD a createTag (BLjava/lang/String;Ljava/io/DataInput;ILhv;)Lic; @@ -29,6 +31,9 @@ CLASS hm net/minecraft/nbt/TagCompound METHOD a setFloat (Ljava/lang/String;F)V ARG 0 key ARG 1 value + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD a createCrashReport (Ljava/lang/String;ILjava/lang/ClassCastException;)Lb; ARG 0 key ARG 1 type @@ -61,6 +66,9 @@ CLASS hm net/minecraft/nbt/TagCompound METHOD a setIntArray (Ljava/lang/String;[I)V ARG 0 key ARG 1 value + METHOD a setLongArray (Ljava/lang/String;[J)V + ARG 0 key + ARG 1 value METHOD b copy ()Lic; METHOD b readString (Ljava/io/DataInput;Lhv;)Ljava/lang/String; ARG 0 input @@ -70,12 +78,18 @@ CLASS hm net/minecraft/nbt/TagCompound METHOD b setInt (Ljava/lang/String;I)V ARG 0 key ARG 1 value + METHOD b setIntArray (Ljava/lang/String;Ljava/util/List;)V + ARG 0 key + ARG 1 value METHOD c getKeys ()Ljava/util/Set; METHOD c getTag (Ljava/lang/String;)Lic; ARG 0 key METHOD c hasKey (Ljava/lang/String;I)Z ARG 0 key ARG 1 type + METHOD c setLongArray (Ljava/lang/String;Ljava/util/List;)V + ARG 0 key + ARG 1 value METHOD d getSize ()I METHOD d getType (Ljava/lang/String;)B ARG 0 key @@ -95,6 +109,7 @@ CLASS hm net/minecraft/nbt/TagCompound ARG 0 key METHOD i getLong (Ljava/lang/String;)J ARG 0 key + METHOD isEmpty ()Z METHOD j getFloat (Ljava/lang/String;)F ARG 0 key METHOD k getDouble (Ljava/lang/String;)D @@ -105,9 +120,15 @@ CLASS hm net/minecraft/nbt/TagCompound ARG 0 key METHOD n getIntArray (Ljava/lang/String;)[I ARG 0 key + METHOD o getLongArray (Ljava/lang/String;)[J + ARG 0 key METHOD p getTagCompound (Ljava/lang/String;)Lhm; ARG 0 key METHOD q getBoolean (Ljava/lang/String;)Z ARG 0 key METHOD r removeTag (Ljava/lang/String;)V ARG 0 key + METHOD s escapeTagKey (Ljava/lang/String;)Ljava/lang/String; + ARG 0 key + METHOD t prettyPrintTagKey (Ljava/lang/String;)Lix; + ARG 0 key diff --git a/mappings/net/minecraft/nbt/TagDouble.mapping b/mappings/net/minecraft/nbt/TagDouble.mapping index 96cfb25547..f9ded58270 100644 --- a/mappings/net/minecraft/nbt/TagDouble.mapping +++ b/mappings/net/minecraft/nbt/TagDouble.mapping @@ -9,6 +9,9 @@ CLASS hn net/minecraft/nbt/TagDouble ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c copy ()Lhn; METHOD d getLong ()J diff --git a/mappings/net/minecraft/nbt/TagEnd.mapping b/mappings/net/minecraft/nbt/TagEnd.mapping index 2722338e17..930de9e9fb 100644 --- a/mappings/net/minecraft/nbt/TagEnd.mapping +++ b/mappings/net/minecraft/nbt/TagEnd.mapping @@ -6,6 +6,9 @@ CLASS ho net/minecraft/nbt/TagEnd ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c copy ()Lho; METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/TagFloat.mapping b/mappings/net/minecraft/nbt/TagFloat.mapping index ac36ba1ad3..aa2726a9aa 100644 --- a/mappings/net/minecraft/nbt/TagFloat.mapping +++ b/mappings/net/minecraft/nbt/TagFloat.mapping @@ -9,6 +9,9 @@ CLASS hp net/minecraft/nbt/TagFloat ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c copy ()Lhp; METHOD d getLong ()J diff --git a/mappings/net/minecraft/nbt/TagInt.mapping b/mappings/net/minecraft/nbt/TagInt.mapping index d6ea442371..e3f1fbf4ac 100644 --- a/mappings/net/minecraft/nbt/TagInt.mapping +++ b/mappings/net/minecraft/nbt/TagInt.mapping @@ -9,6 +9,9 @@ CLASS hr net/minecraft/nbt/TagInt ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c copy ()Lhr; METHOD d getLong ()J diff --git a/mappings/net/minecraft/nbt/TagIntArray.mapping b/mappings/net/minecraft/nbt/TagIntArray.mapping index cc856e4591..59161aff34 100644 --- a/mappings/net/minecraft/nbt/TagIntArray.mapping +++ b/mappings/net/minecraft/nbt/TagIntArray.mapping @@ -1,5 +1,7 @@ CLASS hq net/minecraft/nbt/TagIntArray FIELD f value [I + METHOD (Ljava/util/List;)V + ARG 0 list METHOD ([I)V ARG 0 value METHOD a getType ()B @@ -14,6 +16,9 @@ CLASS hq net/minecraft/nbt/TagIntArray ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD a toArray (Ljava/util/List;)[I ARG 0 list METHOD b copy ()Lic; @@ -28,3 +33,4 @@ CLASS hq net/minecraft/nbt/TagIntArray METHOD equals (Ljava/lang/Object;)Z ARG 0 object METHOD f getIntArray ()[I + METHOD size ()I diff --git a/mappings/net/minecraft/nbt/TagList.mapping b/mappings/net/minecraft/nbt/TagList.mapping index ec9348d77c..5c265e338c 100644 --- a/mappings/net/minecraft/nbt/TagList.mapping +++ b/mappings/net/minecraft/nbt/TagList.mapping @@ -16,6 +16,9 @@ CLASS hs net/minecraft/nbt/TagList ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD a_ getType ()I METHOD b copy ()Lic; METHOD b remove (I)V @@ -31,18 +34,24 @@ CLASS hs net/minecraft/nbt/TagList METHOD c set (ILic;)Lic; ARG 0 index ARG 1 tag + METHOD clear ()V METHOD d get (I)Lic; ARG 0 index METHOD e getTagCompound (I)Lhm; ARG 0 index METHOD equals (Ljava/lang/Object;)Z ARG 0 object + METHOD f getTagList (I)Lhs; + ARG 0 index + METHOD g getShort (I)S + ARG 0 index METHOD get (I)Ljava/lang/Object; ARG 0 index METHOD h getInt (I)I ARG 0 index METHOD i getIntArray (I)[I ARG 0 index + METHOD isEmpty ()Z METHOD k getDouble (I)D ARG 0 index METHOD l getFloat (I)F @@ -54,3 +63,4 @@ CLASS hs net/minecraft/nbt/TagList METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 0 index ARG 1 value + METHOD size ()I diff --git a/mappings/net/minecraft/nbt/TagLong.mapping b/mappings/net/minecraft/nbt/TagLong.mapping index 9954d82638..46213377de 100644 --- a/mappings/net/minecraft/nbt/TagLong.mapping +++ b/mappings/net/minecraft/nbt/TagLong.mapping @@ -9,6 +9,9 @@ CLASS hu net/minecraft/nbt/TagLong ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c copy ()Lhu; METHOD d getLong ()J diff --git a/mappings/net/minecraft/nbt/TagLongArray.mapping b/mappings/net/minecraft/nbt/TagLongArray.mapping index f3e6e065b4..a78af0ef20 100644 --- a/mappings/net/minecraft/nbt/TagLongArray.mapping +++ b/mappings/net/minecraft/nbt/TagLongArray.mapping @@ -1,5 +1,11 @@ CLASS ht net/minecraft/nbt/TagLongArray FIELD f value [J + METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V + ARG 0 set + METHOD (Ljava/util/List;)V + ARG 0 list + METHOD ([J)V + ARG 0 value METHOD a getType ()B METHOD a getRaw (I)Lhu; ARG 0 index @@ -12,6 +18,11 @@ CLASS ht net/minecraft/nbt/TagLongArray ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth + METHOD a toArray (Ljava/util/List;)[J + ARG 0 list METHOD b copy ()Lic; METHOD b remove (I)V ARG 0 index @@ -21,5 +32,8 @@ CLASS ht net/minecraft/nbt/TagLongArray METHOD c copy ()Lht; METHOD c getRaw (I)Lic; ARG 0 index + METHOD clear ()V METHOD equals (Ljava/lang/Object;)Z ARG 0 object + METHOD f getLongArray ()[J + METHOD size ()I diff --git a/mappings/net/minecraft/nbt/TagShort.mapping b/mappings/net/minecraft/nbt/TagShort.mapping index 82c0a78bd7..af4b46732c 100644 --- a/mappings/net/minecraft/nbt/TagShort.mapping +++ b/mappings/net/minecraft/nbt/TagShort.mapping @@ -9,6 +9,9 @@ CLASS ia net/minecraft/nbt/TagShort ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth METHOD b copy ()Lic; METHOD c copy ()Lia; METHOD d getLong ()J diff --git a/mappings/net/minecraft/nbt/TagString.mapping b/mappings/net/minecraft/nbt/TagString.mapping index d5afa2af04..d889128648 100644 --- a/mappings/net/minecraft/nbt/TagString.mapping +++ b/mappings/net/minecraft/nbt/TagString.mapping @@ -9,6 +9,12 @@ CLASS ib net/minecraft/nbt/TagString ARG 2 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output + METHOD a toTextComponent (Ljava/lang/String;I)Lix; + ARG 0 indent + ARG 1 depth + METHOD a escape (Ljava/lang/String;Z)Ljava/lang/String; + ARG 0 value + ARG 1 addQuotes METHOD b copy ()Lic; METHOD c copy ()Lib; METHOD c_ asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index 8fbb3ec1b5..c03741d46e 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -3,7 +3,7 @@ CLASS cjl net/minecraft/scoreboard/ScoreboardState FIELD b scoreboard Lcjk; FIELD c tag Lhm; METHOD (Ljava/lang/String;)V - ARG 0 baseTag + ARG 0 key METHOD a serializeTeams ()Lhs; METHOD a deserializeTeamPlayers (Lcji;Lhs;)V ARG 0 team diff --git a/mappings/net/minecraft/text/TextComponent.mapping b/mappings/net/minecraft/text/TextComponent.mapping index 56febaa775..9779c32d8d 100644 --- a/mappings/net/minecraft/text/TextComponent.mapping +++ b/mappings/net/minecraft/text/TextComponent.mapping @@ -1,5 +1,7 @@ CLASS ix net/minecraft/text/TextComponent METHOD a getChildren ()Ljava/util/List; + METHOD a applyFormat (La;)Lix; + ARG 0 format METHOD a append (Lix;)Lix; ARG 0 component METHOD a append (Ljava/lang/String;)Lix; diff --git a/mappings/net/minecraft/text/TextFormat.mapping b/mappings/net/minecraft/text/TextFormat.mapping index 2e4f938e88..bfe854eab5 100644 --- a/mappings/net/minecraft/text/TextFormat.mapping +++ b/mappings/net/minecraft/text/TextFormat.mapping @@ -1,4 +1,5 @@ CLASS a net/minecraft/text/TextFormat + FIELD A modifier Z FIELD B code Ljava/lang/String; FIELD C id I FIELD D color Ljava/lang/Integer; @@ -30,8 +31,10 @@ CLASS a net/minecraft/text/TextFormat 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;)La; 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; diff --git a/mappings/net/minecraft/world/WorldVillageManager.mapping b/mappings/net/minecraft/world/WorldVillageManager.mapping index 3aad6457bb..f463045520 100644 --- a/mappings/net/minecraft/world/WorldVillageManager.mapping +++ b/mappings/net/minecraft/world/WorldVillageManager.mapping @@ -7,7 +7,7 @@ CLASS ako net/minecraft/world/WorldVillageManager METHOD (Lazt;)V ARG 0 world METHOD (Ljava/lang/String;)V - ARG 0 baseTag + ARG 0 key METHOD a update ()V METHOD a setWorld (Lazt;)V ARG 0 world