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

Add and update filled map related mappings. (#1969) 

* Add and update filled map related mappings.

* Fix stuff.
This commit is contained in:
LambdAurora 2021-01-22 00:33:35 +01:00 committed by GitHub
parent 9b6fc33bc8
commit 1640c6fafd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 132 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mappings/net/minecraft/client/gui/MapRenderer.mapping
View File

@ -1,12 +0,0 @@
CLASS net/minecraft/class_330 net/minecraft/client/gui/MapRenderer
FIELD field_2043 textureManager Lnet/minecraft/class_1060;
FIELD field_2044 MAP_ICONS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_2045 mapTextures Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
METHOD method_1769 updateTexture (ILnet/minecraft/class_22;)V
METHOD method_1771 clearStateTextures ()V
METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_22;ZI)V
CLASS class_331 MapTexture
FIELD field_2046 mapState Lnet/minecraft/class_22;
FIELD field_2048 texture Lnet/minecraft/class_1043;
METHOD method_1776 updateTexture ()V
METHOD method_1777 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ZI)V

36
mappings/net/minecraft/client/render/MapRenderer.mapping Normal file
View File

@ -0,0 +1,36 @@
CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer
FIELD field_2043 textureManager Lnet/minecraft/class_1060;
FIELD field_2044 MAP_ICONS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_2045 mapTextures Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD field_21688 MAP_ICONS_RENDER_LAYER Lnet/minecraft/class_1921;
METHOD <init> (Lnet/minecraft/class_1060;)V
ARG 1 textureManager
METHOD method_1769 updateTexture (ILnet/minecraft/class_22;)V
ARG 1 id
ARG 2 state
METHOD method_1771 clearStateTextures ()V
METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_22;ZI)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 id
ARG 4 state
ARG 5 hidePlayerIcons
ARG 6 light
METHOD method_32599 getMapTextureFromId (I)Lnet/minecraft/class_22;
ARG 1 id
METHOD method_32601 getMapTexture (ILnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331;
ARG 1 id
ARG 2 state
CLASS class_331 MapTexture
FIELD field_2046 state Lnet/minecraft/class_22;
FIELD field_2048 texture Lnet/minecraft/class_1043;
FIELD field_21689 renderLayer Lnet/minecraft/class_1921;
METHOD <init> (Lnet/minecraft/class_330;ILnet/minecraft/class_22;)V
ARG 2 id
ARG 3 state
METHOD method_1776 updateTexture ()V
METHOD method_1777 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ZI)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 hidePlayerIcons
ARG 4 light

10
mappings/net/minecraft/item/FilledMapItem.mapping
View File

@ -7,6 +7,14 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
METHOD method_32348 setMapId (Lnet/minecraft/class_1799;I)V
ARG 0 stack
ARG 1 id
METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)I
ARG 0 world
ARG 1 x
ARG 2 z
ARG 3 scale
ARG 4 showIcons
ARG 5 unlimitedTracking
ARG 6 dimension
METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
ARG 1 world
ARG 2 state
@ -16,6 +24,8 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
ARG 1 world
ARG 2 amount
METHOD method_7997 getMapState (Ljava/lang/Integer;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22;
ARG 0 id
ARG 1 world
METHOD method_7998 updateColors (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_22;)V
ARG 1 world
ARG 2 entity

3
mappings/net/minecraft/item/map/MapBannerMarker.mapping
View File

@ -1,4 +1,7 @@
CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker
COMMENT Represents a banner marker in world.
COMMENT <p>
COMMENT Used to track banners in a map state.
FIELD field_67 name Lnet/minecraft/class_2561;
FIELD field_68 color Lnet/minecraft/class_1767;
FIELD field_69 pos Lnet/minecraft/class_2338;

2
mappings/net/minecraft/item/map/MapIcon.mapping
View File

@ -24,7 +24,7 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
FIELD field_81 id B
FIELD field_82 tintColor I
METHOD <init> (Ljava/lang/String;IZ)V
ARG 3 renderNotHeld
ARG 3 alwaysRender
METHOD <init> (Ljava/lang/String;IZI)V
ARG 3 alwaysRender
ARG 4 tintColor

79
mappings/net/minecraft/item/map/MapState.mapping
View File

@ -3,7 +3,13 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
FIELD field_113 unlimitedTracking Z
FIELD field_114 showIcons Z
FIELD field_115 zCenter I
COMMENT The scaled center coordinate of the map state on the Z axis.
COMMENT <p>
COMMENT Always {@code 0} for the client.
FIELD field_116 xCenter I
COMMENT The scaled center coordinate of the map state on the X axis.
COMMENT <p>
COMMENT Always {@code 0} for the client.
FIELD field_117 icons Ljava/util/Map;
FIELD field_118 dimension Lnet/minecraft/class_5321;
FIELD field_119 scale B
@ -11,6 +17,9 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
FIELD field_121 frames Ljava/util/Map;
FIELD field_122 colors [B
FIELD field_123 banners Ljava/util/Map;
COMMENT The banner markers to track in world.
COMMENT <p>
COMMENT Empty for the client.
FIELD field_17403 locked Z
METHOD <init> (IIBZZZLnet/minecraft/class_5321;)V
ARG 1 xCenter
@ -21,6 +30,8 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
ARG 6 locked
ARG 7 dimension
METHOD method_100 getPlayerMarkerPacket (ILnet/minecraft/class_1657;)Lnet/minecraft/class_2596;
ARG 1 id
ARG 2 player
METHOD method_101 getPlayerSyncData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_22$class_23;
ARG 1 player
METHOD method_102 update (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
@ -52,6 +63,52 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
ARG 1 pos
ARG 2 id
ARG 3 type
METHOD method_32361 copy ()Lnet/minecraft/class_22;
METHOD method_32362 of (BZLnet/minecraft/class_5321;)Lnet/minecraft/class_22;
COMMENT Creates a new map state instance for the client.
COMMENT <p>
COMMENT The client is not aware of the coordinates of the map state so its center coordinates will always be {@code (0, 0)}.
ARG 0 scale
ARG 1 showIcons
ARG 2 dimension
METHOD method_32363 of (DDBZZLnet/minecraft/class_5321;)Lnet/minecraft/class_22;
COMMENT Creates a new map state instance.
ARG 0 xCenter
COMMENT the absolute center X-coordinate
ARG 2 zCenter
COMMENT the absolute center Z-coordinate
ARG 4 scale
ARG 5 showIcons
ARG 6 unlimitedTracking
ARG 7 dimension
METHOD method_32364 zoomOut (I)Lnet/minecraft/class_22;
COMMENT Creates a new map state which is a zoomed out version of the current one.
COMMENT <p>
COMMENT The scale of the new map state is {@code currentScale + zoomOutScale} and clamped between {@code 0} and {@code 4}.
COMMENT <p>
COMMENT The colors are not copied, neither are the icons.
ARG 1 zoomOutScale
COMMENT the amount to add to the scale of the map
METHOD method_32365 putColor (IIB)Z
COMMENT Sets the color at the specified coordinates if the current color is different.
COMMENT
COMMENT @return {@code true} if the color has been updated, else {@code false}
ARG 1 x
ARG 2 z
ARG 3 color
METHOD method_32368 removeIcon (Ljava/lang/String;)V
ARG 1 id
METHOD method_32369 replaceIcons ([Lnet/minecraft/class_20;)V
ARG 1 icons
METHOD method_32370 setColor (IIB)V
ARG 1 x
ARG 2 z
ARG 3 color
METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_22;
ARG 0 tag
METHOD method_32372 hasMonumentIcon ()Z
METHOD method_32373 getIcons ()Ljava/lang/Iterable;
METHOD method_32374 markIconsDirty ()V
CLASS class_23 PlayerUpdateTracker
FIELD field_124 emptyPacketsRequested I
FIELD field_125 player Lnet/minecraft/class_1657;
@ -60,9 +117,27 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
FIELD field_128 startZ I
FIELD field_129 startX I
FIELD field_130 dirty Z
FIELD field_27891 iconsDirty Z
METHOD <init> (Lnet/minecraft/class_22;Lnet/minecraft/class_1657;)V
ARG 1 player
METHOD method_111 markDirty (II)V
ARG 1 x
ARG 2 z
ARG 1 startX
ARG 2 startZ
METHOD method_112 getPacket (I)Lnet/minecraft/class_2596;
ARG 1 mapId
METHOD method_32375 getMapUpdateData ()Lnet/minecraft/class_22$class_5637;
METHOD method_32379 markIconsDirty ()V
CLASS class_5637 UpdateData
FIELD field_27892 startX I
FIELD field_27893 startZ I
FIELD field_27894 width I
FIELD field_27895 height I
FIELD field_27896 colors [B
METHOD <init> (IIII[B)V
ARG 1 startX
ARG 2 startZ
ARG 3 width
ARG 4 height
ARG 5 colors
METHOD method_32380 setColorsTo (Lnet/minecraft/class_22;)V
ARG 1 mapState

4
mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
View File

@ -3,9 +3,13 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2
FIELD field_12303 id I
FIELD field_12304 icons [Lnet/minecraft/class_20;
FIELD field_17433 locked Z
FIELD field_28016 updateData Lnet/minecraft/class_22$class_5637;
METHOD <init> (IBZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V
ARG 1 id
ARG 2 scale
ARG 3 showIcons
ARG 4 icons
ARG 5 updateData
METHOD method_11642 apply (Lnet/minecraft/class_22;)V
ARG 1 mapState
METHOD method_11644 getId ()I

2
mappings/net/minecraft/world/PersistentState.mapping
View File

@ -2,7 +2,7 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState
FIELD field_17661 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_72 dirty Z
METHOD method_17919 save (Ljava/io/File;)V
METHOD method_75 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
METHOD method_75 toNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
ARG 1 tag
METHOD method_78 setDirty (Z)V
ARG 1 dirty