Skip to content

Commit

Permalink
Glyph renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@apple502j
apple502j committed Oct 8, 2024
1 parent a660c0a commit 3a52e9a
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 13 deletions.
8 changes: 7 additions & 1 deletion ...necraft/client/font/GlyphRenderer.mapping → .../minecraft/client/font/BakedGlyph.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
CLASS net/minecraft/class_382 net/minecraft/client/font/BakedGlyph
FIELD field_2272 minX F
FIELD field_2273 maxV F
FIELD field_2274 minV F
Expand Down Expand Up @@ -33,6 +33,12 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
ARG 4 light
METHOD method_24045 getLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921;
ARG 1 layerType
METHOD method_65025 draw (Lnet/minecraft/class_382$class_10364;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;I)V
ARG 1 glyph
ARG 2 matrices
ARG 3 vertexConsumers
ARG 4 light
CLASS class_10364 DrawnGlyph
CLASS class_328 Rectangle
FIELD comp_3307 minX F
FIELD comp_3308 minY F
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/font/EmptyBakedGlyph.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/class_384 net/minecraft/client/font/EmptyBakedGlyph
FIELD field_38311 INSTANCE Lnet/minecraft/class_384;
2 changes: 0 additions & 2 deletions mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping
View file

This file was deleted.

18 changes: 9 additions & 9 deletions mappings/net/minecraft/client/font/FontStorage.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
FIELD field_20910 whiteRectangleGlyphRenderer Lnet/minecraft/class_382;
FIELD field_20910 whiteRectangleBakedGlyph Lnet/minecraft/class_382;
FIELD field_2246 id Lnet/minecraft/class_2960;
FIELD field_2248 textureManager Lnet/minecraft/class_1060;
FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD field_2252 RANDOM Lnet/minecraft/class_5819;
FIELD field_2253 glyphRendererCache Lnet/minecraft/class_8532;
FIELD field_2253 bakedGlyphCache Lnet/minecraft/class_8532;
FIELD field_2254 glyphAtlases Ljava/util/List;
FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382;
FIELD field_2256 blankBakedGlyph Lnet/minecraft/class_382;
FIELD field_2257 glyphCache Lnet/minecraft/class_8532;
FIELD field_39934 MAX_ADVANCE F
FIELD field_49120 allFonts Ljava/util/List;
FIELD field_49121 availableFonts Ljava/util/List;
FIELD field_54819 glyphFinder Ljava/util/function/IntFunction;
FIELD field_54820 glyphRendererFinder Ljava/util/function/IntFunction;
FIELD field_54820 glyphBaker Ljava/util/function/IntFunction;
METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
ARG 1 textureManager
ARG 2 id
Expand All @@ -26,19 +26,19 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
COMMENT @implNote {@link BuiltinEmptyGlyph#MISSING} is returned for missing code points.
ARG 1 codePoint
ARG 2 validateAdvance
METHOD method_2012 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
METHOD method_2012 bake (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
ARG 1 c
METHOD method_2013 getObfuscatedGlyphRenderer (Lnet/minecraft/class_379;)Lnet/minecraft/class_382;
METHOD method_2013 getObfuscatedBakedGlyph (Lnet/minecraft/class_379;)Lnet/minecraft/class_382;
ARG 1 glyph
METHOD method_2014 getGlyphRenderer (I)Lnet/minecraft/class_382;
METHOD method_2014 getBaked (I)Lnet/minecraft/class_382;
ARG 1 codePoint
METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382;
METHOD method_22943 getRectangleBakedGlyph ()Lnet/minecraft/class_382;
METHOD method_40038 findGlyph (I)Lnet/minecraft/class_377$class_7647;
COMMENT {@return the glyph of {@code codePoint}}
COMMENT
COMMENT @apiNote Call {@link #getGlyph} instead, as that method provides caching.
ARG 1 codePoint
METHOD method_41832 findGlyphRenderer (I)Lnet/minecraft/class_382;
METHOD method_41832 bake (I)Lnet/minecraft/class_382;
ARG 1 codePoint
METHOD method_45079 isAdvanceInvalid (Lnet/minecraft/class_379;)Z
ARG 0 glyph
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture
METHOD <init> (Lnet/minecraft/class_8538;Z)V
ARG 1 textRenderLayers
ARG 2 hasColor
METHOD method_2022 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
METHOD method_2022 bake (Lnet/minecraft/class_383;)Lnet/minecraft/class_382;
ARG 1 glyph
METHOD method_51640 (I)I
ARG 0 color
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/font/TextRenderer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
FIELD field_33997 layerType Lnet/minecraft/class_327$class_6415;
FIELD field_54817 color I
FIELD field_54818 backgroundColor I
FIELD field_54911 glyphs Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIIZLorg/joml/Matrix4f;Lnet/minecraft/class_327$class_6415;I)V
ARG 2 vertexConsumers
ARG 3 x
ARG 4 y
ARG 5 color
Expand All @@ -221,6 +223,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 8 layerType
ARG 9 light
METHOD method_27531 drawLayer (F)F
ARG 1 x
METHOD method_27532 addRectangle (Lnet/minecraft/class_382$class_328;)V
ARG 1 rectangle
CLASS class_6415 TextLayerType

0 comments on commit 3a52e9a

Please sign in to comment.