From 2b6d4a94931d8eb0c8ac72387768c53f2a8a5253 Mon Sep 17 00:00:00 2001 From: Tae Lim Kook Date: Thu, 27 Apr 2023 03:41:24 -0400 Subject: [PATCH] Add mappings for font and light handling (#3553) * Add mappings for font and light handling * Move ReferenceFont and TextRenderLayerSet to proper package --- mappings/net/minecraft/class_8527.mapping | 2 - mappings/net/minecraft/class_8528.mapping | 50 +++++++++++ .../minecraft/client/font/BitmapFont.mapping | 1 + .../minecraft/client/font/FontLoader.mapping | 4 + .../minecraft/client/font/FontManager.mapping | 66 ++++++++++++++ .../minecraft/client/font/FontStorage.mapping | 4 + .../client/font/GlyphAtlasTexture.mapping | 2 + .../client/font/GlyphContainer.mapping | 32 +++++++ .../client/font/GlyphRenderer.mapping | 12 +++ .../client/font/ReferenceFont.mapping | 7 ++ .../client/font/TextRenderLayerSet.mapping | 7 ++ .../client/font/TrueTypeFontLoader.mapping | 1 + .../client/font/UnicodeTextureFont.mapping | 73 +++++++++++++++- .../registry/tag/TagGroupLoader.mapping | 4 + .../resource/DependencyTracker.mapping | 41 +++++++++ .../util/collection/PaletteStorage.mapping | 2 + .../util/math/ChunkSectionPos.mapping | 3 + .../net/minecraft/world/chunk/Chunk.mapping | 3 + .../light/ChunkBlockLightProvider.mapping | 4 + .../chunk/light/ChunkLightProvider.mapping | 85 +++++++++++++++++++ .../chunk/light/ChunkSkyLightProvider.mapping | 19 +++++ .../world/chunk/light/LightSourceView.mapping | 4 + .../world/chunk/light/LightStorage.mapping | 37 ++++++++ .../chunk/light/LightingProvider.mapping | 5 ++ .../world/chunk/light/LightingView.mapping | 2 + .../world/chunk/light/SkyLightStorage.mapping | 3 + 26 files changed, 470 insertions(+), 3 deletions(-) delete mode 100644 mappings/net/minecraft/class_8527.mapping create mode 100644 mappings/net/minecraft/class_8528.mapping create mode 100644 mappings/net/minecraft/client/font/GlyphContainer.mapping create mode 100644 mappings/net/minecraft/client/font/ReferenceFont.mapping create mode 100644 mappings/net/minecraft/client/font/TextRenderLayerSet.mapping create mode 100644 mappings/net/minecraft/resource/DependencyTracker.mapping create mode 100644 mappings/net/minecraft/world/chunk/light/LightSourceView.mapping diff --git a/mappings/net/minecraft/class_8527.mapping b/mappings/net/minecraft/class_8527.mapping deleted file mode 100644 index 4d257ff029..0000000000 --- a/mappings/net/minecraft/class_8527.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_8527 - METHOD method_12018 getLightSourcesStream ()Lnet/minecraft/class_8528; diff --git a/mappings/net/minecraft/class_8528.mapping b/mappings/net/minecraft/class_8528.mapping new file mode 100644 index 0000000000..b35efdc826 --- /dev/null +++ b/mappings/net/minecraft/class_8528.mapping @@ -0,0 +1,50 @@ +CLASS net/minecraft/class_8528 + FIELD field_44712 minY I + FIELD field_44713 palette Lnet/minecraft/class_6490; + FIELD field_44714 reusableBlockPos1 Lnet/minecraft/class_2338$class_2339; + FIELD field_44715 reusableBlockPos2 Lnet/minecraft/class_2338$class_2339; + METHOD (Lnet/minecraft/class_5539;)V + ARG 1 heightLimitView + METHOD method_51534 fill (I)V + ARG 1 y + METHOD method_51535 (II)I + ARG 1 localX + ARG 2 localZ + METHOD method_51536 (Lnet/minecraft/class_1922;III)Z + ARG 1 blockView + ARG 2 localX + ARG 3 y + ARG 4 localZ + METHOD method_51537 (Lnet/minecraft/class_1922;IILnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 1 blockView + ARG 2 packedIndex + ARG 3 value + ARG 4 upperPos + ARG 5 upperState + ARG 6 lowerPos + ARG 7 lowerState + METHOD method_51538 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)I + ARG 1 blockView + ARG 2 pos + ARG 3 blockState + METHOD method_51539 faceBlocksLight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 0 blockView + ARG 1 upperPos + ARG 2 upperState + ARG 3 lowerPos + ARG 4 lowerState + METHOD method_51540 (Lnet/minecraft/class_2791;)V + ARG 1 chunk + METHOD method_51541 (Lnet/minecraft/class_2791;III)I + ARG 1 chunk + ARG 2 topSectionIndex + ARG 3 localX + ARG 4 localZ + METHOD method_51542 get (I)I + ARG 1 index + METHOD method_51543 set (II)V + ARG 1 index + ARG 2 y + METHOD method_51545 getPackedIndex (II)I + ARG 0 localX + ARG 1 localZ diff --git a/mappings/net/minecraft/client/font/BitmapFont.mapping b/mappings/net/minecraft/client/font/BitmapFont.mapping index 3398be65ec..a3c7ae10d0 100644 --- a/mappings/net/minecraft/client/font/BitmapFont.mapping +++ b/mappings/net/minecraft/client/font/BitmapFont.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/BitmapFont FIELD field_2286 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_1011;Lnet/minecraft/class_8532;)V ARG 1 image + ARG 2 glyphs CLASS class_387 Loader FIELD field_2287 ascent I FIELD field_2288 height I diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index 38f69b27de..865531b0f7 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader + CLASS class_8539 Loadable + METHOD load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 resourceManager + CLASS class_8540 Reference diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index c95fa7feca..a897acbdd7 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager FIELD field_24256 idOverrides Ljava/util/Map; FIELD field_32226 FONTS_JSON Ljava/lang/String; FIELD field_40409 FINDER Lnet/minecraft/class_7654; + FIELD field_44757 GSON Lcom/google/gson/Gson; + FIELD field_44758 fonts Ljava/util/List; METHOD (Lnet/minecraft/class_1060;)V ARG 1 manager METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327; @@ -19,3 +21,67 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_45077 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327; + METHOD method_51606 getEffectiveId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 1 id + METHOD method_51607 (Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 fontId + ARG 2 providers + METHOD method_51608 loadIndex (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 resourceManager + METHOD method_51609 (Lnet/minecraft/class_8523;Lnet/minecraft/class_378$class_8537;)V + ARG 1 entry + METHOD method_51610 (Lnet/minecraft/class_3695;Lnet/minecraft/class_378$class_8536;)V + ARG 2 index + METHOD method_51611 (Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + ARG 3 dest + METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_389$class_8539;)V + ARG 5 loadable + METHOD method_51613 load (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8539;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 key + ARG 2 loadable + ARG 3 resourceManager + METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V + ARG 1 index + ARG 2 profiler + METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V + ARG 2 reference + METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map; + ARG 1 entries + METHOD method_51618 (Ljava/util/List;I)V + ARG 1 codePoint + METHOD method_51619 loadFontProviders (Ljava/util/List;Lnet/minecraft/class_2960;)Ljava/util/List; + ARG 0 fontResources + ARG 1 id + METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390;)V + ARG 1 fonts + ARG 2 font + METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; + ARG 4 providers + METHOD method_51624 (Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_378$class_8537;)V + ARG 1 dependent + ARG 2 fontEntry + METHOD method_51625 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 2 fonts + METHOD method_51626 (Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; + ARG 2 entries + CLASS class_8534 FontKey + CLASS class_8535 Builder + METHOD method_51629 build (Ljava/util/function/Function;)Ljava/util/Optional; + ARG 1 fontRetriever + METHOD method_51630 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 2 referee + CLASS class_8536 ProviderIndex + CLASS class_8537 FontEntry + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 fontId + METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V + ARG 1 key + ARG 2 reference + METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 key + ARG 2 provider + METHOD method_51633 (Lnet/minecraft/class_378$class_8535;)Ljava/util/stream/Stream; + ARG 0 builder + METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional; + ARG 1 fontRetriever + METHOD method_51635 getImmediateProviders ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index ed7111caa8..f4f520ad12 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -43,6 +43,10 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage ARG 1 codePoint METHOD method_45079 isAdvanceInvalid (Lnet/minecraft/class_379;)Z ARG 0 glyph + METHOD method_51636 (I)[[Lnet/minecraft/class_377$class_7647; + ARG 0 rowCount + METHOD method_51638 (I)[[Lnet/minecraft/class_382; + ARG 0 rowCount CLASS class_7647 GlyphPair FIELD comp_979 glyph Lnet/minecraft/class_379; FIELD comp_980 advanceValidatedGlyph Lnet/minecraft/class_379; diff --git a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping index e065e25a1e..02dd010b5f 100644 --- a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping +++ b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping @@ -2,7 +2,9 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture FIELD field_2263 hasColor Z FIELD field_2264 rootSlot Lnet/minecraft/class_380$class_381; FIELD field_32227 SLOT_LENGTH I + FIELD field_44759 textRenderLayers Lnet/minecraft/class_8538; METHOD (Lnet/minecraft/class_8538;Z)V + ARG 1 textRenderLayers ARG 2 hasColor METHOD method_2022 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 glyph diff --git a/mappings/net/minecraft/client/font/GlyphContainer.mapping b/mappings/net/minecraft/client/font/GlyphContainer.mapping new file mode 100644 index 0000000000..9b8b9f1251 --- /dev/null +++ b/mappings/net/minecraft/client/font/GlyphContainer.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8532 net/minecraft/client/font/GlyphContainer + FIELD field_44749 ROW_SHIFT I + FIELD field_44750 ENTRIES_PER_ROW I + FIELD field_44751 LAST_ENTRY_NUM_IN_ROW I + FIELD field_44752 LAST_ROW_NUM I + FIELD field_44753 NUM_ROWS I + FIELD field_44754 defaultRow [Ljava/lang/Object; + FIELD field_44755 rows [[Ljava/lang/Object; + FIELD field_44756 makeRow Ljava/util/function/IntFunction; + METHOD (Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V + ARG 1 makeRow + ARG 2 makeScroll + METHOD method_51597 clear ()V + METHOD method_51598 getGlyphs (I)Ljava/lang/Object; + ARG 1 codePoint + METHOD method_51599 put (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 codePoint + ARG 2 glyph + METHOD method_51600 getOrInsert (ILjava/util/function/IntFunction;)Ljava/lang/Object; + ARG 1 codePoint + ARG 2 ifAbsent + METHOD method_51601 forEachGlyph (Lnet/minecraft/class_8532$class_8533;)V + ARG 1 glyphConsumer + METHOD method_51602 (Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;ILjava/lang/Object;)V + ARG 1 codePoint + METHOD method_51603 getProvidedGlyphs ()Lit/unimi/dsi/fastutil/ints/IntSet; + METHOD method_51604 get (I)Ljava/lang/Object; + ARG 1 codePoint + CLASS class_8533 GlyphConsumer + METHOD accept (ILjava/lang/Object;)V + ARG 1 codePoint + ARG 2 glyph diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping index 2aae3fe456..3c0379bbb8 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping @@ -7,6 +7,17 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer FIELD field_2278 maxY F FIELD field_2279 minY F FIELD field_2280 maxX F + FIELD field_44760 textRenderLayers Lnet/minecraft/class_8538; + METHOD (Lnet/minecraft/class_8538;FFFFFFFF)V + ARG 1 textRenderLayers + ARG 2 minU + ARG 3 maxU + ARG 4 minV + ARG 5 maxV + ARG 6 minX + ARG 7 maxX + ARG 8 minY + ARG 9 maxY METHOD method_2025 draw (ZFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFI)V ARG 1 italic ARG 2 x @@ -24,6 +35,7 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer ARG 3 vertexConsumer ARG 4 light METHOD method_24045 getLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921; + ARG 1 layerType CLASS class_328 Rectangle FIELD field_2003 green F FIELD field_2004 red F diff --git a/mappings/net/minecraft/client/font/ReferenceFont.mapping b/mappings/net/minecraft/client/font/ReferenceFont.mapping new file mode 100644 index 0000000000..cf11a6b689 --- /dev/null +++ b/mappings/net/minecraft/client/font/ReferenceFont.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8541 net/minecraft/client/font/ReferenceFont + FIELD field_44762 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44763 referee Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 referee + METHOD method_51646 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; + ARG 0 json diff --git a/mappings/net/minecraft/client/font/TextRenderLayerSet.mapping b/mappings/net/minecraft/client/font/TextRenderLayerSet.mapping new file mode 100644 index 0000000000..69d6747ff0 --- /dev/null +++ b/mappings/net/minecraft/client/font/TextRenderLayerSet.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8538 net/minecraft/client/font/TextRenderLayerSet + METHOD method_51641 ofIntensity (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8538; + ARG 0 textureId + METHOD method_51642 getRenderLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921; + ARG 1 layerType + METHOD method_51643 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8538; + ARG 0 textureId diff --git a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping index 893a8e5d95..1db2473a2e 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_396 net/minecraft/client/font/TrueTypeFontLoader ARG 6 excludedCharacters METHOD method_2059 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; ARG 0 json + METHOD method_51650 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; diff --git a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping index 352cf1cd61..c2b2e0a3d5 100644 --- a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping +++ b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping @@ -1,13 +1,84 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont FIELD field_2303 LOGGER Lorg/slf4j/Logger; + FIELD field_44770 glyphs Lnet/minecraft/class_8532; + METHOD (Lnet/minecraft/class_8532;)V + ARG 1 glyphs + METHOD method_51651 getHexDigitValue (IB)I + ARG 0 lineNum + ARG 1 digit + METHOD method_51652 getHexDigitValue (ILit/unimi/dsi/fastutil/bytes/ByteList;I)I + ARG 0 lineNum + ARG 1 bytes + ARG 2 index + METHOD method_51653 readLines (Ljava/io/InputStream;Lnet/minecraft/class_391$class_8546;)V + ARG 1 callback + METHOD method_51654 readUntilDelimiter (Ljava/io/InputStream;Lit/unimi/dsi/fastutil/bytes/ByteList;I)Z + ARG 1 data + ARG 2 delimiter + METHOD method_51655 addRowPixels (Ljava/nio/IntBuffer;III)V + ARG 0 pixelsOut + ARG 1 row + ARG 2 left + ARG 3 right + METHOD method_51656 addGlyphPixels (Ljava/nio/IntBuffer;Lnet/minecraft/class_391$class_8544;II)V + ARG 0 pixelsOut + ARG 1 glyph + ARG 2 left + ARG 3 right CLASS class_392 Loader FIELD field_2304 sizes Lnet/minecraft/class_2960; + FIELD field_44771 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44772 overrides Ljava/util/List; METHOD (Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 sizes + ARG 2 overrides METHOD method_2046 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; ARG 0 json + METHOD method_51658 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 resourceManager + METHOD method_51660 (Lnet/minecraft/class_8532;ILnet/minecraft/class_391$class_8544;)V + ARG 1 codePoint + ARG 2 glyph + METHOD method_51662 loadHexFile (Ljava/io/InputStream;)Lnet/minecraft/class_391; CLASS class_393 UnicodeTextureGlyph METHOD method_51675 width ()I - CLASS class_7736 FontImage + CLASS class_7736 FontImage8x16 METHOD ([B)V ARG 1 sizes + METHOD method_51669 read (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data + CLASS class_8542 Dimensions + FIELD field_44773 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_44774 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51670 packedValue ()I + METHOD method_51671 getLeft (I)I + ARG 0 packed + METHOD method_51672 pack (II)I + ARG 0 left + ARG 1 right + METHOD method_51674 getRight (I)I + ARG 0 packed + CLASS class_8543 FontImage32x16 + METHOD method_51676 read32x16 (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data + METHOD method_51677 read24x16 (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data + CLASS class_8544 BitmapGlyph + METHOD method_51668 getPixels (I)I + ARG 1 y + METHOD method_51678 getNonemptyColumnBitmask ()I + METHOD method_51679 getPackedDimensions ()I + CLASS class_8545 DimensionOverride + FIELD field_44776 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44777 NON_VALIDATED_CODEC Lcom/mojang/serialization/Codec; + CLASS class_8546 BitmapGlyphConsumer + METHOD accept (ILnet/minecraft/class_391$class_8544;)V + ARG 1 codePoint + ARG 2 glyph + CLASS class_8547 FontImage16x16 + METHOD method_51683 read (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data diff --git a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping index f5f3b445a3..7ab47346c2 100644 --- a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping @@ -21,6 +21,10 @@ CLASS net/minecraft/class_3503 net/minecraft/registry/tag/TagGroupLoader ARG 2 entries METHOD method_43954 (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_3497;)V ARG 2 entry + METHOD method_51476 (Lnet/minecraft/class_3497$class_7474;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3503$class_8522;)V + ARG 3 id + METHOD method_51477 (Lnet/minecraft/class_8523;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 id CLASS class_5145 TrackedEntry FIELD comp_324 entry Lnet/minecraft/class_3497; FIELD comp_325 source Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/DependencyTracker.mapping b/mappings/net/minecraft/resource/DependencyTracker.mapping new file mode 100644 index 0000000000..885830b50e --- /dev/null +++ b/mappings/net/minecraft/resource/DependencyTracker.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_8523 net/minecraft/resource/DependencyTracker + FIELD field_44702 underlying Ljava/util/Map; + METHOD method_51482 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Lnet/minecraft/class_8523$class_8524;)V + ARG 1 key + ARG 2 value + METHOD method_51483 containsReverseDependency (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 0 dependencies + ARG 1 key + ARG 2 dependency + METHOD method_51484 traverse (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/lang/Object;Ljava/util/function/BiConsumer;)V + ARG 1 parentChild + ARG 2 visited + ARG 3 rootKey + ARG 4 callback + METHOD method_51485 (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Ljava/lang/Object;)V + ARG 4 key + METHOD method_51486 add (Ljava/lang/Object;Lnet/minecraft/class_8523$class_8524;)Lnet/minecraft/class_8523; + ARG 1 key + ARG 2 value + METHOD method_51487 traverse (Ljava/util/function/BiConsumer;)V + ARG 1 callback + METHOD method_51488 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Lnet/minecraft/class_8523$class_8524;)V + ARG 1 key + ARG 2 value + METHOD method_51489 addDependency (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 0 dependencies + ARG 1 key + ARG 2 dependency + METHOD method_51490 (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Ljava/lang/Object;)V + ARG 4 child + METHOD method_51491 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 2 dependency + METHOD method_51492 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 2 dependency + METHOD method_51493 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 2 subdependency + CLASS class_8524 Dependencies + METHOD method_51478 forDependencies (Ljava/util/function/Consumer;)V + ARG 1 callback + METHOD method_51480 forOptionalDependencies (Ljava/util/function/Consumer;)V + ARG 1 callback diff --git a/mappings/net/minecraft/util/collection/PaletteStorage.mapping b/mappings/net/minecraft/util/collection/PaletteStorage.mapping index 9de67182fc..8821c34c24 100644 --- a/mappings/net/minecraft/util/collection/PaletteStorage.mapping +++ b/mappings/net/minecraft/util/collection/PaletteStorage.mapping @@ -28,4 +28,6 @@ CLASS net/minecraft/class_6490 net/minecraft/util/collection/PaletteStorage ARG 1 action METHOD method_34896 getElementBits ()I COMMENT {@return the number of bits each element in this storage uses} + METHOD method_39892 writePaletteIndices ([I)V + ARG 1 out METHOD method_39939 copy ()Lnet/minecraft/class_6490; diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index 7970e3f7e5..8b56503703 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -154,6 +154,9 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos ARG 0 entity METHOD method_42615 getSectionCoordFloored (D)I ARG 0 coord + METHOD method_51687 withZeroY (II)J + ARG 0 x + ARG 1 z CLASS 1 FIELD field_19263 iterator Lnet/minecraft/class_3980; METHOD tryAdvance (Ljava/util/function/Consumer;)Z diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index fa62b27f7b..c277a10b03 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -116,4 +116,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_39461 hasBelowZeroRetrogen ()Z METHOD method_44214 getOrCreateGenerationSettings (Ljava/util/function/Supplier;)Lnet/minecraft/class_5485; ARG 1 generationSettingsCreator + METHOD method_51523 (Lnet/minecraft/class_2680;)Z + ARG 0 blockState + METHOD method_51525 forEachBlockMatchingPredicate (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V CLASS class_6745 TickSchedulers diff --git a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping index 28e22b2d4a..a840cf5c46 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping @@ -7,3 +7,7 @@ CLASS net/minecraft/class_3552 net/minecraft/world/chunk/light/ChunkBlockLightPr ARG 2 blockLightStorage METHOD method_15474 getLightSourceLuminance (JLnet/minecraft/class_2680;)I ARG 1 blockPos + ARG 3 blockState + METHOD method_51532 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 blockPos + ARG 2 blockState diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index b032e4d3cd..8512b8ee41 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide FIELD field_17397 cachedChunkPositions [J FIELD field_17398 cachedChunks [Lnet/minecraft/class_8527; FIELD field_19284 reusableBlockPos Lnet/minecraft/class_2338$class_2339; + FIELD field_44733 blockPositionsToCheck Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3560;)V ARG 1 chunkProvider ARG 2 lightStorage @@ -24,9 +25,12 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 5 direction ARG 6 opacity2 METHOD method_20599 setRetainColumn (Lnet/minecraft/class_1923;Z)V + ARG 1 pos ARG 2 retainData METHOD method_20710 getOpaqueShape (Lnet/minecraft/class_2680;JLnet/minecraft/class_2350;)Lnet/minecraft/class_265; + ARG 1 blockState ARG 2 pos + ARG 4 direction METHOD method_22875 displaySectionLevel (J)Ljava/lang/String; ARG 1 sectionPos METHOD method_50016 shapesCoverFullCube (JLnet/minecraft/class_2680;JLnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z @@ -40,3 +44,84 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 2 pos METHOD method_50018 getStateForLighting (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 pos + METHOD method_51529 (J)V + ARG 1 blockPos + METHOD method_51530 (JJ)V + ARG 1 blockPos + METHOD method_51531 (JJI)V + ARG 1 blockPos + METHOD method_51561 needsLightUpdate (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z + ARG 0 blockView + ARG 1 pos + ARG 2 oldState + ARG 3 newState + METHOD method_51562 getOpaqueShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; + ARG 0 blockView + ARG 1 pos + ARG 2 blockState + ARG 3 direction + METHOD method_51563 isTrivialForLighting (Lnet/minecraft/class_2680;)Z + ARG 0 blockState + METHOD method_51564 markSectionAsChecked (J)V + ARG 1 sectionPos + METHOD method_51565 (JJ)V + ARG 1 blockPos + ARG 3 flags + METHOD method_51566 (JJ)V + ARG 1 blockPos + ARG 3 flags + METHOD method_51568 getStatus (J)Lnet/minecraft/class_3560$class_8530; + ARG 1 sectionPos + METHOD method_51569 (JJ)Z + ARG 2 blockPos + CLASS class_8531 + COMMENT Methods for manipulating a set of bitflags with yet unknown functionality. + COMMENT + COMMENT
    + COMMENT
  • Bits 0 – 3 likely store a light level.
    • + COMMENT
  • Bits 4 – 9 store a flag for each of the six directions.
    • + COMMENT
  • Bit 10 stores whether the block at this position is trivial for lighting — if its opacity is not directionally dependent.
    • + COMMENT
  • Bit 11 stores a flag with unknown function.
    • + COMMENT
+ FIELD field_44737 DIRECTION_BIT_OFFSET I + FIELD field_44740 DIRECTION_BIT_MASK J + METHOD method_51571 packWithAllDirectionsSet (I)J + ARG 0 lightLevel + METHOD method_51572 packWithOneDirectionCleared (ILnet/minecraft/class_2350;)J + ARG 0 lightLevel + ARG 1 direction + METHOD method_51573 (IZ)J + ARG 0 lightLevel + ARG 1 trivial + METHOD method_51574 (IZLnet/minecraft/class_2350;)J + ARG 0 lightLevel + ARG 1 trivial + ARG 2 direction + METHOD method_51575 getLightLevel (J)I + ARG 0 packed + METHOD method_51576 withLightLevel (JI)J + ARG 0 packed + ARG 2 lightLevel + METHOD method_51577 isDirectionBitSet (JLnet/minecraft/class_2350;)Z + ARG 0 packed + ARG 2 direction + METHOD method_51578 (ZZZZZ)J + ARG 0 down + ARG 1 north + ARG 2 south + ARG 3 west + ARG 4 east + METHOD method_51579 (IZLnet/minecraft/class_2350;)J + ARG 0 lightLevel + ARG 1 trivial + ARG 2 direction + METHOD method_51580 isTrivial (J)Z + ARG 0 packed + METHOD method_51581 setDirectionBit (JLnet/minecraft/class_2350;)J + ARG 0 packed + ARG 2 direction + METHOD method_51582 (J)Z + ARG 0 packed + METHOD method_51583 clearDirectionBit (JLnet/minecraft/class_2350;)J + ARG 0 packed + ARG 2 direction diff --git a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping index 409fade2c7..ea578d99b5 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping @@ -4,3 +4,22 @@ CLASS net/minecraft/class_3572 net/minecraft/world/chunk/light/ChunkSkyLightProv METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3569;)V ARG 1 chunkProvider ARG 2 lightStorage + METHOD method_51585 (III)I + ARG 1 x + ARG 2 z + METHOD method_51586 (IIII)V + ARG 1 x + ARG 2 z + METHOD method_51587 (JLnet/minecraft/class_2350;IZI)V + ARG 1 blockPos + ARG 3 direction + ARG 4 lightLevel + METHOD method_51588 exitsChunkXZ (Lnet/minecraft/class_2350;II)Z + ARG 0 direction + ARG 1 localX + ARG 2 localZ + METHOD method_51589 (II)Lnet/minecraft/class_8528; + ARG 1 chunkX + ARG 2 chunkZ + METHOD method_51592 getNumberOfSectionsBelowPos (J)I + ARG 1 blockPos diff --git a/mappings/net/minecraft/world/chunk/light/LightSourceView.mapping b/mappings/net/minecraft/world/chunk/light/LightSourceView.mapping new file mode 100644 index 0000000000..9132799698 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/light/LightSourceView.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8527 net/minecraft/world/chunk/light/LightSourceView + METHOD method_12018 getLightSourcesStream ()Lnet/minecraft/class_8528; + METHOD method_51524 forEachLightSource (Ljava/util/function/BiConsumer;)V + ARG 1 callback diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index be9e283915..e64c1fea1a 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -19,6 +19,9 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage FIELD field_15807 queuedSections Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_16448 notifySections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_19342 columnsToRetain Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_44716 sectionPropagations Lit/unimi/dsi/fastutil/longs/Long2ByteMap; + FIELD field_44717 hasLightUpdates Z + FIELD field_44718 enabledColumns Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lnet/minecraft/class_1944;Lnet/minecraft/class_2823;Lnet/minecraft/class_3556;)V ARG 1 lightType ARG 2 chunkProvider @@ -64,3 +67,37 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage ARG 3 retain METHOD method_51415 addNotifySections (J)V ARG 1 id + METHOD method_51546 setSectionPropagation (JB)V + ARG 1 sectionPos + ARG 3 flags + METHOD method_51547 (J)Lnet/minecraft/class_2804; + ARG 1 sectionPos + METHOD method_51548 isSectionInEnabledColumn (J)Z + ARG 1 sectionPos + METHOD method_51549 getStatus (J)Lnet/minecraft/class_3560$class_8530; + ARG 1 sectionPos + METHOD method_51550 queueForUpdate (J)V + ARG 1 sectionPos + METHOD method_51551 queueForRemoval (J)V + ARG 1 sectionPos + CLASS class_8529 PropagationFlags + FIELD field_44720 MIN_NEIGHBOR_COUNT I + FIELD field_44721 MAX_NEIGHBOR_COUNT I + FIELD field_44723 NEIGHBOR_COUNT_MASK B + METHOD method_51552 isReady (B)Z + ARG 0 packed + METHOD method_51553 withNeighborCount (BI)B + ARG 0 packed + ARG 1 neighborCount + METHOD method_51554 setReady (BZ)B + ARG 0 packed + ARG 1 ready + METHOD method_51555 getNeighborCount (B)I + ARG 0 packed + METHOD method_51556 getStatus (B)Lnet/minecraft/class_3560$class_8530; + ARG 0 packed + CLASS class_8530 Status + FIELD field_44727 sigil Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 sigil + METHOD method_51557 getSigil ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 17d5d521fe..1c6df0a3fc 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -24,3 +24,8 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider METHOD method_31928 getHeight ()I METHOD method_31929 getBottomY ()I METHOD method_31930 getTopY ()I + METHOD method_51559 isLightingEnabled (Lnet/minecraft/class_4076;)Z + ARG 1 sectionPos + METHOD method_51560 getStatus (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Lnet/minecraft/class_3560$class_8530; + ARG 1 lightType + ARG 2 pos diff --git a/mappings/net/minecraft/world/chunk/light/LightingView.mapping b/mappings/net/minecraft/world/chunk/light/LightingView.mapping index 9960f3504a..6544dcc6e7 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingView.mapping @@ -12,3 +12,5 @@ CLASS net/minecraft/class_3565 net/minecraft/world/chunk/light/LightingView METHOD method_15552 setSectionStatus (Lnet/minecraft/class_2338;Z)V ARG 1 pos ARG 2 notReady + METHOD method_51471 propagateLight (Lnet/minecraft/class_1923;)V + ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping index 4b54b133b9..ccdbd5c185 100644 --- a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping @@ -10,6 +10,9 @@ CLASS net/minecraft/class_3569 net/minecraft/world/chunk/light/SkyLightStorage ARG 3 cached METHOD method_37460 copy (Lnet/minecraft/class_2804;)Lnet/minecraft/class_2804; ARG 0 source + METHOD method_51593 getMinSectionY ()I + METHOD method_51594 getTopSectionForColumn (J)I + ARG 1 columnPos CLASS class_3570 Data FIELD field_15821 columnToTopSection Lit/unimi/dsi/fastutil/longs/Long2IntOpenHashMap; FIELD field_15822 minSectionY I