From 1ec80e3ecc41538ce985e47dd7ada75d95b576f1 Mon Sep 17 00:00:00 2001 From: asie Date: Wed, 31 Oct 2018 21:47:29 +0100 Subject: [PATCH] first shot at mapping font-related stuff --- mappings/cnw.mapping | 2 + mappings/cnz.mapping | 1 + mappings/coa.mapping | 17 ++++ mappings/cob.mapping | 13 +++ .../minecraft/client/MinecraftGame.mapping | 7 +- .../minecraft/client/font/BlankGlyph.mapping | 5 + .../minecraft/client/font/FontLoader.mapping | 3 + .../client/font/FontLoaderTTF.mapping | 11 +++ .../client/font/FontRenderer.mapping | 96 +++++++++++++++++++ .../minecraft/client/font/FontStorage.mapping | 7 ++ .../net/minecraft/client/font/Glyph.mapping | 1 + .../minecraft/client/font/TextureFont.mapping | 15 +++ .../client/font/TrueTypeFont.mapping | 12 +++ .../client/font/UnicodeTextureFont.mapping | 10 ++ .../client/render/FontRenderer.mapping | 32 ------- .../client/render/VertexFormats.mapping | 18 ++-- .../client/render/WorldRenderer.mapping | 1 + .../projectile/EntityProjectile.mapping | 2 +- .../net/minecraft/text/TextFormat.mapping | 2 + .../net/minecraft/util/PacketByteBuf.mapping | 4 +- ...rofiler.mapping => ProfilerSystem.mapping} | 2 +- .../minecraft/util/math/MathHelper.mapping | 2 +- .../net/minecraft/world/WorldServer.mapping | 4 +- 23 files changed, 221 insertions(+), 46 deletions(-) create mode 100644 mappings/cnw.mapping create mode 100644 mappings/coa.mapping create mode 100644 mappings/cob.mapping create mode 100644 mappings/net/minecraft/client/font/BlankGlyph.mapping create mode 100644 mappings/net/minecraft/client/font/FontLoader.mapping create mode 100644 mappings/net/minecraft/client/font/FontLoaderTTF.mapping create mode 100644 mappings/net/minecraft/client/font/FontRenderer.mapping create mode 100644 mappings/net/minecraft/client/font/FontStorage.mapping create mode 100644 mappings/net/minecraft/client/font/Glyph.mapping create mode 100644 mappings/net/minecraft/client/font/TextureFont.mapping create mode 100644 mappings/net/minecraft/client/font/TrueTypeFont.mapping create mode 100644 mappings/net/minecraft/client/font/UnicodeTextureFont.mapping delete mode 100644 mappings/net/minecraft/client/render/FontRenderer.mapping rename mappings/net/minecraft/util/{Profiler.mapping => ProfilerSystem.mapping} (88%) diff --git a/mappings/cnw.mapping b/mappings/cnw.mapping new file mode 100644 index 0000000000..c1e0fa1c98 --- /dev/null +++ b/mappings/cnw.mapping @@ -0,0 +1,2 @@ +CLASS cnw + METHOD a get (C)Lcjw; diff --git a/mappings/cnz.mapping b/mappings/cnz.mapping index f0f7189dfb..0bbc438037 100644 --- a/mappings/cnz.mapping +++ b/mappings/cnz.mapping @@ -1,3 +1,4 @@ CLASS cnz + CLASS cnz$a METHOD a load (Lvt;)V ARG 0 resourceContainer diff --git a/mappings/coa.mapping b/mappings/coa.mapping new file mode 100644 index 0000000000..afaac993c8 --- /dev/null +++ b/mappings/coa.mapping @@ -0,0 +1,17 @@ +CLASS coa + FIELD b uMin F + FIELD c uMax F + FIELD d vMin F + FIELD e vMax F + METHOD a (Ldjc;ZFFLcla;FFFF)V + ARG 2 x + ARG 3 y + ARG 4 buffer + ARG 5 r + ARG 6 g + ARG 7 b + ARG 8 a + ARG 10 xMin + ARG 11 xMax + ARG 14 yMin + ARG 15 yMax diff --git a/mappings/cob.mapping b/mappings/cob.mapping new file mode 100644 index 0000000000..bf1b8dcd29 --- /dev/null +++ b/mappings/cob.mapping @@ -0,0 +1,13 @@ +CLASS cob + METHOD a (Ldjc;ZFFLcla;FFFF)V + ARG 2 x + ARG 3 y + ARG 4 buffer + ARG 5 r + ARG 6 g + ARG 7 b + ARG 8 a + ARG 10 xMin + ARG 11 xMax + ARG 14 yMin + ARG 15 yMax diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 09b264852f..f1d95fa195 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -35,6 +35,7 @@ CLASS clp net/minecraft/client/MinecraftGame FIELD al autoConnectServerPort I FIELD ao is64Bit Z FIELD ap isDemo Z + FIELD as profiler Ladt; FIELD at resourceManager Lvr; FIELD aw languageManager Ldjv; FIELD ax blockColorMap Lclx; @@ -97,12 +98,15 @@ CLASS clp net/minecraft/client/MinecraftGame METHOD aD doItemPick ()V METHOD aE getCurrentAction ()Ljava/lang/String; METHOD aa getCurrentFps ()I + METHOD ac isConnectedToRealms ()Z METHOD ad getMigrationHandler ()Lcom/mojang/datafixers/DataFixer; METHOD ae getTickDelta ()F METHOD af_ openInGameMenu ()V METHOD ag getBlockColorMap ()Lclx; METHOD ai hasReducedDebugInfo ()Z - METHOD al isFullscreen ()Z + METHOD al ()Z + METHOD an getBakedModelManager ()Ldkn; + METHOD ap getProfiler ()Ladx; METHOD aq init ()V METHOD as checkIs64Bit ()Z METHOD au registerMetadataDeserializers ()V @@ -112,6 +116,7 @@ CLASS clp net/minecraft/client/MinecraftGame METHOD c printCrashReport (Lb;)V ARG 0 crashReport METHOD c setConnectedToRealms (Z)V + ARG 0 value METHOD d getGameVersion ()Ljava/lang/String; METHOD e getVersionType ()Ljava/lang/String; METHOD g reloadResources ()V diff --git a/mappings/net/minecraft/client/font/BlankGlyph.mapping b/mappings/net/minecraft/client/font/BlankGlyph.mapping new file mode 100644 index 0000000000..54aff36094 --- /dev/null +++ b/mappings/net/minecraft/client/font/BlankGlyph.mapping @@ -0,0 +1,5 @@ +CLASS coc net/minecraft/client/font/BlankGlyph + FIELD a INSTANCE Lcoc; + METHOD ()V + METHOD a ()I + METHOD b ()I diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping new file mode 100644 index 0000000000..d37bc9781a --- /dev/null +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -0,0 +1,3 @@ +CLASS cog net/minecraft/client/font/FontLoader + METHOD a load (Lvt;)Lcjv; + ARG 0 manager diff --git a/mappings/net/minecraft/client/font/FontLoaderTTF.mapping b/mappings/net/minecraft/client/font/FontLoaderTTF.mapping new file mode 100644 index 0000000000..f71e73e8b2 --- /dev/null +++ b/mappings/net/minecraft/client/font/FontLoaderTTF.mapping @@ -0,0 +1,11 @@ +CLASS coj net/minecraft/client/font/FontLoaderTTF + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b filename Lpu; + FIELD c size F + FIELD d oversample F + METHOD (Lpu;FFFFLjava/lang/String;)V + ARG 0 filename + ARG 1 size + ARG 2 oversample + METHOD a load (Lvt;)Lcjv; + ARG 0 manager diff --git a/mappings/net/minecraft/client/font/FontRenderer.mapping b/mappings/net/minecraft/client/font/FontRenderer.mapping new file mode 100644 index 0000000000..a774779e4d --- /dev/null +++ b/mappings/net/minecraft/client/font/FontRenderer.mapping @@ -0,0 +1,96 @@ +CLASS cmc net/minecraft/client/font/FontRenderer + CLASS cmc$a CharacterRenderInfo + FIELD a xMin F + FIELD b yMin F + FIELD c xMax F + FIELD d yMax F + FIELD e red F + FIELD f green F + FIELD g blue F + FIELD h alpha F + METHOD a draw (Lcla;)V + ARG 0 buffer + FIELD a FONT_HEIGHT I + FIELD b rand Ljava/util/Random; + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + FIELD d textureManager Ldjc; + FIELD e font Lcny; + FIELD f rightToLeft Z + METHOD a isRightToLeft ()Z + METHOD a getCharWidth (C)F + METHOD a (Lcoa;ZZFFFLcla;FFFF)V + ARG 1 bold + ARG 2 strikethrough + ARG 3 boldOffset + ARG 4 x + ARG 5 y + ARG 6 buffer + ARG 7 red + ARG 8 green + ARG 9 blue + ARG 10 alpha + METHOD a mirror (Ljava/lang/String;)Ljava/lang/String; + ARG 0 s + METHOD a draw (Ljava/lang/String;FFI)I + ARG 0 str + ARG 1 x + ARG 2 y + ARG 3 color + METHOD a renderInternal (Ljava/lang/String;FFIZ)I + ARG 0 str + ARG 1 x + ARG 2 y + ARG 3 color + ARG 4 withShadow + METHOD a (Ljava/lang/String;I)Ljava/lang/String; + ARG 1 width + METHOD a drawStringBounded (Ljava/lang/String;IIII)V + ARG 0 str + ARG 1 x + ARG 2 y + ARG 3 maxWidth + ARG 4 color + METHOD a (Ljava/lang/String;IZ)Ljava/lang/String; + ARG 1 width + METHOD a setRightToLeft (Z)V + ARG 0 value + METHOD b drawWithShadow (Ljava/lang/String;FFI)I + ARG 0 str + ARG 1 x + ARG 2 y + ARG 3 color + METHOD b renderStringInternal (Ljava/lang/String;FFIZ)F + ARG 0 str + ARG 1 x + ARG 2 y + ARG 3 color + ARG 4 shadow + ARG 16 obfuscated + ARG 17 bold + ARG 18 strikethrough + ARG 19 underline + ARG 20 italic + METHOD b getStringBoundedHeight (Ljava/lang/String;I)I + ARG 0 str + ARG 1 maxWidth + METHOD b renderStringBounded (Ljava/lang/String;IIII)V + ARG 0 str + ARG 1 x + ARG 2 y + ARG 3 maxWidth + ARG 4 color + METHOD c trimEndNewlines (Ljava/lang/String;)Ljava/lang/String; + ARG 0 str + METHOD c wrapStringToWidthAsList (Ljava/lang/String;I)Ljava/util/List; + ARG 0 text + ARG 1 width + METHOD d wrapStringToWidth (Ljava/lang/String;I)Ljava/lang/String; + ARG 0 text + ARG 1 width + METHOD e getCharacterCountForWidth (Ljava/lang/String;I)I + ARG 0 text + ARG 1 width + ARG 2 maxWidth + ARG 3 textLength + ARG 4 currWidth + ARG 5 textPos diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping new file mode 100644 index 0000000000..93dcd6d61b --- /dev/null +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -0,0 +1,7 @@ +CLASS cny net/minecraft/client/font/FontStorage + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD d RAND Ljava/util/Random; + FIELD h entries Ljava/util/List; + FIELD j glyphCache Lit/unimi/dsi/fastutil/chars/Char2ObjectMap; + METHOD a getGlyph (C)Lcju; + METHOD c (C)Lcjw; diff --git a/mappings/net/minecraft/client/font/Glyph.mapping b/mappings/net/minecraft/client/font/Glyph.mapping new file mode 100644 index 0000000000..8cbde220bd --- /dev/null +++ b/mappings/net/minecraft/client/font/Glyph.mapping @@ -0,0 +1 @@ +CLASS cju net/minecraft/client/font/Glyph diff --git a/mappings/net/minecraft/client/font/TextureFont.mapping b/mappings/net/minecraft/client/font/TextureFont.mapping new file mode 100644 index 0000000000..763166f956 --- /dev/null +++ b/mappings/net/minecraft/client/font/TextureFont.mapping @@ -0,0 +1,15 @@ +CLASS cof net/minecraft/client/font/TextureFont + CLASS cof$a Loader + FIELD a filename Lpu; + FIELD c height I + FIELD d ascent I + METHOD (Lpu;IILjava/util/List;)V + ARG 0 filename + METHOD a load (Lvt;)Lcjv; + ARG 0 manager + CLASS cof$b + FIELD g advance I + METHOD a ()I + METHOD b ()I + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a get (C)Lcjw; diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping new file mode 100644 index 0000000000..52b521c9e4 --- /dev/null +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -0,0 +1,12 @@ +CLASS cjx net/minecraft/client/font/TrueTypeFont + CLASS cjx$a + FIELD f advance F + METHOD (Lcjx;IIIIFFI)V + METHOD a ()I + METHOD b ()I + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b info Lorg/lwjgl/stb/STBTTFontinfo; + FIELD g stbScaleFactor F + FIELD h ascent F + METHOD (Lorg/lwjgl/stb/STBTTFontinfo;FFFFLjava/lang/String;)V + METHOD a get (C)Lcjw; diff --git a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping new file mode 100644 index 0000000000..4add03997f --- /dev/null +++ b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping @@ -0,0 +1,10 @@ +CLASS coi net/minecraft/client/font/UnicodeTextureFont + CLASS coi$a Loader + METHOD a load (Lvt;)Lcjv; + ARG 0 manager + CLASS coi$b + METHOD a ()I + METHOD b ()I + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c widths [B + METHOD a get (C)Lcjw; diff --git a/mappings/net/minecraft/client/render/FontRenderer.mapping b/mappings/net/minecraft/client/render/FontRenderer.mapping deleted file mode 100644 index cb2f60e5be..0000000000 --- a/mappings/net/minecraft/client/render/FontRenderer.mapping +++ /dev/null @@ -1,32 +0,0 @@ -CLASS cmc net/minecraft/client/render/FontRenderer - FIELD a FONT_HEIGHT I - FIELD b rand Ljava/util/Random; - FIELD d textureManager Ldjc; - FIELD f rightToLeft Z - METHOD a isRightToLeft ()Z - METHOD a mirror (Ljava/lang/String;)Ljava/lang/String; - ARG 0 s - METHOD a drawString (Ljava/lang/String;FFI)I - ARG 0 str - ARG 1 x - ARG 2 y - ARG 3 color - METHOD a drawStringBounded (Ljava/lang/String;IIII)V - ARG 0 str - ARG 1 x - ARG 2 y - ARG 3 maxWidth - ARG 4 color - METHOD a setRightToLeft (Z)V - ARG 0 value - METHOD b getStringBoundedHeight (Ljava/lang/String;I)I - ARG 0 str - ARG 1 maxWidth - METHOD b renderStringBounded (Ljava/lang/String;IIII)V - ARG 0 str - ARG 1 x - ARG 2 y - ARG 3 maxWidth - METHOD c trimEndNewlines (Ljava/lang/String;)Ljava/lang/String; - ARG 0 str - METHOD c wrapStringToList (Ljava/lang/String;I)Ljava/util/List; diff --git a/mappings/net/minecraft/client/render/VertexFormats.mapping b/mappings/net/minecraft/client/render/VertexFormats.mapping index 49abdffeb5..01cee54c17 100644 --- a/mappings/net/minecraft/client/render/VertexFormats.mapping +++ b/mappings/net/minecraft/client/render/VertexFormats.mapping @@ -1,7 +1,13 @@ CLASS clc net/minecraft/client/render/VertexFormats - FIELD a POSITION Lclh; - FIELD b COLOR Lclh; - FIELD c UV Lclh; - FIELD d UV1 Lclh; - FIELD e NORMAL Lclh; - FIELD f PADDING Lclh; + FIELD a POSITION_ELEMENT Lclh; + FIELD b COLOR_ELEMENT Lclh; + FIELD c UV_ELEMENT Lclh; + FIELD e NORMAL_ELEMENT Lclh; + FIELD f PADDING_ELEMENT Lclh; + FIELD k POSITION Lclg; + FIELD l POSITION_COLOR Lclg; + FIELD m POSITION_UV Lclg; + FIELD n POSITION_NORMAL Lclg; + FIELD o POSITION_UV_COLOR Lclg; + FIELD p POSITION_UV_NORMAL Lclg; + FIELD r POSITION_UV_COLOR_NORMAL Lclg; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index ea758db2ba..274e0ccd24 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -10,3 +10,4 @@ CLASS czs net/minecraft/client/render/WorldRenderer METHOD a onResourceReload (Lvt;)V ARG 0 manager METHOD e tick ()V + METHOD l getGame ()Lclp; diff --git a/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping b/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping index afbbe7241e..d93d499250 100644 --- a/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping @@ -17,7 +17,7 @@ CLASS apv net/minecraft/entity/projectile/EntityProjectile FIELD b inGround Z FIELD d pickupType Lapv$a; FIELD e shake I - FIELD f ownerUUID Ljava/util/UUID; + FIELD f ownerUuid Ljava/util/UUID; METHOD S_ update ()V METHOD a shouldRender (D)Z ARG 0 distanceSq diff --git a/mappings/net/minecraft/text/TextFormat.mapping b/mappings/net/minecraft/text/TextFormat.mapping index a39a290ca6..e10f3cf4fe 100644 --- a/mappings/net/minecraft/text/TextFormat.mapping +++ b/mappings/net/minecraft/text/TextFormat.mapping @@ -1,6 +1,7 @@ CLASS a net/minecraft/text/TextFormat FIELD B code Ljava/lang/String; FIELD C id I + FIELD D color Ljava/lang/Integer; FIELD a BLACK La; FIELD b DARK_BLUE La; FIELD d DARK_AQUA La; @@ -32,4 +33,5 @@ CLASS a net/minecraft/text/TextFormat ARG 0 name METHOD d sanitizeName (Ljava/lang/String;)Ljava/lang/String; ARG 0 name + METHOD e getColor ()Ljava/lang/Integer; METHOD g getFormatName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/PacketByteBuf.mapping b/mappings/net/minecraft/util/PacketByteBuf.mapping index 75decc017e..96d61b6fec 100644 --- a/mappings/net/minecraft/util/PacketByteBuf.mapping +++ b/mappings/net/minecraft/util/PacketByteBuf.mapping @@ -17,7 +17,7 @@ CLASS in net/minecraft/util/PacketByteBuf METHOD a writeEnumConstant (Ljava/lang/Enum;)Lin; ARG 0 value METHOD a writeDate (Ljava/util/Date;)Lin; - METHOD a writeUUID (Ljava/util/UUID;)Lin; + METHOD a writeUuid (Ljava/util/UUID;)Lin; ARG 0 uuid METHOD a writeIdentifier (Lpu;)Lin; ARG 0 id @@ -47,7 +47,7 @@ CLASS in net/minecraft/util/PacketByteBuf METHOD f readTextComponent ()Lix; METHOD g readVarInt ()I METHOD h readVarLong ()J - METHOD i readUUID ()Ljava/util/UUID; + METHOD i readUuid ()Ljava/util/UUID; METHOD j readTagCompound ()Lhm; METHOD k readItemStack ()Lauv; METHOD l readIdentifier ()Lpu; diff --git a/mappings/net/minecraft/util/Profiler.mapping b/mappings/net/minecraft/util/ProfilerSystem.mapping similarity index 88% rename from mappings/net/minecraft/util/Profiler.mapping rename to mappings/net/minecraft/util/ProfilerSystem.mapping index 16559ef17f..b5344dd540 100644 --- a/mappings/net/minecraft/util/Profiler.mapping +++ b/mappings/net/minecraft/util/ProfilerSystem.mapping @@ -1,4 +1,4 @@ -CLASS adq net/minecraft/util/Profiler +CLASS adq net/minecraft/util/ProfilerSystem FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c nameList Ljava/util/List; FIELD d timeList Ljava/util/List; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 38b328ae5f..c176aee934 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -41,7 +41,7 @@ CLASS yf net/minecraft/util/math/MathHelper ARG 0 string ARG 1 fallback ARG 2 minimum - METHOD a randomUUID (Ljava/util/Random;)Ljava/util/UUID; + METHOD a randomUuid (Ljava/util/Random;)Ljava/util/UUID; ARG 0 rand METHOD a nextDouble (Ljava/util/Random;DD)D ARG 0 rand diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index ab9c0da839..9f457cd94f 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -1,6 +1,6 @@ CLASS ua net/minecraft/world/WorldServer FIELD B server Lnet/minecraft/server/MinecraftServer; - FIELD D entitiesByUUID Ljava/util/Map; + FIELD D entitiesByUuid Ljava/util/Map; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD D getScoreboard ()Lcjk; METHOD E getChunkProvider ()Lbph; @@ -24,7 +24,7 @@ CLASS ua net/minecraft/world/WorldServer ARG 1 block ARG 2 first ARG 3 second - METHOD a getEntityByUUID (Ljava/util/UUID;)Lafv; + METHOD a getEntityByUuid (Ljava/util/UUID;)Lafv; METHOD b onEntityAdded (Lafv;)V ARG 0 entity METHOD c onEntityRemoved (Lafv;)V