From 6fa1e34c83e3aa42af7e80efad710b9072671e72 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:15:03 -0500 Subject: [PATCH] 19w42a rendering and layers etc (#917) * 19w42a rendering and layers etc Signed-off-by: liach * Stage changes Signed-off-by: liach * stuff stuff stuff Signed-off-by: liach * fixed color Signed-off-by: liach * Banner Pattern "Patterns" Patterns name see https://minecraft.gamepedia.com/Banner#Block_entity * Some more changes Signed-off-by: liach * Add 2 mappings Signed-off-by: liach --- .../blaze3d/platform/GlStateManager.mapping | 2 + .../block/entity/BannerBlockEntity.mapping | 5 +- .../block/entity/BannerPattern.mapping | 51 ++------ mappings/net/minecraft/class_4618.mapping | 1 - .../minecraft/client/MinecraftClient.mapping | 2 + mappings/net/minecraft/client/Mouse.mapping | 1 + .../net/minecraft/client/model/Model.mapping | 6 + .../minecraft/client/options/AoOption.mapping | 3 - .../client/options/AttackIndicator.mapping | 3 - .../client/options/ChatVisibility.mapping | 3 - .../client/options/CloudRenderMode.mapping | 3 - .../client/options/KeyBinding.mapping | 2 + .../client/options/NarratorOption.mapping | 4 - .../client/options/ParticlesOption.mapping | 3 - .../render/AbstractVertexConsumer.mapping | 1 - .../client/render/BackgroundRenderer.mapping | 1 + ...ntry.mapping => BlockBreakingInfo.mapping} | 14 +-- .../client/render/BufferBuilder.mapping | 21 ++++ .../client/render/BufferRenderer.mapping | 5 + .../render/FixedColorLayeredDrawer.mapping | 26 ++++ .../render/FixedColorVertexConsumer.mapping | 11 ++ .../minecraft/client/render/Frustum.mapping | 31 +++++ .../client/render/GameRenderer.mapping | 14 +++ .../client/render/GuiLighting.mapping | 1 + .../LayeredBufferBuilderStorage.mapping | 6 + .../LayeredVertexConsumerStorage.mapping | 20 +++ .../render/MatrixVertexConsumer.mapping | 1 + .../client/render/OverlayTexture.mapping | 5 + .../client/render/RenderLayer.mapping | 86 ++++++++++++- .../client/render/RenderLayers.mapping | 15 +++ .../client/render/RenderPhase.mapping | 114 ++++++++++++++++++ .../client/render/VertexConsumer.mapping | 7 +- .../client/render/VertexFormat.mapping | 3 + .../client/render/VertexFormatElement.mapping | 26 +++- .../client/render/VertexFormats.mapping | 1 + .../client/render/WorldRenderer.mapping | 10 +- .../render/block/BlockRenderManager.mapping | 2 +- .../entity/BannerBlockEntityRenderer.mapping | 3 + .../BlockEntityRenderDispatcher.mapping | 5 +- .../block/entity/BlockEntityRenderer.mapping | 2 +- .../BlockLayeredBufferBuilderStorage.mapping | 1 + .../client/render/chunk/ChunkBatcher.mapping | 7 ++ .../debug/VillagerNamer.mapping | 2 +- .../entity/EntityRenderDispatcher.mapping | 1 + .../EnergySwirlOverlayFeatureRenderer.mapping | 5 + .../feature/EyesFeatureRenderer.mapping | 2 + .../entity/feature/FeatureRenderer.mapping | 1 + .../SkinOverlayFeatureRenderer.mapping | 2 - ...pping => BuiltinModelItemRenderer.mapping} | 2 +- .../client/render/model/ModelLoader.mapping | 1 + .../client/texture/AbstractTexture.mapping | 1 + .../client/texture/NativeImage.mapping | 4 +- .../minecraft/client/util/InputUtil.mapping | 2 - .../client/util/ScreenshotUtils.mapping | 9 +- .../client/util/SelectionManager.mapping | 10 +- .../net/minecraft/client/util/Session.mapping | 5 + .../minecraft/client/util/SmoothUtil.mapping | 5 + .../{ => client}/util/math/Matrix3f.mapping | 11 +- .../client/util/math/Matrix4f.mapping | 4 + .../util/math/MatrixStack.mapping | 6 +- .../client/util/math/Rotation3.mapping | 11 ++ .../client/util/math/Rotation3Helper.mapping | 6 + .../client/util/math/Vector3f.mapping | 16 +++ .../client/util/math/Vector4f.mapping | 19 ++- .../StructureReferenceFixer.mapping | 2 + mappings/net/minecraft/entity/Entity.mapping | 1 + .../net/minecraft/util/math/Direction.mapping | 7 +- .../minecraft/util/math/Quaternion.mapping | 25 ++-- mappings/net/minecraft/world/World.mapping | 2 +- 69 files changed, 574 insertions(+), 116 deletions(-) delete mode 100644 mappings/net/minecraft/class_4618.mapping delete mode 100644 mappings/net/minecraft/client/render/AbstractVertexConsumer.mapping rename mappings/net/minecraft/client/render/{PartiallyBrokenBlockEntry.mapping => BlockBreakingInfo.mapping} (50%) create mode 100644 mappings/net/minecraft/client/render/FixedColorLayeredDrawer.mapping create mode 100644 mappings/net/minecraft/client/render/FixedColorVertexConsumer.mapping create mode 100644 mappings/net/minecraft/client/render/RenderLayers.mapping create mode 100644 mappings/net/minecraft/client/render/RenderPhase.mapping rename mappings/net/minecraft/client/{renderer => render}/debug/VillagerNamer.mapping (82%) create mode 100644 mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/feature/EyesFeatureRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/feature/SkinOverlayFeatureRenderer.mapping rename mappings/net/minecraft/client/render/item/{ItemDynamicRenderer.mapping => BuiltinModelItemRenderer.mapping} (89%) rename mappings/net/minecraft/{ => client}/util/math/Matrix3f.mapping (70%) rename mappings/net/minecraft/{ => client}/util/math/MatrixStack.mapping (59%) create mode 100644 mappings/net/minecraft/client/util/math/Rotation3.mapping create mode 100644 mappings/net/minecraft/client/util/math/Rotation3Helper.mapping create mode 100644 mappings/net/minecraft/datafixers/StructureReferenceFixer.mapping diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index d9a8391581..110523391f 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -266,3 +266,5 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22085 stencilMask (I)V METHOD method_22086 disableLineOffset ()V METHOD method_22087 clearStencil (I)V + METHOD method_22606 enableVertexAttribArray (I)V + METHOD method_22609 vertexAttribPointer (IIIZIJ)V diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index b68818e46f..b9e1580c53 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity FIELD field_11773 patternListTag Lnet/minecraft/class_2499; FIELD field_11774 baseColor Lnet/minecraft/class_1767; FIELD field_11775 patternCacheKey Ljava/lang/String; + FIELD field_20743 preview Z METHOD (Lnet/minecraft/class_1767;)V ARG 1 baseColor METHOD method_10905 loadFromItemStack (Lnet/minecraft/class_1799;)V @@ -16,10 +17,12 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity METHOD method_10910 getPatternCount (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_10911 getPatterns ()Ljava/util/List; - METHOD method_10913 deserialize (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V + METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V ARG 1 stack ARG 2 baseColor METHOD method_10914 readPattern ()V METHOD method_10915 getPatternCacheKey ()Ljava/lang/String; METHOD method_16842 setCustomName (Lnet/minecraft/class_2561;)V ARG 1 customName + METHOD method_22534 setPreview (Z)V + METHOD method_22535 isPreview ()Z diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index 2234e2df62..16b673207a 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -1,54 +1,16 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern - CLASS class_3750 Builder - FIELD field_16548 patterns Ljava/util/List; - METHOD method_16375 build ()Lnet/minecraft/class_2499; - METHOD method_16376 with (Lnet/minecraft/class_2582;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; + CLASS class_3750 Patterns + FIELD field_16548 entries Ljava/util/List; + METHOD method_16375 toTag ()Lnet/minecraft/class_2499; + METHOD method_16376 add (Lnet/minecraft/class_2582;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; ARG 1 pattern - FIELD field_11806 SQUARE_BOTTOM_RIGHT Lnet/minecraft/class_2582; - FIELD field_11807 STRIPE_DOWNRIGHT Lnet/minecraft/class_2582; + ARG 2 color FIELD field_11808 name Ljava/lang/String; - FIELD field_11809 BRICKS Lnet/minecraft/class_2582; - FIELD field_11810 STRIPE_BOTTOM Lnet/minecraft/class_2582; - FIELD field_11811 TRIANGLE_BOTTOM Lnet/minecraft/class_2582; - FIELD field_11812 FLOWER Lnet/minecraft/class_2582; - FIELD field_11813 STRIPE_RIGHT Lnet/minecraft/class_2582; - FIELD field_11814 STRIPE_SMALL Lnet/minecraft/class_2582; - FIELD field_11815 TRIANGLES_TOP Lnet/minecraft/class_2582; - FIELD field_11816 CURLY_BORDER Lnet/minecraft/class_2582; - FIELD field_11817 DIAGONAL_LEFT_MIRROR Lnet/minecraft/class_2582; - FIELD field_11818 HALF_VERTICAL_MIRROR Lnet/minecraft/class_2582; - FIELD field_11819 STRIPE_CENTER Lnet/minecraft/class_2582; - FIELD field_11820 STRIPE_DOWNLEFT Lnet/minecraft/class_2582; - FIELD field_11821 RHOMBUS_MIDDLE Lnet/minecraft/class_2582; - FIELD field_11822 TRIANGLES_BOTTOM Lnet/minecraft/class_2582; - FIELD field_11823 CREEPER Lnet/minecraft/class_2582; FIELD field_11824 id Ljava/lang/String; - FIELD field_11825 MOJANG Lnet/minecraft/class_2582; - FIELD field_11826 CIRCLE_MIDDLE Lnet/minecraft/class_2582; - FIELD field_11827 GRADIENT Lnet/minecraft/class_2582; - FIELD field_11828 HALF_VERTICAL Lnet/minecraft/class_2582; - FIELD field_11829 STRIPE_TOP Lnet/minecraft/class_2582; - FIELD field_11830 STRAIGHT_CROSS Lnet/minecraft/class_2582; - FIELD field_11831 SQUARE_TOP_LEFT Lnet/minecraft/class_2582; FIELD field_11832 baseStack Lnet/minecraft/class_1799; - FIELD field_11834 BASE Lnet/minecraft/class_2582; - FIELD field_11835 DIAGONAL_RIGHT Lnet/minecraft/class_2582; - FIELD field_11836 HALF_HORIZONTAL_MIRROR Lnet/minecraft/class_2582; - FIELD field_11837 STRIPE_LEFT Lnet/minecraft/class_2582; - FIELD field_11838 STRIPE_MIDDLE Lnet/minecraft/class_2582; - FIELD field_11839 SQUARE_BOTTOM_LEFT Lnet/minecraft/class_2582; - FIELD field_11840 BORDER Lnet/minecraft/class_2582; FIELD field_11841 recipePattern [Ljava/lang/String; - FIELD field_11842 DIAGONAL_RIGHT_MIRROR Lnet/minecraft/class_2582; - FIELD field_11843 HALF_HORIZONTAL Lnet/minecraft/class_2582; - FIELD field_11844 CROSS Lnet/minecraft/class_2582; - FIELD field_11845 SKULL Lnet/minecraft/class_2582; FIELD field_11846 COUNT I - FIELD field_11847 DIAGONAL_LEFT Lnet/minecraft/class_2582; - FIELD field_11848 SQUARE_TOP_RIGHT Lnet/minecraft/class_2582; - FIELD field_11849 TRIANGLE_TOP Lnet/minecraft/class_2582; - FIELD field_11850 GRADIENT_UP Lnet/minecraft/class_2582; - FIELD field_18689 GLOBE Lnet/minecraft/class_2582; + FIELD field_18283 LOOM_APPLICABLE_COUNT I METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V ARG 3 name ARG 4 id @@ -66,3 +28,4 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern METHOD method_10946 byId (Ljava/lang/String;)Lnet/minecraft/class_2582; ARG 0 id METHOD method_10947 getName ()Ljava/lang/String; + METHOD method_22536 getSpriteId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/class_4618.mapping b/mappings/net/minecraft/class_4618.mapping deleted file mode 100644 index a661061464..0000000000 --- a/mappings/net/minecraft/class_4618.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4618 diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 8b19250e9a..bb5acdb68e 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -90,6 +90,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_18173 statusEffectSpriteManager Lnet/minecraft/class_4074; FIELD field_18174 resourceReloadFuture Ljava/util/concurrent/CompletableFuture; FIELD field_18175 overlay Lnet/minecraft/class_4071; + FIELD field_20909 bufferBuilderStorage Lnet/minecraft/class_4599; METHOD method_1476 checkIs64Bit ()Z METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_1479 getResourcePackDir ()Ljava/io/File; @@ -204,3 +205,4 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_22107 shouldRenderAsync ()Z METHOD method_22108 isRunning ()Z METHOD method_22683 getWindow ()Lnet/minecraft/class_1041; + METHOD method_22940 getBufferBuilderStorage ()Lnet/minecraft/class_4599; diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index 8d79736647..a5ef11c064 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1782 cursorYSmoother Lnet/minecraft/class_3540; FIELD field_1783 isCursorLocked Z FIELD field_1784 hasResolutionChanged Z + FIELD field_1785 lastMouseUpdateTime D FIELD field_1786 eventDeltaWheel D FIELD field_1787 cursorDeltaY D FIELD field_1788 rightButtonClicked Z diff --git a/mappings/net/minecraft/client/model/Model.mapping b/mappings/net/minecraft/client/model/Model.mapping index 53a05ac0a2..d057a0a202 100644 --- a/mappings/net/minecraft/client/model/Model.mapping +++ b/mappings/net/minecraft/client/model/Model.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_3879 net/minecraft/client/model/Model FIELD field_17138 textureWidth I FIELD field_17139 textureHeight I + FIELD field_21343 layerFactory Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;)V + ARG 1 layerFactory + METHOD accept onPartAdded (Ljava/lang/Object;)V + METHOD method_23500 getLayer (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 1 texture METHOD method_2828 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFF)V ARG 5 r ARG 6 g diff --git a/mappings/net/minecraft/client/options/AoOption.mapping b/mappings/net/minecraft/client/options/AoOption.mapping index f9fef6c1d4..96f7cfd753 100644 --- a/mappings/net/minecraft/client/options/AoOption.mapping +++ b/mappings/net/minecraft/client/options/AoOption.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_4060 net/minecraft/client/options/AoOption - FIELD field_18144 OFF Lnet/minecraft/class_4060; - FIELD field_18145 MIN Lnet/minecraft/class_4060; - FIELD field_18146 MAX Lnet/minecraft/class_4060; FIELD field_18147 OPTIONS [Lnet/minecraft/class_4060; FIELD field_18148 value I FIELD field_18149 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/AttackIndicator.mapping b/mappings/net/minecraft/client/options/AttackIndicator.mapping index 39b82c9363..02a8455359 100644 --- a/mappings/net/minecraft/client/options/AttackIndicator.mapping +++ b/mappings/net/minecraft/client/options/AttackIndicator.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_4061 net/minecraft/client/options/AttackIndicator - FIELD field_18151 OFF Lnet/minecraft/class_4061; - FIELD field_18152 CROSSHAIR Lnet/minecraft/class_4061; - FIELD field_18153 HOTBAR Lnet/minecraft/class_4061; FIELD field_18154 VALUES [Lnet/minecraft/class_4061; FIELD field_18155 id I FIELD field_18156 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/ChatVisibility.mapping b/mappings/net/minecraft/client/options/ChatVisibility.mapping index 877134a28f..f6737418e7 100644 --- a/mappings/net/minecraft/client/options/ChatVisibility.mapping +++ b/mappings/net/minecraft/client/options/ChatVisibility.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_1659 net/minecraft/client/options/ChatVisibility FIELD field_7535 id I - FIELD field_7536 HIDDEN Lnet/minecraft/class_1659; - FIELD field_7538 FULL Lnet/minecraft/class_1659; - FIELD field_7539 SYSTEM Lnet/minecraft/class_1659; FIELD field_7540 key Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id diff --git a/mappings/net/minecraft/client/options/CloudRenderMode.mapping b/mappings/net/minecraft/client/options/CloudRenderMode.mapping index b052bbfb17..89b00d132f 100644 --- a/mappings/net/minecraft/client/options/CloudRenderMode.mapping +++ b/mappings/net/minecraft/client/options/CloudRenderMode.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_4063 net/minecraft/client/options/CloudRenderMode - FIELD field_18162 OFF Lnet/minecraft/class_4063; - FIELD field_18163 FAST Lnet/minecraft/class_4063; - FIELD field_18164 FANCY Lnet/minecraft/class_4063; FIELD field_18165 RENDER_MODES [Lnet/minecraft/class_4063; FIELD field_18166 value I FIELD field_18167 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/KeyBinding.mapping b/mappings/net/minecraft/client/options/KeyBinding.mapping index 1bd8bb4e23..422c5cdc4c 100644 --- a/mappings/net/minecraft/client/options/KeyBinding.mapping +++ b/mappings/net/minecraft/client/options/KeyBinding.mapping @@ -45,3 +45,5 @@ CLASS net/minecraft/class_304 net/minecraft/client/options/KeyBinding METHOD method_1436 wasPressed ()Z METHOD method_1437 unpressAll ()V METHOD method_16007 getLocalizedName ()Ljava/lang/String; + METHOD method_23481 setPressed (Z)V + ARG 1 pressed diff --git a/mappings/net/minecraft/client/options/NarratorOption.mapping b/mappings/net/minecraft/client/options/NarratorOption.mapping index 35e655e8d5..887d3d3edb 100644 --- a/mappings/net/minecraft/client/options/NarratorOption.mapping +++ b/mappings/net/minecraft/client/options/NarratorOption.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_4065 net/minecraft/client/options/NarratorOption - FIELD field_18176 OFF Lnet/minecraft/class_4065; - FIELD field_18177 ALL Lnet/minecraft/class_4065; - FIELD field_18178 CHAT Lnet/minecraft/class_4065; - FIELD field_18179 SYSTEM Lnet/minecraft/class_4065; FIELD field_18180 VALUES [Lnet/minecraft/class_4065; FIELD field_18181 id I FIELD field_18182 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/ParticlesOption.mapping b/mappings/net/minecraft/client/options/ParticlesOption.mapping index 7ab53a604b..e66922e5d7 100644 --- a/mappings/net/minecraft/client/options/ParticlesOption.mapping +++ b/mappings/net/minecraft/client/options/ParticlesOption.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_4066 net/minecraft/client/options/ParticlesOption - FIELD field_18197 ALL Lnet/minecraft/class_4066; - FIELD field_18198 DECREASED Lnet/minecraft/class_4066; - FIELD field_18199 MINIMAL Lnet/minecraft/class_4066; FIELD field_18200 VALUES [Lnet/minecraft/class_4066; FIELD field_18201 id I FIELD field_18202 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/AbstractVertexConsumer.mapping b/mappings/net/minecraft/client/render/AbstractVertexConsumer.mapping deleted file mode 100644 index 3c000ee2ef..0000000000 --- a/mappings/net/minecraft/client/render/AbstractVertexConsumer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4585 net/minecraft/client/render/AbstractVertexConsumer diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping index 4c78ac1201..5e0b327264 100644 --- a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer + CLASS class_4596 FogType FIELD field_4031 waterFogColor I FIELD field_4032 blue F FIELD field_4033 green F diff --git a/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping b/mappings/net/minecraft/client/render/BlockBreakingInfo.mapping similarity index 50% rename from mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping rename to mappings/net/minecraft/client/render/BlockBreakingInfo.mapping index 5edc1b1c73..3b19e9da22 100644 --- a/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping +++ b/mappings/net/minecraft/client/render/BlockBreakingInfo.mapping @@ -1,15 +1,15 @@ -CLASS net/minecraft/class_3191 net/minecraft/client/render/PartiallyBrokenBlockEntry - FIELD field_13857 lastUpdateTicks I +CLASS net/minecraft/class_3191 net/minecraft/client/render/BlockBreakingInfo + FIELD field_13857 lastUpdateTick I FIELD field_13858 stage I - FIELD field_13859 breakingEntityId I + FIELD field_13859 actorNetworkId I FIELD field_13860 pos Lnet/minecraft/class_2338; METHOD (ILnet/minecraft/class_2338;)V ARG 1 breakingEntityId ARG 2 pos METHOD method_13987 setStage (I)V - ARG 1 value + ARG 1 stage METHOD method_13988 getStage ()I - METHOD method_13989 setLastUpdateTicks (I)V - ARG 1 value - METHOD method_13990 getLastUpdateTicks ()I + METHOD method_13989 setLastUpdateTick (I)V + ARG 1 lastUpdateTick + METHOD method_13990 getLastUpdateTick ()I METHOD method_13991 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index 4b66066302..813d9df340 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -1,6 +1,18 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder CLASS class_288 State FIELD field_1570 format Lnet/minecraft/class_293; + FIELD field_20885 buffer Ljava/nio/ByteBuffer; + CLASS class_4574 DrawArrayParameters + FIELD field_20779 vertexFormat Lnet/minecraft/class_293; + FIELD field_20780 count I + FIELD field_20781 mode I + METHOD (Lnet/minecraft/class_293;II)V + ARG 1 vertexFormat + ARG 2 count + ARG 3 mode + METHOD method_22634 getVertexFormat ()Lnet/minecraft/class_293; + METHOD method_22635 getCount ()I + METHOD method_22636 getMode ()I FIELD field_1553 currentElementId I FIELD field_1554 vertexCount I FIELD field_1555 buffer Ljava/nio/ByteBuffer; @@ -9,6 +21,11 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder FIELD field_1558 currentElement Lnet/minecraft/class_296; FIELD field_1565 format Lnet/minecraft/class_293; FIELD field_1567 drawMode I + FIELD field_20774 parameters Ljava/util/List; + FIELD field_20775 lastParameterIndex I + FIELD field_20776 buildStart I + FIELD field_20777 nextDrawStart I + FIELD field_20884 elementOffset I METHOD (I)V ARG 1 initialCapacity METHOD method_1319 getDistanceSq (Ljava/nio/FloatBuffer;FFFII)F @@ -31,3 +48,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_1343 clear ()V METHOD method_16005 roundBufferSize (I)I ARG 0 amount + METHOD method_22632 popData ()Lcom/mojang/datafixers/util/Pair; + METHOD method_22892 grow ()V + METHOD method_22893 isBuilding ()Z + METHOD method_23477 reset ()V diff --git a/mappings/net/minecraft/client/render/BufferRenderer.mapping b/mappings/net/minecraft/client/render/BufferRenderer.mapping index f192e01b03..d6cf510ab1 100644 --- a/mappings/net/minecraft/client/render/BufferRenderer.mapping +++ b/mappings/net/minecraft/client/render/BufferRenderer.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer METHOD method_1309 draw (Lnet/minecraft/class_287;)V + METHOD method_22639 draw (Ljava/nio/ByteBuffer;ILnet/minecraft/class_293;I)V + ARG 0 buffer + ARG 1 mode + ARG 2 vertexFormat + ARG 3 count diff --git a/mappings/net/minecraft/client/render/FixedColorLayeredDrawer.mapping b/mappings/net/minecraft/client/render/FixedColorLayeredDrawer.mapping new file mode 100644 index 0000000000..1524593ff1 --- /dev/null +++ b/mappings/net/minecraft/client/render/FixedColorLayeredDrawer.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_4618 net/minecraft/client/render/FixedColorLayeredDrawer + CLASS class_4586 VertexConsumer + FIELD field_20897 delegate Lnet/minecraft/class_4588; + FIELD field_21064 x D + FIELD field_21065 y D + FIELD field_21066 z D + FIELD field_21067 u F + FIELD field_21068 v F + METHOD (Lnet/minecraft/class_4588;IIII)V + ARG 1 delegate + ARG 2 red + ARG 3 green + ARG 4 blue + ARG 5 alpha + FIELD field_21058 parent Lnet/minecraft/class_4597$class_4598; + FIELD field_21059 plainDrawer Lnet/minecraft/class_4597$class_4598; + FIELD field_21060 red I + FIELD field_21061 green I + FIELD field_21062 blue I + FIELD field_21063 alpha I + METHOD method_23285 draw ()V + METHOD method_23286 setColor (IIII)V + ARG 1 red + ARG 2 green + ARG 3 blue + ARG 4 alpha diff --git a/mappings/net/minecraft/client/render/FixedColorVertexConsumer.mapping b/mappings/net/minecraft/client/render/FixedColorVertexConsumer.mapping new file mode 100644 index 0000000000..4d9b10998a --- /dev/null +++ b/mappings/net/minecraft/client/render/FixedColorVertexConsumer.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_4585 net/minecraft/client/render/FixedColorVertexConsumer + FIELD field_20889 colorFixed Z + FIELD field_20890 fixedRed I + FIELD field_20891 fixedGreen I + FIELD field_20892 fixedBlue I + FIELD field_20893 fixedAlpha I + METHOD method_22901 fixedColor (IIII)V + ARG 1 red + ARG 2 green + ARG 3 blue + ARG 4 alpha diff --git a/mappings/net/minecraft/client/render/Frustum.mapping b/mappings/net/minecraft/client/render/Frustum.mapping index 8c41f561a5..65996ba928 100644 --- a/mappings/net/minecraft/client/render/Frustum.mapping +++ b/mappings/net/minecraft/client/render/Frustum.mapping @@ -1 +1,32 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum + FIELD field_20994 homogeneousCoordinates [Lnet/minecraft/class_1162; + FIELD field_20995 x D + FIELD field_20996 y D + FIELD field_20997 z D + METHOD method_23088 setPosition (DDD)V + ARG 1 cameraX + ARG 3 cameraY + ARG 5 cameraZ + METHOD method_23089 isVisible (DDDDDD)Z + ARG 1 minX + ARG 3 minY + ARG 5 minZ + ARG 7 maxX + ARG 9 maxY + ARG 11 maxZ + METHOD method_23090 isAnyCornerVisible (FFFFFF)Z + ARG 1 x1 + ARG 2 y1 + ARG 3 z1 + ARG 4 x2 + ARG 5 y2 + ARG 6 z2 + METHOD method_23091 transform (Lnet/minecraft/class_1159;IIII)V + ARG 1 function + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 index + METHOD method_23092 init (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;)V + METHOD method_23093 isVisible (Lnet/minecraft/class_238;)Z + ARG 1 box diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 2b9976524f..2451ac78f0 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_18765 camera Lnet/minecraft/class_4184; + FIELD field_20948 layeredBufferBuilderStorage Lnet/minecraft/class_4599; + FIELD field_20949 overlayTexture Lnet/minecraft/class_4608; FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_3994 random Ljava/util/Random; @@ -7,6 +9,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_3997 lastSkyDarkness F FIELD field_3998 lastWindowFocusedTime J FIELD field_3999 lastMovementFovMultiplier F + FIELD field_4001 renderingPanorama Z FIELD field_4002 skyDarkness F FIELD field_4003 floatingItemHeight F FIELD field_4006 floatingItem Lnet/minecraft/class_1799; @@ -29,6 +32,15 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V ARG 1 client METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; + METHOD method_22709 (Lnet/minecraft/class_4184;FZZF)V + ARG 2 tickDelta + ARG 3 changingFov + ARG 5 viewDistanceMultiplier + METHOD method_22973 (Lnet/minecraft/class_4184;FZZF)Lnet/minecraft/class_1159; + ARG 1 camera + ARG 2 tickDelta + ARG 3 changingFov + ARG 5 viewDistanceMultiplier METHOD method_22974 getLightmapTextureManager ()Lnet/minecraft/class_765; METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V METHOD method_3168 loadShader (Lnet/minecraft/class_2960;)V @@ -61,7 +73,9 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3195 getSkyDarkness (F)F ARG 1 tickDelta METHOD method_3196 getFov (Lnet/minecraft/class_4184;FZ)D + ARG 1 camera ARG 2 tickDelta + ARG 3 changingFov METHOD method_3198 bobViewWhenHurt (Lnet/minecraft/class_4587;F)V METHOD method_3199 updateMovementFovMultiplier ()V METHOD method_3202 shouldRenderBlockOutline ()Z diff --git a/mappings/net/minecraft/client/render/GuiLighting.mapping b/mappings/net/minecraft/client/render/GuiLighting.mapping index 84f20ebadd..2d1441e8ed 100644 --- a/mappings/net/minecraft/client/render/GuiLighting.mapping +++ b/mappings/net/minecraft/client/render/GuiLighting.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/GuiLighting METHOD method_1450 disable ()V METHOD method_1452 enable (Lnet/minecraft/class_1159;)V METHOD method_1453 enableForItems (Lnet/minecraft/class_1159;)V + METHOD method_22890 enable ()V diff --git a/mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping index 27b2481f1f..c213c2960d 100644 --- a/mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping +++ b/mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_4599 net/minecraft/client/render/LayeredBufferBuilderStorage FIELD field_20956 blockBufferBuilders Lnet/minecraft/class_750; FIELD field_20957 bufferBuilders Ljava/util/SortedMap; + FIELD field_20958 generalDrawer Lnet/minecraft/class_4597$class_4598; + FIELD field_20959 blockBreakingProgressDrawer Lnet/minecraft/class_4597$class_4598; + FIELD field_20961 teamColorAwareOutlineDrawer Lnet/minecraft/class_4618; METHOD method_22997 getBlockBufferBuilders ()Lnet/minecraft/class_750; + METHOD method_23000 getGeneralDrawer ()Lnet/minecraft/class_4597$class_4598; + METHOD method_23001 getBlockBreakingProgressDrawer ()Lnet/minecraft/class_4597$class_4598; + METHOD method_23003 getTeamColorAwareOutlineDrawer ()Lnet/minecraft/class_4618; diff --git a/mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping b/mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping index 59b9b37700..41cb30f43d 100644 --- a/mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping +++ b/mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping @@ -1 +1,21 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/LayeredVertexConsumerStorage + CLASS class_4598 Drawer + FIELD field_20952 sharedConsumer Lnet/minecraft/class_287; + FIELD field_20953 layerSpecificConsumers Ljava/util/Map; + FIELD field_20954 currentLayer Ljava/util/Optional; + FIELD field_20955 activeConsumers Ljava/util/Set; + METHOD (Lnet/minecraft/class_287;Ljava/util/Map;)V + ARG 1 sharedConsumer + ARG 2 layerSpecificConsumers + METHOD method_22993 draw ()V + METHOD method_22994 draw (Lnet/minecraft/class_1921;)V + ARG 1 layer + METHOD method_22995 getConsumer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; + ARG 1 layer + METHOD getBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; + ARG 1 layer + METHOD method_22991 makeDrawer (Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; + ARG 0 vertexConsumer + METHOD method_22992 makeDrawer (Ljava/util/Map;Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; + ARG 0 layerSpecificConsumers + ARG 1 vertexConsumer diff --git a/mappings/net/minecraft/client/render/MatrixVertexConsumer.mapping b/mappings/net/minecraft/client/render/MatrixVertexConsumer.mapping index 0870f394e5..bb6c2324a5 100644 --- a/mappings/net/minecraft/client/render/MatrixVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/MatrixVertexConsumer.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/MatrixVertexConsumer METHOD (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;)V ARG 1 vertexConsumer ARG 2 matrix + METHOD method_22891 init ()V diff --git a/mappings/net/minecraft/client/render/OverlayTexture.mapping b/mappings/net/minecraft/client/render/OverlayTexture.mapping index f9ea99a760..f0bf08fa75 100644 --- a/mappings/net/minecraft/client/render/OverlayTexture.mapping +++ b/mappings/net/minecraft/client/render/OverlayTexture.mapping @@ -1,6 +1,11 @@ CLASS net/minecraft/class_4608 net/minecraft/client/render/OverlayTexture FIELD field_21013 texture Lnet/minecraft/class_1043; + FIELD field_21444 DEFAULT_UV I METHOD method_23209 setupOverlayColor ()V METHOD method_23210 getU (F)I METHOD method_23212 getV (Z)I METHOD method_23213 teardownOverlayColor ()V + METHOD method_23624 packUv (FZ)I + METHOD method_23625 packUv (II)I + ARG 0 u + ARG 1 v diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 5b765615f0..d79963faa3 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -1,4 +1,63 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer + CLASS class_4687 MultiPhase + FIELD field_21403 data Lnet/minecraft/class_1921$class_4688; + FIELD field_21404 hash I + FIELD field_21405 calculatedHash Z + METHOD method_23597 getData ()Lnet/minecraft/class_1921$class_4688; + CLASS class_4688 MultiPhaseData + CLASS class_4689 MultiPhaseDataBuilder + FIELD field_21423 texture Lnet/minecraft/class_4668$class_4683; + FIELD field_21424 transparency Lnet/minecraft/class_4668$class_4685; + FIELD field_21425 diffuseLighting Lnet/minecraft/class_4668$class_4673; + FIELD field_21426 shadeModel Lnet/minecraft/class_4668$class_4681; + FIELD field_21427 alpha Lnet/minecraft/class_4668$class_4669; + FIELD field_21428 depthTest Lnet/minecraft/class_4668$class_4672; + FIELD field_21429 cull Lnet/minecraft/class_4668$class_4671; + FIELD field_21430 lightmap Lnet/minecraft/class_4668$class_4676; + FIELD field_21431 overlay Lnet/minecraft/class_4668$class_4679; + FIELD field_21432 fog Lnet/minecraft/class_4668$class_4674; + FIELD field_21433 layering Lnet/minecraft/class_4668$class_4675; + FIELD field_21434 target Lnet/minecraft/class_4668$class_4678; + FIELD field_21435 texturing Lnet/minecraft/class_4668$class_4684; + FIELD field_21436 writeMaskState Lnet/minecraft/class_4668$class_4686; + FIELD field_21437 lineWidth Lnet/minecraft/class_4668$class_4677; + METHOD method_23602 alpha (Lnet/minecraft/class_4668$class_4669;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23603 cull (Lnet/minecraft/class_4668$class_4671;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23604 depthTest (Lnet/minecraft/class_4668$class_4672;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23605 diffuseLighting (Lnet/minecraft/class_4668$class_4673;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23606 fog (Lnet/minecraft/class_4668$class_4674;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23607 layering (Lnet/minecraft/class_4668$class_4675;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23608 lightmap (Lnet/minecraft/class_4668$class_4676;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23609 lineWidth (Lnet/minecraft/class_4668$class_4677;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23610 target (Lnet/minecraft/class_4668$class_4678;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23611 overlay (Lnet/minecraft/class_4668$class_4679;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23612 shadeModel (Lnet/minecraft/class_4668$class_4681;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23613 texture (Lnet/minecraft/class_4668$class_4683;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23614 texturing (Lnet/minecraft/class_4668$class_4684;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23615 transparency (Lnet/minecraft/class_4668$class_4685;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23616 writeMaskState (Lnet/minecraft/class_4668$class_4686;)Lnet/minecraft/class_1921$class_4688$class_4689; + METHOD method_23617 build (Z)Lnet/minecraft/class_1921$class_4688; + ARG 1 textured + FIELD field_21406 texture Lnet/minecraft/class_4668$class_4683; + FIELD field_21407 transparency Lnet/minecraft/class_4668$class_4685; + FIELD field_21408 diffuseLighting Lnet/minecraft/class_4668$class_4673; + FIELD field_21409 shadeModel Lnet/minecraft/class_4668$class_4681; + FIELD field_21410 alpha Lnet/minecraft/class_4668$class_4669; + FIELD field_21411 depthTest Lnet/minecraft/class_4668$class_4672; + FIELD field_21412 cull Lnet/minecraft/class_4668$class_4671; + FIELD field_21413 lightmap Lnet/minecraft/class_4668$class_4676; + FIELD field_21414 overlay Lnet/minecraft/class_4668$class_4679; + FIELD field_21415 fog Lnet/minecraft/class_4668$class_4674; + FIELD field_21416 layering Lnet/minecraft/class_4668$class_4675; + FIELD field_21417 target Lnet/minecraft/class_4668$class_4678; + FIELD field_21418 texturing Lnet/minecraft/class_4668$class_4684; + FIELD field_21419 writeMaskState Lnet/minecraft/class_4668$class_4686; + FIELD field_21420 lineWidth Lnet/minecraft/class_4668$class_4677; + FIELD field_21421 textured Z + FIELD field_21422 components Lcom/google/common/collect/ImmutableList; + METHOD (Lnet/minecraft/class_4668$class_4683;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4673;Lnet/minecraft/class_4668$class_4681;Lnet/minecraft/class_4668$class_4669;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4674;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Z)V + ARG 16 textured + METHOD method_23598 builder ()Lnet/minecraft/class_1921$class_4688$class_4689; FIELD field_20806 expectedBufferSize I FIELD field_20964 LEASH Lnet/minecraft/class_1921; FIELD field_20965 WATER_MASK Lnet/minecraft/class_1921; @@ -13,23 +72,39 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_9178 SOLID Lnet/minecraft/class_1921; FIELD field_9179 TRANSLUCENT Lnet/minecraft/class_1921; METHOD (Ljava/lang/String;Lnet/minecraft/class_293;IIZZLjava/lang/Runnable;Ljava/lang/Runnable;)V + ARG 1 name ARG 2 vertexFormat ARG 3 drawMode ARG 4 expectedBufferSize - ARG 7 endAction + ARG 7 startAction + ARG 8 endAction METHOD method_22720 getBlockLayers ()Ljava/util/List; METHOD method_22722 getExpectedBufferSize ()I - METHOD method_23018 getPowerSwirl (Lnet/minecraft/class_2960;FF)Lnet/minecraft/class_1921; + METHOD method_23012 draw (Lnet/minecraft/class_287;)V + ARG 1 bufferBuilder + METHOD method_23018 getEnergySwirl (Lnet/minecraft/class_2960;FF)Lnet/minecraft/class_1921; + ARG 0 texture + ARG 1 x + ARG 2 y METHOD method_23026 getEyes (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture METHOD method_23028 getText (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture METHOD method_23030 getTextSeeThrough (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture METHOD method_23031 getVertexFormat ()Lnet/minecraft/class_293; METHOD method_23033 getDrawMode ()I METHOD method_23287 getOutline (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; - METHOD method_23570 getCrumbling (I)Lnet/minecraft/class_1921; + ARG 0 texture + METHOD method_23289 getTexture ()Ljava/util/Optional; + METHOD method_23570 getBlockBreaking (I)Lnet/minecraft/class_1921; + ARG 0 stage METHOD method_23572 getEntitySolid (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; METHOD method_23573 getEntityAlpha (Lnet/minecraft/class_2960;F)Lnet/minecraft/class_1921; + ARG 0 texture + ARG 1 alpha METHOD method_23574 getEndPortal (I)Lnet/minecraft/class_1921; + ARG 0 layer METHOD method_23576 getEntityCutout (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; METHOD method_23577 getSolid ()Lnet/minecraft/class_1921; METHOD method_23578 getEntityCutoutNoCull (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; @@ -37,15 +112,20 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_23580 getEntityTranslucent (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; METHOD method_23581 getCutout ()Lnet/minecraft/class_1921; METHOD method_23582 getEntityForceTranslucent (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture METHOD method_23583 getTranslucent ()Lnet/minecraft/class_1921; METHOD method_23584 getEntitySmoothCutout (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture METHOD method_23585 getTranslucentNoCrumbling ()Lnet/minecraft/class_1921; METHOD method_23586 getEntityDecal (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture METHOD method_23587 getLeash ()Lnet/minecraft/class_1921; METHOD method_23588 getEntityNoOutline (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture METHOD method_23589 getWaterMask ()Lnet/minecraft/class_1921; METHOD method_23590 getGlint ()Lnet/minecraft/class_1921; METHOD method_23591 getEntityGlint ()Lnet/minecraft/class_1921; METHOD method_23592 getBeaconBeam ()Lnet/minecraft/class_1921; METHOD method_23593 getLightning ()Lnet/minecraft/class_1921; METHOD method_23594 getLines ()Lnet/minecraft/class_1921; + METHOD method_23689 getEntityTranslucentCull (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; diff --git a/mappings/net/minecraft/client/render/RenderLayers.mapping b/mappings/net/minecraft/client/render/RenderLayers.mapping new file mode 100644 index 0000000000..e1ff32f930 --- /dev/null +++ b/mappings/net/minecraft/client/render/RenderLayers.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_4696 net/minecraft/client/render/RenderLayers + FIELD field_21469 BLOCKS Ljava/util/Map; + FIELD field_21470 ITEMS Ljava/util/Map; + FIELD field_21471 FLUIDS Ljava/util/Map; + FIELD field_21472 fancyGraphics Z + METHOD method_23678 getItemLayer (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1921; + ARG 0 stack + METHOD method_23679 getBlockLayer (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1921; + ARG 0 state + METHOD method_23680 getFluidLayer (Lnet/minecraft/class_3610;)Lnet/minecraft/class_1921; + ARG 0 state + METHOD method_23682 setFancyGraphics (Z)V + ARG 0 fancyGraphics + METHOD method_23683 getEntityBlockLayer (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1921; + ARG 0 state diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping new file mode 100644 index 0000000000..f8ce1238fe --- /dev/null +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -0,0 +1,114 @@ +CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase + CLASS class_4669 Alpha + FIELD field_21389 alpha F + METHOD (F)V + ARG 1 alpha + CLASS class_4670 Toggleable + FIELD field_21390 enabled Z + CLASS class_4671 Cull + METHOD (Z)V + ARG 1 culling + CLASS class_4672 DepthTest + FIELD field_21391 func I + METHOD (I)V + ARG 1 func + CLASS class_4673 DiffuseLighting + METHOD (Z)V + ARG 1 guiLighting + CLASS class_4674 Fog + CLASS class_4675 Layering + CLASS class_4676 Lightmap + METHOD (Z)V + ARG 1 lightmap + CLASS class_4677 LineWidth + FIELD field_21392 width F + METHOD (F)V + ARG 1 width + CLASS class_4678 Target + CLASS class_4679 Overlay + METHOD (Z)V + ARG 1 overlayColor + CLASS class_4680 PortalTexturing + FIELD field_21393 layer I + METHOD (I)V + ARG 1 layer + CLASS class_4681 ShadeModel + FIELD field_21394 smooth Z + METHOD (Z)V + ARG 1 smooth + CLASS class_4682 OffsetTexturing + FIELD field_21395 x F + FIELD field_21396 y F + METHOD (FF)V + ARG 1 x + ARG 2 y + CLASS class_4683 Texture + FIELD field_21397 id Ljava/util/Optional; + FIELD field_21398 bilinear Z + FIELD field_21399 mipmap Z + METHOD (Lnet/minecraft/class_2960;ZZ)V + ARG 1 id + ARG 2 bilinear + ARG 3 mipmap + METHOD method_23564 getId ()Ljava/util/Optional; + CLASS class_4684 Texturing + CLASS class_4685 Transparency + CLASS class_4686 WriteMaskState + FIELD field_21400 color Z + FIELD field_21401 depth Z + METHOD (ZZ)V + ARG 1 color + ARG 2 depth + FIELD field_21344 ENABLE_CULLING Lnet/minecraft/class_4668$class_4671; + FIELD field_21345 DISABLE_CULLING Lnet/minecraft/class_4668$class_4671; + FIELD field_21346 ALWAYS_DEPTH_TEST Lnet/minecraft/class_4668$class_4672; + FIELD field_21347 EQUAL_DEPTH_TEST Lnet/minecraft/class_4668$class_4672; + FIELD field_21348 LEQUAL_DEPTH_TEST Lnet/minecraft/class_4668$class_4672; + FIELD field_21349 ALL_MASK Lnet/minecraft/class_4668$class_4686; + FIELD field_21350 COLOR_MASK Lnet/minecraft/class_4668$class_4686; + FIELD field_21351 DEPTH_MASK Lnet/minecraft/class_4668$class_4686; + FIELD field_21352 NO_LAYERING Lnet/minecraft/class_4668$class_4675; + FIELD field_21353 POLYGON_OFFSET_LAYERING Lnet/minecraft/class_4668$class_4675; + FIELD field_21354 PROJECTION_LAYERING Lnet/minecraft/class_4668$class_4675; + FIELD field_21355 NO_FOG Lnet/minecraft/class_4668$class_4674; + FIELD field_21356 FOG Lnet/minecraft/class_4668$class_4674; + FIELD field_21357 BLACK_FOG Lnet/minecraft/class_4668$class_4674; + FIELD field_21358 MAIN_TARGET Lnet/minecraft/class_4668$class_4678; + FIELD field_21359 OUTLINE_TARGET Lnet/minecraft/class_4668$class_4678; + FIELD field_21360 FULL_LINEWIDTH Lnet/minecraft/class_4668$class_4677; + FIELD field_21361 beginAction Ljava/lang/Runnable; + FIELD field_21362 endAction Ljava/lang/Runnable; + FIELD field_21363 name Ljava/lang/String; + FIELD field_21364 NO_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; + FIELD field_21365 FORCED_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; + FIELD field_21366 ADDITIVE_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; + FIELD field_21367 LIGHTNING_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; + FIELD field_21368 GLINT_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; + FIELD field_21369 CRUMBLING_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; + FIELD field_21370 TRANSLUCENT_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; + FIELD field_21371 ZERO_ALPHA Lnet/minecraft/class_4668$class_4669; + FIELD field_21372 ONE_TENTH_ALPHA Lnet/minecraft/class_4668$class_4669; + FIELD field_21373 HALF_ALPHA Lnet/minecraft/class_4668$class_4669; + FIELD field_21374 SHADE_MODEL Lnet/minecraft/class_4668$class_4681; + FIELD field_21375 SMOOTH_SHADE_MODEL Lnet/minecraft/class_4668$class_4681; + FIELD field_21376 MIPMAP_BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_4668$class_4683; + FIELD field_21377 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_4668$class_4683; + FIELD field_21378 NO_TEXTURE Lnet/minecraft/class_4668$class_4683; + FIELD field_21379 DEFAULT_TEXTURING Lnet/minecraft/class_4668$class_4684; + FIELD field_21380 OUTLINE_TEXTURING Lnet/minecraft/class_4668$class_4684; + FIELD field_21381 GLINT_TEXTURING Lnet/minecraft/class_4668$class_4684; + FIELD field_21382 ENTITY_GLINT_TEXTURING Lnet/minecraft/class_4668$class_4684; + FIELD field_21383 ENABLE_LIGHTMAP Lnet/minecraft/class_4668$class_4676; + FIELD field_21384 DISABLE_LIGHTMAP Lnet/minecraft/class_4668$class_4676; + FIELD field_21385 ENABLE_OVERLAY_COLOR Lnet/minecraft/class_4668$class_4679; + FIELD field_21386 DISABLE_OVERLAY_COLOR Lnet/minecraft/class_4668$class_4679; + FIELD field_21387 ENABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673; + FIELD field_21388 DISABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673; + METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V + ARG 1 name + ARG 2 beginAction + ARG 3 endAction + METHOD method_23516 startDrawing ()V + METHOD method_23517 setupGlintTexturing (F)V + ARG 0 scale + METHOD method_23518 endDrawing ()V diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping index b7816d8557..e1fef531e7 100644 --- a/mappings/net/minecraft/client/render/VertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping @@ -33,10 +33,13 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer ARG 3 y ARG 4 z METHOD method_22919 quad (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_777;FFFII)V - ARG 1 matrix + ARG 1 modelMatrix + ARG 2 normalMatrix METHOD method_22920 quad (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_777;[FFFF[IIZ)V + ARG 1 modelMatrix + ARG 2 normalMatrix METHOD method_22921 light (II)Lnet/minecraft/class_4588; ARG 1 u ARG 2 v METHOD method_22922 defaultOverlay (I)Lnet/minecraft/class_4588; - ARG 1 u + ARG 1 uv diff --git a/mappings/net/minecraft/client/render/VertexFormat.mapping b/mappings/net/minecraft/client/render/VertexFormat.mapping index 5e40fc2d96..39d198a255 100644 --- a/mappings/net/minecraft/client/render/VertexFormat.mapping +++ b/mappings/net/minecraft/client/render/VertexFormat.mapping @@ -7,3 +7,6 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat METHOD method_1357 getElements ()Lcom/google/common/collect/ImmutableList; METHOD method_1359 getVertexSizeInteger ()I METHOD method_1362 getVertexSize ()I + METHOD method_22649 startDrawing (J)V + ARG 1 pointer + METHOD method_22651 endDrawing ()V diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping index ce33fd2a28..a8f3f48839 100644 --- a/mappings/net/minecraft/client/render/VertexFormatElement.mapping +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement CLASS class_297 Format FIELD field_1618 size I - FIELD field_1619 UINT Lnet/minecraft/class_296$class_297; - FIELD field_1622 USHORT Lnet/minecraft/class_296$class_297; - FIELD field_1624 UBYTE Lnet/minecraft/class_296$class_297; FIELD field_1626 name Ljava/lang/String; FIELD field_1627 glId I METHOD (Ljava/lang/String;IILjava/lang/String;I)V @@ -14,16 +11,33 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement METHOD method_1390 getGlId ()I METHOD method_1391 getSize ()I CLASS class_298 Type + CLASS class_4575 Starter + METHOD setupBufferState (IIIJI)V + ARG 1 count + ARG 2 glId + ARG 3 stride + ARG 4 pointer + ARG 6 elementIndex FIELD field_1630 name Ljava/lang/String; - FIELD field_1632 COLOR Lnet/minecraft/class_296$class_298; + FIELD field_20783 stater Lnet/minecraft/class_296$class_298$class_4575; + FIELD field_20784 finisher Ljava/util/function/IntConsumer; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Ljava/util/function/IntConsumer;)V ARG 3 name METHOD method_1392 getName ()Ljava/lang/String; + METHOD method_22654 endDrawing (I)V + ARG 1 elementIndex + METHOD method_22655 startDrawing (IIIJI)V + ARG 1 count + ARG 2 glId + ARG 3 stride + ARG 4 pointer + ARG 6 elementIndex FIELD field_1612 count I FIELD field_1613 index I FIELD field_1614 type Lnet/minecraft/class_296$class_298; FIELD field_1615 format Lnet/minecraft/class_296$class_297; FIELD field_1616 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_21329 size I METHOD (ILnet/minecraft/class_296$class_297;Lnet/minecraft/class_296$class_298;I)V ARG 1 index ARG 2 format @@ -39,3 +53,7 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement METHOD method_1386 getFormat ()Lnet/minecraft/class_296$class_297; METHOD method_1387 getSize ()I METHOD method_1388 isPosition ()Z + METHOD method_22652 startDrawing (JI)V + ARG 1 pointer + ARG 3 stride + METHOD method_22653 endDrawing ()V diff --git a/mappings/net/minecraft/client/render/VertexFormats.mapping b/mappings/net/minecraft/client/render/VertexFormats.mapping index bbaff60afc..dedb04205c 100644 --- a/mappings/net/minecraft/client/render/VertexFormats.mapping +++ b/mappings/net/minecraft/client/render/VertexFormats.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_290 net/minecraft/client/render/VertexFormats FIELD field_1590 POSITION_COLOR_UV_NORMAL Lnet/minecraft/class_293; FIELD field_1591 UV_ELEMENT Lnet/minecraft/class_296; FIELD field_1592 POSITION Lnet/minecraft/class_293; + FIELD field_20887 POSITION_COLOR_UV Lnet/minecraft/class_293; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 7a3c562b0c..f7e4e65634 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -3,10 +3,12 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4124 renderer Lnet/minecraft/class_846$class_851; METHOD (Lnet/minecraft/class_761;Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;I)V ARG 1 renderer + FIELD field_20950 blockBreakingProgressions Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_20951 layeredBufferBuilderStorage Lnet/minecraft/class_4599; FIELD field_4055 blockEntities Ljava/util/Set; FIELD field_4056 forcedFrustum Lnet/minecraft/class_4604; FIELD field_4057 textureManager Lnet/minecraft/class_1060; - FIELD field_4058 partiallyBrokenBlocks Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_4058 blockBreakingInfos Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_4059 entityOutlineShader Lnet/minecraft/class_279; FIELD field_4060 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_4061 END_SKY_TEX Lnet/minecraft/class_2960; @@ -80,6 +82,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 9 matrix METHOD method_22979 checkEmpty (Lnet/minecraft/class_4587;)V ARG 1 matrix + METHOD method_22987 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V ARG 8 color METHOD method_3241 getAdjacentChunkRenderer (Lnet/minecraft/class_2338;Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_846$class_851; @@ -194,7 +197,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 9 velocityX ARG 11 velocityY ARG 13 velocityZ - METHOD method_8569 setBlockBreakingProgress (ILnet/minecraft/class_2338;I)V + METHOD method_8569 setBlockBreakingInfo (ILnet/minecraft/class_2338;I)V + ARG 1 entityId + ARG 2 pos + ARG 3 stage METHOD method_8570 updateBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 2 pos METHOD method_8571 scheduleBlockRender (III)V diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index 15f0e92f4a..1b795877f4 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -9,5 +9,5 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag METHOD method_3350 getModelRenderer ()Lnet/minecraft/class_778; METHOD method_3351 getModels ()Lnet/minecraft/class_773; METHOD method_3352 tesselateFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z - METHOD method_3353 renderDynamic (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + METHOD method_3353 renderOnEntity (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V METHOD method_3355 tesselateBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;)Z diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index f471d1fe25..ee7f4c5402 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlockEntityRenderer FIELD field_20809 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_20810 area Lnet/minecraft/class_630; + FIELD field_20811 verticalBar Lnet/minecraft/class_630; + FIELD field_20812 topBar Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index 7b0c94012e..875f7d984e 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher + FIELD field_20988 bufferBuilder Lnet/minecraft/class_287; FIELD field_4342 fontRenderer Lnet/minecraft/class_327; FIELD field_4344 cameraEntity Lnet/minecraft/class_4184; FIELD field_4345 renderers Ljava/util/Map; @@ -6,6 +7,8 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti FIELD field_4347 textureManager Lnet/minecraft/class_1060; FIELD field_4348 world Lnet/minecraft/class_1937; FIELD field_4350 hitResult Lnet/minecraft/class_239; + METHOD method_23077 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)Z + METHOD method_23078 register (Lnet/minecraft/class_2591;Lnet/minecraft/class_827;)V METHOD method_23079 render (Lnet/minecraft/class_827;Lnet/minecraft/class_2586;DDDFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 0 renderer ARG 1 blockEntity @@ -18,7 +21,7 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti METHOD method_3550 get (Lnet/minecraft/class_2586;)Lnet/minecraft/class_827; METHOD method_3551 setWorld (Lnet/minecraft/class_1937;)V METHOD method_3552 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;)V - METHOD method_3554 renderEntity (Lnet/minecraft/class_2586;Ljava/lang/Runnable;)V + METHOD method_3554 runReported (Lnet/minecraft/class_2586;Ljava/lang/Runnable;)V METHOD method_3555 render (Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V ARG 1 blockEntity ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping index 879c1c67ee..e47ccc983d 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_827 net/minecraft/client/render/block/entity/BlockEntityRenderer METHOD method_23082 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; ARG 1 id - METHOD method_3569 render (Lnet/minecraft/class_2586;DDDFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + METHOD method_3569 (Lnet/minecraft/class_2586;DDDFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 blockEntity ARG 2 x ARG 4 y diff --git a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage.mapping index 9817c6c0c5..6c3b47d833 100644 --- a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage.mapping +++ b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage FIELD field_3951 layerBuilders Ljava/util/Map; METHOD method_22705 clear ()V + METHOD method_23501 reset ()V METHOD method_3154 get (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; ARG 1 layer diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping index f6f3f972e2..5702ccdf46 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping @@ -13,6 +13,12 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBatcher METHOD method_3645 isEmpty ()Z METHOD method_3650 isVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z CLASS class_851 ChunkRenderer + CLASS class_4577 + FIELD field_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean; + METHOD method_22782 cancel ()V + METHOD method_22783 scheduleBatching (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture; + CLASS class_4579 + FIELD field_20841 data Lnet/minecraft/class_846$class_849; FIELD field_4457 blockEntities Ljava/util/Set; FIELD field_4458 boundingBox Lnet/minecraft/class_238; FIELD field_4459 data Ljava/util/concurrent/atomic/AtomicReference; @@ -44,6 +50,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBatcher METHOD method_3676 getNeighborPosition (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338; ARG 1 direction METHOD method_3677 getData ()Lnet/minecraft/class_846$class_849; + CLASS class_4690 Result FIELD field_18766 cameraPosition Lnet/minecraft/class_243; FIELD field_4435 pendingChunks Ljava/util/PriorityQueue; FIELD field_4443 pendingUploads Ljava/util/Queue; diff --git a/mappings/net/minecraft/client/renderer/debug/VillagerNamer.mapping b/mappings/net/minecraft/client/render/debug/VillagerNamer.mapping similarity index 82% rename from mappings/net/minecraft/client/renderer/debug/VillagerNamer.mapping rename to mappings/net/minecraft/client/render/debug/VillagerNamer.mapping index d379eb3eca..a6c09f8cff 100644 --- a/mappings/net/minecraft/client/renderer/debug/VillagerNamer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillagerNamer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4617 net/minecraft/client/renderer/debug/VillagerNamer +CLASS net/minecraft/class_4617 net/minecraft/client/render/debug/VillagerNamer FIELD field_21050 PREFIX [Ljava/lang/String; FIELD field_21051 SUFFIX [Ljava/lang/String; METHOD method_23266 getRandom (Ljava/util/Random;[Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index fa62face60..3c7df99505 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_3941 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_4184;Lnet/minecraft/class_1297;)V ARG 1 world METHOD method_3944 setWorld (Lnet/minecraft/class_1937;)V + METHOD method_3945 setCameraYaw (F)V METHOD method_3946 render (Lnet/minecraft/class_1297;F)V ARG 2 tickDelta METHOD method_3948 setRenderShadows (Z)V diff --git a/mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping new file mode 100644 index 0000000000..46ccc172f3 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_4607 net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer + METHOD method_23201 getEnergySwirlTexture ()Lnet/minecraft/class_2960; + METHOD method_23202 getEnergySwirlX (F)F + ARG 1 partialAge + METHOD method_23203 getEnergySwirlModel ()Lnet/minecraft/class_583; diff --git a/mappings/net/minecraft/client/render/entity/feature/EyesFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/EyesFeatureRenderer.mapping new file mode 100644 index 0000000000..7359edb7ae --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/feature/EyesFeatureRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4606 net/minecraft/client/render/entity/feature/EyesFeatureRenderer + METHOD method_23193 getEyesTexture ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index ab3ac64223..86e689c4fd 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/Featur METHOD method_23196 render (Lnet/minecraft/class_583;Lnet/minecraft/class_583;Lnet/minecraft/class_2960;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFFFFFFFFF)V METHOD method_23199 renderModel (Lnet/minecraft/class_583;Lnet/minecraft/class_2960;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFF)V METHOD method_4199 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;FFFFFFF)V + ARG 7 tickDelta diff --git a/mappings/net/minecraft/client/render/entity/feature/SkinOverlayFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/SkinOverlayFeatureRenderer.mapping deleted file mode 100644 index d6b1d7367e..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/SkinOverlayFeatureRenderer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4607 net/minecraft/client/render/entity/feature/SkinOverlayFeatureRenderer - METHOD method_23201 getTexture ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping similarity index 89% rename from mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping rename to mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping index 2c27dbd719..cba2141eec 100644 --- a/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_756 net/minecraft/client/render/item/ItemDynamicRenderer +CLASS net/minecraft/class_756 net/minecraft/client/render/item/BuiltinModelItemRenderer FIELD field_3976 renderChestNormal Lnet/minecraft/class_2595; FIELD field_3977 renderChestEnder Lnet/minecraft/class_2611; FIELD field_3978 renderChestTrapped Lnet/minecraft/class_2595; diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 6785c376b1..42ac516a57 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader CLASS class_1089 ModelLoaderException FIELD field_17907 spriteAtlasData Lnet/minecraft/class_1059$class_4007; + FIELD field_21020 BLOCK_BREAKING_STAGES Ljava/util/List; FIELD field_5370 FIRE_1 Lnet/minecraft/class_2960; FIELD field_5371 MISSING_DEFINITION Ljava/lang/String; FIELD field_5372 KEY_VALUE_SPLITTER Lcom/google/common/base/Splitter; diff --git a/mappings/net/minecraft/client/texture/AbstractTexture.mapping b/mappings/net/minecraft/client/texture/AbstractTexture.mapping index 4e853533f5..ca6aca3b6b 100644 --- a/mappings/net/minecraft/client/texture/AbstractTexture.mapping +++ b/mappings/net/minecraft/client/texture/AbstractTexture.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture FIELD field_5204 glId I FIELD field_5205 bilinear Z METHOD method_18169 registerTexture (Lnet/minecraft/class_1060;Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)V + METHOD method_23207 bindTexture ()V METHOD method_4527 setFilter (ZZ)V ARG 1 bilinear ARG 2 mipmap diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index bb8b2adb8b..70ceec2a26 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -99,7 +99,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 6 height ARG 7 flipX ARG 8 flipY - METHOD method_4305 setPixelRGBA (III)V + METHOD method_4305 setPixelRgba (III)V ARG 1 x ARG 2 y ARG 3 color @@ -124,7 +124,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4313 setTextureClamp (Z)V ARG 0 clamp METHOD method_4314 writeFile (Ljava/nio/file/Path;)V - METHOD method_4315 getPixelRGBA (II)I + METHOD method_4315 getPixelRgba (II)I ARG 1 x ARG 2 y METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/stb/STBTTFontinfo;IIIFFFFII)V diff --git a/mappings/net/minecraft/client/util/InputUtil.mapping b/mappings/net/minecraft/client/util/InputUtil.mapping index 0600eb86dd..724fc02145 100644 --- a/mappings/net/minecraft/client/util/InputUtil.mapping +++ b/mappings/net/minecraft/client/util/InputUtil.mapping @@ -13,9 +13,7 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil METHOD method_1442 getCategory ()Lnet/minecraft/class_3675$class_307; METHOD method_1444 getKeyCode ()I CLASS class_307 Type - FIELD field_1668 KEYSYM Lnet/minecraft/class_3675$class_307; FIELD field_1669 mouseButtons [Ljava/lang/String; - FIELD field_1672 MOUSE Lnet/minecraft/class_3675$class_307; FIELD field_1673 name Ljava/lang/String; FIELD field_1674 map Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_1446 mapKey (Lnet/minecraft/class_3675$class_307;Ljava/lang/String;I)V diff --git a/mappings/net/minecraft/client/util/ScreenshotUtils.mapping b/mappings/net/minecraft/client/util/ScreenshotUtils.mapping index d728aa47f4..ffaf204bbe 100644 --- a/mappings/net/minecraft/client/util/ScreenshotUtils.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotUtils.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotUtils ARG 4 messageReceiver METHOD method_1660 getScreenshotFilename (Ljava/io/File;)Ljava/io/File; ARG 0 directory - METHOD method_1662 saveScreenshot (Ljava/io/File;Ljava/lang/String;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V + METHOD method_1662 saveScreenshotInner (Ljava/io/File;Ljava/lang/String;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory ARG 1 fileName ARG 2 framebufferWidth @@ -20,3 +20,10 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotUtils ARG 0 width ARG 1 height ARG 2 framebuffer + METHOD method_22690 saveScreenshot (Ljava/io/File;Ljava/lang/String;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V + ARG 0 gameDirectory + ARG 1 fileName + ARG 2 framebufferWidth + ARG 3 framebufferHeight + ARG 4 framebuffer + ARG 5 messageReceiver diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping index 784d804f79..1da004bd3d 100644 --- a/mappings/net/minecraft/client/util/SelectionManager.mapping +++ b/mappings/net/minecraft/client/util/SelectionManager.mapping @@ -2,9 +2,15 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager FIELD field_16452 selectionEnd I FIELD field_16453 selectionStart I FIELD field_16454 client Lnet/minecraft/class_310; - FIELD field_16456 stringSupplier Ljava/util/function/Supplier; + FIELD field_16455 maxLength I + FIELD field_16456 stringGetter Ljava/util/function/Supplier; FIELD field_16457 fontRenderer Lnet/minecraft/class_327; - FIELD field_16458 stringConsumer Ljava/util/function/Consumer; + FIELD field_16458 stringSetter Ljava/util/function/Consumer; + METHOD (Lnet/minecraft/class_310;Ljava/util/function/Supplier;Ljava/util/function/Consumer;I)V + ARG 1 client + ARG 2 getter + ARG 3 setter + ARG 4 maxLength METHOD method_16197 insert (Ljava/lang/String;)V METHOD method_16198 deleteSelectedText ()V METHOD method_16199 insert (C)Z diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index a9a77de1eb..240dd9f0e7 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session CLASS class_321 AccountType + FIELD field_1986 name Ljava/lang/String; + FIELD field_1989 BY_NAME Ljava/util/Map; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name METHOD method_1679 byName (Ljava/lang/String;)Lnet/minecraft/class_320$class_321; FIELD field_1982 username Ljava/lang/String; FIELD field_1983 accessToken Ljava/lang/String; @@ -9,6 +13,7 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session ARG 1 username ARG 2 uuid ARG 3 accessToken + ARG 4 accountType METHOD method_1673 getUuid ()Ljava/lang/String; METHOD method_1674 getAccessToken ()Ljava/lang/String; METHOD method_1675 getSessionId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/SmoothUtil.mapping b/mappings/net/minecraft/client/util/SmoothUtil.mapping index 28f2659d04..464f34aac2 100644 --- a/mappings/net/minecraft/client/util/SmoothUtil.mapping +++ b/mappings/net/minecraft/client/util/SmoothUtil.mapping @@ -1,3 +1,8 @@ CLASS net/minecraft/class_3540 net/minecraft/client/util/SmoothUtil + FIELD field_15758 movementLatency D + FIELD field_15759 smoothedSum D + FIELD field_15760 actualSum D METHOD method_15428 clear ()V METHOD method_15429 smooth (DD)D + ARG 1 original + ARG 3 smoother diff --git a/mappings/net/minecraft/util/math/Matrix3f.mapping b/mappings/net/minecraft/client/util/math/Matrix3f.mapping similarity index 70% rename from mappings/net/minecraft/util/math/Matrix3f.mapping rename to mappings/net/minecraft/client/util/math/Matrix3f.mapping index cdb07ba523..ad739eada9 100644 --- a/mappings/net/minecraft/util/math/Matrix3f.mapping +++ b/mappings/net/minecraft/client/util/math/Matrix3f.mapping @@ -1,4 +1,8 @@ -CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f +CLASS net/minecraft/class_4581 net/minecraft/client/util/math/Matrix3f + FIELD field_20860 THREE_PLUS_TWO_SQRT_TWO F + FIELD field_20861 COS_PI_EIGHTH F + FIELD field_20862 SIN_PI_EIGHTH F + FIELD field_20863 SQRT_ONE_HALF F FIELD field_20864 components [F METHOD (Lnet/minecraft/class_1158;)V ARG 1 quaternion @@ -8,10 +12,10 @@ CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f ARG 1 matrix METHOD (Lnet/minecraft/class_4581;Z)V ARG 1 matrix - ARG 2 loopCopy_BrokenDoesNothing + ARG 2 ignoredTransposeMarker METHOD ([FZ)V ARG 1 components - ARG 2 loopCopy + ARG 2 transpose METHOD method_22847 transpose ()V METHOD method_22850 get (II)F ARG 1 row @@ -29,3 +33,4 @@ CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f ARG 1 matrix METHOD method_22856 loadIdentity ()V METHOD method_23274 multiply (Lnet/minecraft/class_1158;)V + METHOD method_23296 copy ()Lnet/minecraft/class_4581; diff --git a/mappings/net/minecraft/client/util/math/Matrix4f.mapping b/mappings/net/minecraft/client/util/math/Matrix4f.mapping index c01c171615..01b0e97f63 100644 --- a/mappings/net/minecraft/client/util/math/Matrix4f.mapping +++ b/mappings/net/minecraft/client/util/math/Matrix4f.mapping @@ -35,6 +35,10 @@ CLASS net/minecraft/class_1159 net/minecraft/client/util/math/Matrix4f METHOD method_4927 writeToBuffer (Ljava/nio/FloatBuffer;Z)V ARG 1 buffer ARG 2 atBufferStart + METHOD method_4929 (DFFF)Lnet/minecraft/class_1159; + ARG 0 fov + ARG 2 frameWidthToHeightRatio + ARG 4 viewDistance METHOD method_4931 set (IIF)V ARG 1 row ARG 2 column diff --git a/mappings/net/minecraft/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping similarity index 59% rename from mappings/net/minecraft/util/math/MatrixStack.mapping rename to mappings/net/minecraft/client/util/math/MatrixStack.mapping index a8b58e6e74..b88955a83a 100644 --- a/mappings/net/minecraft/util/math/MatrixStack.mapping +++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping @@ -1,4 +1,7 @@ -CLASS net/minecraft/class_4587 net/minecraft/util/math/MatrixStack +CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack + CLASS class_4665 Entry + FIELD field_21327 modelMatrix Lnet/minecraft/class_1159; + FIELD field_21328 normalMatrix Lnet/minecraft/class_4581; FIELD field_20898 stack Ljava/util/Deque; METHOD method_22903 push ()V METHOD method_22904 translate (DDD)V @@ -14,3 +17,4 @@ CLASS net/minecraft/class_4587 net/minecraft/util/math/MatrixStack METHOD method_22909 pop ()V METHOD method_22910 peek ()Lnet/minecraft/class_1159; METHOD method_22911 isEmpty ()Z + METHOD method_23478 peekNormal ()Lnet/minecraft/class_4581; diff --git a/mappings/net/minecraft/client/util/math/Rotation3.mapping b/mappings/net/minecraft/client/util/math/Rotation3.mapping new file mode 100644 index 0000000000..d8cb2b14a9 --- /dev/null +++ b/mappings/net/minecraft/client/util/math/Rotation3.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_4590 net/minecraft/client/util/math/Rotation3 + FIELD field_20900 matrix Lnet/minecraft/class_1159; + FIELD field_20901 initialized Z + FIELD field_20906 IDENTITY Lnet/minecraft/class_4590; + METHOD method_22931 identity ()Lnet/minecraft/class_4590; + METHOD method_22933 multiply (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; + ARG 1 other + METHOD method_22934 setup (Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;)Lnet/minecraft/class_1159; + METHOD method_22935 invert ()Lnet/minecraft/class_4590; + METHOD method_22936 getMatrix ()Lnet/minecraft/class_1159; + METHOD method_22938 init ()V diff --git a/mappings/net/minecraft/client/util/math/Rotation3Helper.mapping b/mappings/net/minecraft/client/util/math/Rotation3Helper.mapping new file mode 100644 index 0000000000..7e9e8f3ccd --- /dev/null +++ b/mappings/net/minecraft/client/util/math/Rotation3Helper.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_4609 net/minecraft/client/util/math/Rotation3Helper + FIELD field_21021 DIRECTION_ROTATIONS Ljava/util/EnumMap; + FIELD field_21022 INVERSED_DIRECTION_ROTATIONS Ljava/util/EnumMap; + FIELD field_21023 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_23220 setupUvLock (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; + METHOD method_23221 uvLock (Lnet/minecraft/class_4590;Lnet/minecraft/class_2350;Ljava/util/function/Supplier;)Lnet/minecraft/class_4590; diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/client/util/math/Vector3f.mapping index 49292faaa0..82a81d6df7 100644 --- a/mappings/net/minecraft/client/util/math/Vector3f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3f.mapping @@ -5,9 +5,17 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f FIELD field_20705 POSITIVE_Y Lnet/minecraft/class_1160; FIELD field_20706 NEGATIVE_Z Lnet/minecraft/class_1160; FIELD field_20707 POSITIVE_Z Lnet/minecraft/class_1160; + FIELD field_21483 x F + FIELD field_21484 y F + FIELD field_21485 z F METHOD (FFF)V ARG 1 x ARG 2 y + ARG 3 z + METHOD (Lnet/minecraft/class_1160;)V + ARG 1 other + METHOD (Lnet/minecraft/class_243;)V + ARG 1 other METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_16004 clampFloat (FFF)F @@ -17,17 +25,25 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f METHOD method_23214 getRotationQuaternion (F)Lnet/minecraft/class_1158; METHOD method_23215 multiply (Lnet/minecraft/class_4581;)V METHOD method_4942 scale (F)V + ARG 1 scale METHOD method_4943 getX ()F METHOD method_4944 subtract (Lnet/minecraft/class_1160;)V + ARG 1 other METHOD method_4945 getY ()F METHOD method_4946 clamp (FF)V ARG 1 min + ARG 2 max METHOD method_4947 getZ ()F METHOD method_4948 add (FFF)V ARG 1 x ARG 2 y + ARG 3 z METHOD method_4949 set (FFF)V + ARG 1 x + ARG 2 y + ARG 3 z METHOD method_4950 dot (Lnet/minecraft/class_1160;)F + ARG 1 other METHOD method_4951 cross (Lnet/minecraft/class_1160;)V ARG 1 vector METHOD method_4952 reciprocal ()Z diff --git a/mappings/net/minecraft/client/util/math/Vector4f.mapping b/mappings/net/minecraft/client/util/math/Vector4f.mapping index 28a849b391..e1dbf15ae6 100644 --- a/mappings/net/minecraft/client/util/math/Vector4f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector4f.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f + FIELD field_21486 x F + FIELD field_21487 y F + FIELD field_21488 z F + FIELD field_21489 w F METHOD (FFFF)V ARG 1 x ARG 2 y @@ -7,7 +11,20 @@ CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_22674 multiply (Lnet/minecraft/class_1159;)V + ARG 1 matrix + METHOD method_23217 dotProduct (Lnet/minecraft/class_1162;)F + ARG 1 other + METHOD method_23218 normalize ()Z + METHOD method_23219 normalizeProjectiveCoordinates ()V + METHOD method_23692 calculateProductRow (ILnet/minecraft/class_1159;FFFF)F + ARG 0 row + ARG 1 matrix + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 w METHOD method_4953 getX ()F - METHOD method_4954 multiply (Lnet/minecraft/class_1160;)V + METHOD method_4954 multiplyXyz (Lnet/minecraft/class_1160;)V + ARG 1 other METHOD method_4956 getY ()F METHOD method_4957 getZ ()F diff --git a/mappings/net/minecraft/datafixers/StructureReferenceFixer.mapping b/mappings/net/minecraft/datafixers/StructureReferenceFixer.mapping new file mode 100644 index 0000000000..4e7cfc266d --- /dev/null +++ b/mappings/net/minecraft/datafixers/StructureReferenceFixer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4695 net/minecraft/datafixers/StructureReferenceFixer + METHOD method_23661 updateReferences (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index f4d9395239..fb3aea37b3 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -172,6 +172,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_20802 getFireTicks ()I METHOD method_20803 setFireTicks (I)V ARG 1 ticks + METHOD method_22861 getTeamColorValue ()I METHOD method_23317 getX ()D METHOD method_23318 getY ()D METHOD method_23321 getZ ()D diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 891163ebfb..8d50c1ef77 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction FIELD field_11030 idHorizontal I FIELD field_11031 idOpposite I FIELD field_11032 id I - FIELD field_11038 ID_TO_DIRECTION [Lnet/minecraft/class_2350; + FIELD field_11038 VALUES [Lnet/minecraft/class_2350; FIELD field_11040 ALL [Lnet/minecraft/class_2350; FIELD field_11041 HORIZONTAL [Lnet/minecraft/class_2350; FIELD field_11042 vector Lnet/minecraft/class_2382; @@ -90,3 +90,8 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction METHOD method_10170 rotateYClockwise ()Lnet/minecraft/class_2350; METHOD method_10171 getDirection ()Lnet/minecraft/class_2350$class_2352; METHOD method_16365 fromVector (III)Lnet/minecraft/class_2350; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD method_23224 getRotationQuaternion ()Lnet/minecraft/class_1158; + METHOD method_23225 transform (Lnet/minecraft/class_1159;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping index 986f6c4c3a..ea5826a5d7 100644 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ b/mappings/net/minecraft/util/math/Quaternion.mapping @@ -1,15 +1,15 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion FIELD field_5656 components [F METHOD (FFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 w + ARG 1 b + ARG 2 c + ARG 3 d + ARG 4 a METHOD (FFFZ)V ARG 1 x ARG 2 y ARG 3 z - ARG 4 w + ARG 4 degrees METHOD (Lnet/minecraft/class_1158;)V ARG 1 other METHOD (Lnet/minecraft/class_1160;FZ)V @@ -22,10 +22,13 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion ARG 0 value METHOD method_16003 cos (F)F ARG 0 value - METHOD method_4921 getX ()F - METHOD method_4922 getY ()F - METHOD method_4923 getZ ()F - METHOD method_4924 getW ()F - METHOD method_4925 copyFrom (Lnet/minecraft/class_1158;)V + METHOD method_22872 scale (F)V + ARG 1 scale + METHOD method_22873 normalize ()V + METHOD method_4921 getB ()F + METHOD method_4922 getC ()F + METHOD method_4923 getD ()F + METHOD method_4924 getA ()F + METHOD method_4925 hamiltonProduct (Lnet/minecraft/class_1158;)V ARG 1 other - METHOD method_4926 reverse ()V + METHOD method_4926 conjugate ()V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 04348feec9..5f79d63d18 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -191,7 +191,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 2 entity METHOD method_8516 setTime (J)V ARG 1 time - METHOD method_8517 setBlockBreakingProgress (ILnet/minecraft/class_2338;I)V + METHOD method_8517 setBlockBreakingInfo (ILnet/minecraft/class_2338;I)V ARG 1 entityId ARG 2 pos ARG 3 progress