mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Corrected the TextRenderer parameter names (#967) 

* Mapped TextRenderer

* Fix typo

AAAAAAAAAAAAAAAAHHHHHHHHHOOOOOMMMMMMYYYYGOOOOOOOOOOOOOO

* str -> text

* More parameter mappings
This commit is contained in:
­Sollace 2019-11-19 16:23:01 +02:00 committed by modmuss50
parent d9a890e5dc
commit e1ee50dbb4
11 changed files with 64 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mappings/net/minecraft/client/font/Font.mapping
View File

@ -1,2 +1,3 @@
CLASS net/minecraft/class_390 net/minecraft/client/font/Font
METHOD method_2040 getGlyph (C)Lnet/minecraft/class_383;
ARG 1 character

1
mappings/net/minecraft/client/font/FontLoader.mapping
View File

@ -1,2 +1,3 @@
CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader
METHOD method_2039 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390;
ARG 1 manager

4
mappings/net/minecraft/client/font/FontManager.mapping
View File

@ -5,7 +5,11 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
FIELD field_2259 textRenderers Ljava/util/Map;
FIELD field_2260 textureManager Lnet/minecraft/class_1060;
FIELD field_2261 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lnet/minecraft/class_1060;Z)V
ARG 1 manager
METHOD method_18627 getResourceReloadListener ()Lnet/minecraft/class_3302;
METHOD method_2018 setForceUnicodeFont (ZLjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
ARG 1 forceUnicodeFont
ARG 2 prepareExecutor
ARG 3 applyExecutor
METHOD method_2019 getTextRenderer (Lnet/minecraft/class_2960;)Lnet/minecraft/class_327;

6
mappings/net/minecraft/client/font/FontStorage.mapping
View File

@ -18,14 +18,14 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
METHOD method_2004 setFonts (Ljava/util/List;)V
ARG 1 fonts
METHOD method_2008 getRenderableGlyph (C)Lnet/minecraft/class_383;
ARG 1 c
ARG 1 character
METHOD method_2010 closeGlyphAtlases ()V
METHOD method_2011 getGlyph (C)Lnet/minecraft/class_379;
ARG 1 c
ARG 1 character
METHOD method_2012 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
ARG 1 c
METHOD method_2013 getObfuscatedGlyphRenderer (Lnet/minecraft/class_379;)Lnet/minecraft/class_382;
ARG 1 glyph
METHOD method_2014 getGlyphRenderer (C)Lnet/minecraft/class_382;
ARG 1 c
ARG 1 character
METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382;

1
mappings/net/minecraft/client/font/FontType.mapping
View File

@ -6,5 +6,6 @@ CLASS net/minecraft/class_394 net/minecraft/client/font/FontType
ARG 3 id
ARG 4 factory
METHOD method_2047 createLoader (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389;
ARG 1 json
METHOD method_2048 byId (Ljava/lang/String;)Lnet/minecraft/class_394;
ARG 0 id

6
mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping
View File

@ -7,12 +7,18 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture
FIELD field_2269 x I
FIELD field_2270 subSlot1 Lnet/minecraft/class_380$class_381;
FIELD field_2271 subSlot2 Lnet/minecraft/class_380$class_381;
METHOD <init> (IIII)V
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
METHOD method_2024 findSlotFor (Lnet/minecraft/class_383;)Lnet/minecraft/class_380$class_381;
ARG 1 glyph
FIELD field_2262 id Lnet/minecraft/class_2960;
FIELD field_2263 hasColor Z
FIELD field_2264 rootSlot Lnet/minecraft/class_380$class_381;
METHOD <init> (Lnet/minecraft/class_2960;Z)V
ARG 1 id
ARG 2 hasColor
METHOD method_2022 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
ARG 1 glyph

12
mappings/net/minecraft/client/font/GlyphRenderer.mapping
View File

@ -8,6 +8,17 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
FIELD field_2008 xMin F
FIELD field_2009 alpha F
FIELD field_2010 blue F
FIELD field_20911 zIndex F
METHOD <init> (FFFFFFFFF)V
ARG 1 xMin
ARG 2 yMin
ARG 3 xMax
ARG 4 yMax
ARG 5 zndex
ARG 6 red
ARG 7 green
ARG 8 blue
ARG 9 alpha
FIELD field_2272 xMin F
FIELD field_2273 vMax F
FIELD field_2274 vMin F
@ -18,6 +29,7 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
FIELD field_2279 yMin F
FIELD field_2280 xMax F
METHOD <init> (Lnet/minecraft/class_2960;FFFFFFFF)V
ARG 1 id
ARG 2 uMin
ARG 3 uMax
ARG 4 vMin

41
mappings/net/minecraft/client/font/TextRenderer.mapping
View File

@ -8,7 +8,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 1 textureManager
ARG 2 fontStorage
METHOD method_16196 findWordEdge (Ljava/lang/String;IIZ)I
ARG 1 string
ARG 1 text
ARG 2 direction
ARG 3 position
ARG 4 skipWhitespaceToRightOfWord
@ -27,18 +27,20 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 12 alpha
ARG 13 light
METHOD method_1711 trimToWidth (Ljava/lang/String;IZ)Ljava/lang/String;
ARG 1 string
ARG 1 text
ARG 2 width
ARG 3 rightToLeft
METHOD method_1712 drawTrimmed (Ljava/lang/String;IIII)V
ARG 1 string
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 maxWidth
ARG 5 color
METHOD method_1713 getStringBoundedHeight (Ljava/lang/String;I)I
ARG 1 str
ARG 1 text
ARG 2 maxWidth
METHOD method_1714 trimToWidth (Ljava/lang/String;I)Ljava/lang/String;
ARG 1 string
ARG 1 text
ARG 2 width
METHOD method_1715 setFonts (Ljava/util/List;)V
ARG 1 fonts
@ -46,34 +48,38 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 1 text
ARG 2 offset
METHOD method_1717 drawWrapped (Ljava/lang/String;IIII)V
ARG 1 str
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 maxWidth
ARG 5 color
METHOD method_1718 trimEndNewlines (Ljava/lang/String;)Ljava/lang/String;
ARG 1 string
ARG 1 text
METHOD method_1719 setRightToLeft (Z)V
ARG 1 rightToLeft
METHOD method_1720 drawWithShadow (Ljava/lang/String;FFI)I
ARG 1 string
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 color
METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String;
ARG 1 string
ARG 1 text
METHOD method_1722 wrapStringToWidth (Ljava/lang/String;I)Ljava/lang/String;
ARG 1 text
ARG 2 width
METHOD method_1723 drawInternal (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 color
ARG 5 withShadow
ARG 5 shadow
ARG 6 matrix
ARG 7 vertexConsumerProvider
ARG 8 seeThrough
ARG 9 underlineColor
ARG 9 backgroundColor
ARG 10 light
METHOD method_1724 drawLayer (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F
ARG 1 str
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 color
@ -87,23 +93,24 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 1 character
METHOD method_1726 isRightToLeft ()Z
METHOD method_1727 getStringWidth (Ljava/lang/String;)I
ARG 1 string
ARG 1 text
METHOD method_1728 wrapStringToWidthAsList (Ljava/lang/String;I)Ljava/util/List;
ARG 1 text
ARG 2 width
METHOD method_1729 draw (Ljava/lang/String;FFI)I
ARG 1 string
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 color
METHOD method_22941 draw (Ljava/lang/String;FFILnet/minecraft/class_1159;Z)I
ARG 1 string
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 color
ARG 5 matrix
ARG 6 shadow
METHOD method_22942 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
ARG 1 string
ARG 1 text
ARG 2 x
ARG 3 y
ARG 4 color
@ -111,5 +118,5 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 6 matrix
ARG 7 vertexConsumerProvider
ARG 8 seeThrough
ARG 9 underlineColor
ARG 9 backgroundColor
ARG 10 light

3
mappings/net/minecraft/client/font/TextureFont.mapping
View File

@ -35,8 +35,9 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/TextureFont
ARG 6 height
ARG 7 advance
ARG 8 ascent
FIELD field_2284 characterToGlyphMap Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;
FIELD field_2284 glyphs Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;
FIELD field_2285 image Lnet/minecraft/class_1011;
FIELD field_2286 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lnet/minecraft/class_1011;Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;)V
ARG 1 image
ARG 2 glyphs

15
mappings/net/minecraft/client/font/TrueTypeFont.mapping
View File

@ -7,12 +7,14 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont
FIELD field_2337 height I
FIELD field_2338 width I
METHOD <init> (Lnet/minecraft/class_395;IIIIFFI)V
ARG 1 xMin
ARG 2 xMax
ARG 3 yMax
ARG 4 yMin
ARG 5 advance
ARG 7 glyphIndex
ARG 1 outerClass
ARG 2 xMin
ARG 3 xMax
ARG 4 yMax
ARG 5 yMin
ARG 6 advance
ARG 7 bearing
ARG 8 index
FIELD field_2318 shiftY F
FIELD field_2319 excludedCharacters Lit/unimi/dsi/fastutil/chars/CharSet;
FIELD field_2320 shiftX F
@ -23,6 +25,7 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont
FIELD field_2325 scaleFactor F
METHOD <init> (Lorg/lwjgl/stb/STBTTFontinfo;FFFFLjava/lang/String;)V
ARG 1 info
ARG 2 size
ARG 3 oversample
ARG 4 shiftX
ARG 5 shiftY

1
mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping
View File

@ -14,3 +14,4 @@ CLASS net/minecraft/class_396 net/minecraft/client/font/TrueTypeFontLoader
ARG 5 shiftY
ARG 6 excludedCharacters
METHOD method_2059 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389;
ARG 0 json