Skip to content

Commit

Permalink
Add miscellaneous mappings (#275)
Browse files Browse the repository at this point in the history
* Add some screen mappings

* Add some profiler mappings

* Add screen related mappings

* Add rendering related mappings

* Add some mappings to ClickableWidget

* Map type field

* Bunch of mappings related to InGameHud

* Rendering related mappings

* World Renderer related mappings

* Add block state related mappings

* Move mappings to correct package

* Update BlockStatePredicate mapping

Co-authored-by: Cat Core <[email protected]>

---------

Co-authored-by: Cat Core <[email protected]>
  • Loading branch information
Sychic and thecatcore authored Sep 5, 2024
1 parent c93b6ff commit 574467a
Show file tree
Hide file tree
Showing 35 changed files with 348 additions and 1 deletion.
9 changes: 9 additions & 0 deletions mappings/net/minecraft/block/Block.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
FIELD field_10643 soundGroup Lnet/minecraft/class_2498;
FIELD field_10644 FACINGS [Lnet/minecraft/class_2350;
FIELD field_10645 dynamicBounds Z
FIELD field_10646 defaultState Lnet/minecraft/class_0_378;
FIELD field_10646 defaultState Lnet/minecraft/class_2680;
FIELD field_10647 stateManager Lnet/minecraft/class_2689;
FIELD field_10648 resistance F
Expand Down Expand Up @@ -376,6 +377,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
METHOD method_9563 getTickRate (Lnet/minecraft/class_1941;)I
ARG 1 world
METHOD method_9563 getTickRate (Lnet/minecraft/class_4538;)I
METHOD method_9564 getDefaultState ()Lnet/minecraft/class_0_378;
METHOD method_9564 getDefaultState ()Lnet/minecraft/class_2680;
METHOD method_9566 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_47$class_48;)V
ARG 0 state
Expand Down Expand Up @@ -527,6 +529,11 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 4 random
METHOD method_9589 hasBlockEntityBreakingRender (Lnet/minecraft/class_2680;)Z
ARG 1 state
METHOD method_9590 setDefaultState (Lnet/minecraft/class_0_378;)V
COMMENT Sets the default state of the block. This should be called inside
COMMENT the block's constructor to override the default state chosen by the
COMMENT state manager.
ARG 1 state
METHOD method_9590 setDefaultState (Lnet/minecraft/class_2680;)V
COMMENT Sets the default state of the block. This should be called inside
COMMENT the block's constructor to override the default state chosen by the
Expand All @@ -549,11 +556,13 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 4 entity
METHOD method_9593 getLuminance (Lnet/minecraft/class_2680;)I
ARG 1 state
METHOD method_9594 calcBlockBreakingDelta (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)F
METHOD method_9595 getStateManager ()Lnet/minecraft/class_2689;
METHOD method_9596 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V
ARG 2 stack
METHOD method_9596 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V
ARG 2 stack
METHOD method_9597 getMaterial ()Lnet/minecraft/class_3614;
METHOD method_9597 getMaterial (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3614;
ARG 1 state
METHOD method_9601 isOpaque (Lnet/minecraft/class_2680;)Z
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/BlockState.mapping
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
CLASS net/minecraft/class_0_378 net/minecraft/block/BlockState
METHOD method_0_1224 testProperty (Lnet/minecraft/class_2769;)Ljava/lang/Comparable;
METHOD method_0_1225 getBlock ()Lnet/minecraft/class_2248;
CLASS net/minecraft/class_2680 net/minecraft/block/BlockState
FIELD field_12290 shapeCache Lnet/minecraft/class_2680$class_3752;
FIELD field_16553 luminance I
Expand Down
110 changes: 110 additions & 0 deletions mappings/net/minecraft/client/GlStateManager.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
CLASS net/minecraft/class_1015 net/minecraft/client/GlStateManager
FIELD field_5020 COLOR_MASK Lnet/minecraft/class_1015$class_1022;
FIELD field_5021 DEPTH Lnet/minecraft/class_1015$class_1026;
FIELD field_5024 COLOR_LOGIC Lnet/minecraft/class_1015$class_1021;
FIELD field_5025 BLEND Lnet/minecraft/class_1015$class_1017;
FIELD field_5034 POLY_OFFSET Lnet/minecraft/class_1015$class_1031;
FIELD field_5037 CULL Lnet/minecraft/class_1015$class_1025;
FIELD field_5038 activeTexture I
FIELD field_5040 STENCIL Lnet/minecraft/class_1015$class_1035;
FIELD field_5041 TEXTURES [Lnet/minecraft/class_1015$class_1039;
METHOD method_4346 cullMode (I)V
ARG 0 mode
METHOD method_4347 clear (I)V
ARG 0 mask
METHOD method_4350 popMatrix ()V
METHOD method_4353 enablePolygonOffset ()V
METHOD method_4355 enableDepthTest ()V
METHOD method_4357 clearDepth (D)V
ARG 0 depth
METHOD method_4360 logicOp (I)V
ARG 0 op
METHOD method_4367 blendFuncSeparate (IIII)V
ARG 0 srcFactorRGB
ARG 1 dstFactorRGB
ARG 2 srcFactorAlpha
ARG 3 dstFactorAlpha
METHOD method_4381 setShaderColor (FFFF)V
METHOD method_4382 loadIdentitiy ()V
METHOD method_4389 enableCull ()V
METHOD method_4392 deleteTexture (I)V
ARG 0 texture
METHOD method_4411 colorMask (ZZZZ)V
ARG 0 red
ARG 1 green
ARG 2 blue
ARG 3 alpha
METHOD method_4413 depthMask (Z)V
ARG 0 mask
METHOD method_4419 depthFunc (I)V
ARG 0 func
METHOD method_4430 enableColorLogicOp ()V
METHOD method_4431 activeTexture (I)V
ARG 0 texture
METHOD method_4433 polygonOffset (FF)V
ARG 0 factor
ARG 1 units
METHOD method_4436 disablePolygonOffset ()V
METHOD method_4439 disableBlend ()V
METHOD method_4446 disableColorLogicOp ()V
METHOD method_4448 bindTexture (I)V
ARG 0 texture
METHOD method_4454 enableBlend ()V
METHOD method_4458 blendFunc (II)V
ARG 0 srcFactor
ARG 1 dstFactor
METHOD method_4461 pushMatrix ()V
METHOD method_4462 viewport (IIII)V
ARG 0 x
ARG 1 y
ARG 2 width
ARG 3 height
METHOD method_4463 disableCull ()V
METHOD method_4466 disableDepthTest ()V
CLASS class_1017 BlendFuncState
FIELD field_5045 capState Lnet/minecraft/class_1015$class_1018;
FIELD field_5046 dstFactorAlpha I
FIELD field_5047 srcFactorAlpha I
FIELD field_5048 dstFactorRGB I
FIELD field_5049 srcFactorRGB I
CLASS class_1018 CapabilityTracker
FIELD field_5050 cap I
FIELD field_5051 state Z
METHOD <init> (I)V
ARG 1 cap
METHOD method_4469 disable ()V
METHOD method_4470 setState (Z)V
ARG 1 state
METHOD method_4471 enable ()V
CLASS class_1021 LogicOpState
FIELD field_5058 capState Lnet/minecraft/class_1015$class_1018;
FIELD field_5059 op I
CLASS class_1022 ColorMask
FIELD field_5060 alpha Z
FIELD field_5061 blue Z
FIELD field_5062 green Z
FIELD field_5063 red Z
CLASS class_1025 CullFaceState
FIELD field_5072 capState Lnet/minecraft/class_1015$class_1018;
FIELD field_5073 mode I
CLASS class_1026 DepthTestState
FIELD field_5074 capState Lnet/minecraft/class_1015$class_1018;
FIELD field_5075 func I
FIELD field_5076 mask Z
CLASS class_1031 PolygonOffsetState
FIELD field_5121 capLine Lnet/minecraft/class_1015$class_1018;
FIELD field_5122 units F
FIELD field_5123 capFill Lnet/minecraft/class_1015$class_1018;
FIELD field_5124 factor F
CLASS class_1034 StencilSubState
FIELD field_0_4363 ref I
FIELD field_5147 mask I
FIELD field_5148 func I
CLASS class_1035 StencilState
FIELD field_5149 subState Lnet/minecraft/class_1015$class_1034;
FIELD field_5150 dppass I
FIELD field_5151 dpfail I
FIELD field_5152 sfail I
FIELD field_5153 mask I
CLASS class_1039 Texture2DState
FIELD field_5167 boundTexture I
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/MinecraftClient.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
COMMENT
COMMENT @see net.minecraft.server.integrated.IntegratedServer
COMMENT @see net.minecraft.client.render.GameRenderer
FIELD field_0_2522 resourcePackDir Ljava/io/File;
FIELD field_16240 profiler Lnet/minecraft/class_3689;
FIELD field_16240 profiler Lnet/minecraft/class_3695;
FIELD field_16762 game Lnet/minecraft/class_3799;
Expand Down Expand Up @@ -75,6 +76,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1713 particleManager Lnet/minecraft/class_702;
FIELD field_1714 musicTracker Lnet/minecraft/class_1142;
FIELD field_1715 resourcePackManager Lnet/minecraft/class_3283;
FIELD field_1716 tickProfilerResult Lnet/minecraft/class_3533;
FIELD field_1717 languageManager Lnet/minecraft/class_1076;
FIELD field_1718 memoryReservedForCrash [B
FIELD field_1719 cameraEntity Lnet/minecraft/class_1297;
Expand Down Expand Up @@ -147,6 +149,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1769 worldRenderer Lnet/minecraft/class_761;
FIELD field_1770 fpsDebugString Ljava/lang/String;
FIELD field_1771 attackCooldown I
FIELD field_1772 textRenderer Lnet/minecraft/class_0_681;
FIELD field_1772 textRenderer Lnet/minecraft/class_327;
FIELD field_1773 gameRenderer Lnet/minecraft/class_757;
FIELD field_1774 keyboard Lnet/minecraft/class_309;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/TextRenderer.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/class_0_681 net/minecraft/client/TextRenderer
METHOD method_0_2381 getWidth (Ljava/lang/String;)I
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor
ARG 2 resourceManager
ARG 3 framebuffer
ARG 4 id
METHOD method_0_4134 close ()V
METHOD method_1256 parseEffect (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
ARG 1 textureManager
ARG 2 id
Expand Down
32 changes: 32 additions & 0 deletions mappings/net/minecraft/client/gui/DrawableHelper.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
FIELD field_2051 optionsBackground Lnet/minecraft/class_2960;
FIELD field_2052 statsIcons Lnet/minecraft/class_2960;
FIELD field_2053 icons Lnet/minecraft/class_2960;
FIELD field_22734 zOffset I
COMMENT The z offset used by {@link DrawableHelper}.
FIELD field_22735 OPTIONS_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
Expand Down Expand Up @@ -112,6 +115,35 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
ARG 8 v
ARG 9 texWidth
ARG 10 texHeight
METHOD method_1780 drawText (Lnet/minecraft/class_0_681;Ljava/lang/String;III)V
ARG 1 textRenderer
ARG 2 text
ARG 3 x
ARG 4 y
ARG 5 color
METHOD method_1782 fillGradient (IIIIII)V
ARG 1 startX
ARG 2 startY
ARG 3 endX
ARG 4 endY
ARG 5 colorStart
ARG 6 colorEnd
METHOD method_1783 drawHorizontalLine (IIII)V
ARG 1 x1
ARG 2 x2
ARG 3 y
ARG 4 color
METHOD method_1785 fill (IIIII)V
ARG 0 x1
ARG 1 y1
ARG 2 x2
ARG 3 y2
ARG 4 color
METHOD method_1787 drawVerticalLine (IIII)V
ARG 1 x
ARG 2 y1
ARG 3 y2
ARG 4 color
METHOD method_25290 drawTexture (Lnet/minecraft/class_4587;IIFFIIII)V
COMMENT Draws a textured rectangle from a region in a texture.
COMMENT
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/gui/hud/DebugHud.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String;
ARG 1 propEntry
METHOD method_1846 render ()V
METHOD method_1846 render (Lnet/minecraft/class_0_686;)V
METHOD method_1846 render (Lnet/minecraft/class_4587;)V
ARG 1 matrices
METHOD method_1847 renderLeftText ()V
Expand Down
21 changes: 21 additions & 0 deletions mappings/net/minecraft/client/gui/hud/InGameHud.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,21 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
FIELD field_35429 lastAutosaveIndicatorAlpha F
FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561;
FIELD field_39458 canShowChatDisabledScreen Z
METHOD <init> (Lnet/minecraft/class_310;)V
ARG 1 client
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_918;)V
ARG 1 client
ARG 2 itemRenderer
METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_1732 setRecordPlayingOverlay (Ljava/lang/String;)V
ARG 1 description
METHOD method_1732 setRecordPlayingOverlay (Lnet/minecraft/class_2561;)V
ARG 1 description
METHOD method_1733 getHeartRows (I)I
ARG 1 heartCount
METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309;
METHOD method_1735 renderVignetteOverlay (FLnet/minecraft/class_0_686;)V
METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_1297;)V
Expand Down Expand Up @@ -89,12 +93,14 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
METHOD method_1747 clear ()V
METHOD method_1748 tick ()V
METHOD method_1749 renderHeldItemTooltip ()V
METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_0_686;)V
METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_4587;)V
ARG 1 matrices
METHOD method_1750 getPlayerListHud ()Lnet/minecraft/class_355;
METHOD method_1751 (Lnet/minecraft/class_267;)Z
ARG 0 score
METHOD method_1752 renderMountJumpBar (I)V
METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_0_686;I)V
METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_1316;Lnet/minecraft/class_4587;I)V
ARG 1 mount
ARG 2 matrices
Expand All @@ -110,6 +116,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z
ARG 1 hitResult
METHOD method_1754 renderExperienceBar (I)V
METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_0_686;I)V
METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V
ARG 1 matrices
ARG 2 x
Expand All @@ -118,8 +125,10 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
ARG 1 type
ARG 2 message
ARG 3 sender
METHOD method_1756 getTextRenderer ()Lnet/minecraft/class_0_681;
METHOD method_1756 getTextRenderer ()Lnet/minecraft/class_327;
METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_266;)V
METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_266;Lnet/minecraft/class_0_686;)V
METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V
ARG 1 matrices
ARG 2 objective
Expand All @@ -130,11 +139,15 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
METHOD method_1759 renderHotbar (FLnet/minecraft/class_4587;)V
ARG 1 tickDelta
ARG 2 matrices
METHOD method_1759 renderHotbar (Lnet/minecraft/class_0_686;F)V
ARG 2 tickDelta
METHOD method_1760 renderStatusBars ()V
METHOD method_1760 renderStatusBars (Lnet/minecraft/class_0_686;)V
METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V
COMMENT Renders the armor, health, air, and hunger bars.
ARG 1 matrices
METHOD method_1761 renderPumpkinOverlay ()V
METHOD method_1761 renderPumpkinOverlay (Lnet/minecraft/class_0_686;)V
METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
ARG 1 x
ARG 2 y
Expand All @@ -148,6 +161,11 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
ARG 4 player
ARG 5 stack
ARG 6 seed
METHOD method_1762 renderHotbarItem (IIIFLnet/minecraft/class_1657;)V
ARG 2 x
ARG 3 y
ARG 4 tickDelta
ARG 5 player
METHOD method_1762 renderHotbarItem (Lnet/minecraft/class_4587;IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V
METHOD method_1763 setTitles (Ljava/lang/String;Ljava/lang/String;III)V
METHOD method_1763 setTitles (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;III)V
Expand All @@ -157,10 +175,13 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
ARG 4 titleRemainTicks
ARG 5 titleFadeOutTicks
METHOD method_1764 setOverlayMessage (Ljava/lang/String;Z)V
ARG 1 message
ARG 2 tinted
METHOD method_1765 renderStatusEffectOverlay ()V
METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_4587;)V
ARG 1 matrices
METHOD method_1766 renderDemoTimer ()V
METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_0_686;)V
METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_4587;)V
ARG 1 matrices
METHOD method_19346 drawTextBackground (Lnet/minecraft/class_327;II)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud
ARG 1 slot
METHOD method_1978 render (F)V
ARG 1 tickDelta
METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_0_686;F)V
METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_4587;)V
ARG 1 matrices
METHOD method_1978 render (Lnet/minecraft/class_4587;F)V
ARG 1 matrices
METHOD method_1979 render ()V
METHOD method_1979 render (Lnet/minecraft/class_0_686;)V
METHOD method_1979 render (Lnet/minecraft/class_4587;)V
ARG 1 matrices
METHOD method_1980 isOpen ()Z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen
FIELD field_2379 commandExceptionsWidth I
FIELD field_2381 commandExceptionsX I
FIELD field_2382 chatField Lnet/minecraft/class_342;
FIELD field_2384 originalChatText Ljava/lang/String;
FIELD field_2385 suggestionsWindow Lnet/minecraft/class_408$class_409;
FIELD field_2386 suggestionsFuture Ljava/util/concurrent/CompletableFuture;
FIELD field_2387 messageHistorySize I
Expand Down
Loading

0 comments on commit 574467a

Please sign in to comment.