Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

24w36a stuff #3977

Merged
merged 5 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 4 player
ARG 5 hit
METHOD method_63499 getTranslationKey ()Ljava/lang/String;
METHOD method_64022 getInsideCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
ARG 1 state
ARG 2 world
ARG 3 pos
METHOD method_8389 asItem ()Lnet/minecraft/class_1792;
COMMENT {@return the block's corresponding item}
COMMENT
Expand Down Expand Up @@ -1330,6 +1334,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 0 direction
METHOD method_61766 ([Lnet/minecraft/class_265;)V
ARG 0 direction
METHOD method_64025 getInsideCollisionShape (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
ARG 1 world
ARG 2 pos
CLASS class_3752 ShapeCache
FIELD field_16559 DIRECTIONS [Lnet/minecraft/class_2350;
FIELD field_17651 exceedsCube Z
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/DispenserBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock
ARG 0 projectile
METHOD method_58682 getOutputLocation (Lnet/minecraft/class_2342;)Lnet/minecraft/class_2374;
ARG 0 pointer
METHOD method_64021 getBehaviorForItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2357;
ARG 0 stack
4 changes: 4 additions & 0 deletions mappings/net/minecraft/block/TripwireBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ CLASS net/minecraft/class_2538 net/minecraft/block/TripwireBlock
METHOD method_10780 updatePowered (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/List;)V
ARG 1 world
ARG 2 pos
ARG 3 entities
METHOD method_54060 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_54061 (Lnet/minecraft/class_2538;)Lnet/minecraft/class_2248;
ARG 0 block
METHOD method_64024 updatePowered (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
ARG 1 world
ARG 2 pos
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CLASS net/minecraft/class_10205 net/minecraft/block/dispenser/EquippableDispenserBehavior
FIELD field_54201 INSTANCE Lnet/minecraft/class_10205;
METHOD method_64105 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)Z
ARG 1 entity
METHOD method_64106 dispense (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z
ARG 0 pointer
ARG 1 stack
14 changes: 14 additions & 0 deletions mappings/net/minecraft/client/gui/DrawContext.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 3 x
ARG 4 y
ARG 5 positioner
ARG 6 texture
METHOD method_51436 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Lnet/minecraft/class_8000;II)V
ARG 1 textRenderer
ARG 2 text
Expand All @@ -271,6 +272,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 3 data
ARG 4 x
ARG 5 y
ARG 6 texture
METHOD method_51438 drawTooltip (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;II)V
ARG 1 textRenderer
ARG 2 text
Expand Down Expand Up @@ -447,6 +449,18 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 4 y
ARG 5 width
ARG 6 color
METHOD method_64037 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;IILnet/minecraft/class_2960;)V
ARG 1 textRenderer
ARG 2 text
ARG 3 x
ARG 4 y
ARG 5 texture
METHOD method_64038 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Ljava/util/Optional;II)V
ARG 1 textRenderer
ARG 2 text
ARG 3 data
ARG 4 x
ARG 5 y
CLASS class_8214 ScissorStack
FIELD field_43099 stack Ljava/util/Deque;
METHOD method_49699 pop ()Lnet/minecraft/class_8030;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate
METHOD method_2644 getTooltip ()Ljava/util/List;
METHOD method_2645 getResultCollection ()Lnet/minecraft/class_516;
METHOD method_62048 hasMultipleResults ()Z
METHOD method_64053 getCurrentResult ()Lnet/minecraft/class_1799;
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB
ARG 2 resetCurrentPage
ARG 3 filteringCraftable
METHOD method_2628 drawTooltip (Lnet/minecraft/class_332;II)V
ARG 1 context
ARG 2 x
ARG 3 y
METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
CLASS net/minecraft/class_8002 net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer
COMMENT A class for rendering a background box for a tooltip.
FIELD field_54151 DEFAULT_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
FIELD field_54152 DEFAULT_FRAME_TEXTURE Lnet/minecraft/class_2960;
METHOD method_47946 render (Lnet/minecraft/class_332;IIIIILnet/minecraft/class_2960;)V
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 z
ARG 6 texture
METHOD method_64049 getBackgroundTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
ARG 0 texture
METHOD method_64050 (Ljava/lang/String;)Ljava/lang/String;
ARG 0 name
METHOD method_64051 getFrameTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
ARG 0 texture
METHOD method_64052 (Ljava/lang/String;)Ljava/lang/String;
ARG 0 name
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/input/Input.mapping
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/class_744 net/minecraft/client/input/Input
FIELD field_3905 movementForward F
FIELD field_3907 movementSideways F
FIELD field_54155 playerInput Lnet/minecraft/class_10185;
METHOD method_20622 hasForwardMovement ()Z
METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241;
METHOD method_3129 tick (ZF)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,18 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
FIELD field_4689 textRenderer Lnet/minecraft/class_327;
FIELD field_4692 gameOptions Lnet/minecraft/class_315;
FIELD field_4696 renderers Ljava/util/Map;
FIELD field_53188 mapRenderer Lnet/minecraft/class_330;
FIELD field_54173 equipmentModelLoader Lnet/minecraft/class_10201;
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_327;Lnet/minecraft/class_315;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;)V
ARG 1 client
ARG 2 textureManager
ARG 3 itemRenderer
ARG 4 mapRenderer
ARG 5 blockRenderManager
ARG 6 textRenderer
ARG 7 gameOptions
ARG 8 modelLoader
ARG 9 equipmentModelLoader
METHOD method_23161 drawFireVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFF)V
ARG 0 entry
ARG 1 vertices
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer
FIELD field_27766 textRenderer Lnet/minecraft/class_327;
FIELD field_38888 blockRenderManager Lnet/minecraft/class_776;
FIELD field_53190 mapRenderer Lnet/minecraft/class_330;
FIELD field_54174 equipmentModelLoader Lnet/minecraft/class_10201;
FIELD field_54175 equipmentRenderer Lnet/minecraft/class_10197;
METHOD <init> (Lnet/minecraft/class_898;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_3300;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;Lnet/minecraft/class_327;)V
ARG 1 renderDispatcher
ARG 2 itemRenderer
ARG 3 mapRenderer
ARG 4 blockRenderManager
ARG 5 resourceManager
ARG 6 modelLoader
ARG 7 equipmentModelLoader
ARG 8 textRenderer
METHOD method_32166 getRenderDispatcher ()Lnet/minecraft/class_898;
METHOD method_32167 getPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630;
ARG 1 layer
Expand All @@ -26,3 +30,5 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer
METHOD method_43337 getBlockRenderManager ()Lnet/minecraft/class_776;
METHOD method_48481 getModelManager ()Lnet/minecraft/class_1092;
METHOD method_62427 getMapRenderer ()Lnet/minecraft/class_330;
METHOD method_64071 getEquipmentModelLoader ()Lnet/minecraft/class_10201;
METHOD method_64072 getEquipmentRenderer ()Lnet/minecraft/class_10197;
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe
ARG 3 light
ARG 4 skinTexture
ARG 5 arm
ARG 6 sleeveVisible
METHOD method_4210 getArmPose (Lnet/minecraft/class_10055;Lnet/minecraft/class_10055$class_10056;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573;
ARG 0 state
ARG 1 handState
Expand All @@ -17,11 +18,13 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe
ARG 2 vertexConsumers
ARG 3 light
ARG 4 skinTexture
ARG 5 sleeveVisible
METHOD method_4221 renderLeftArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;Z)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 skinTexture
ARG 5 sleeveVisible
METHOD method_62602 (Lnet/minecraft/class_1299;)Z
ARG 0 type
METHOD method_62603 updateHandState (Lnet/minecraft/class_742;Lnet/minecraft/class_10055$class_10056;Lnet/minecraft/class_1268;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
CLASS net/minecraft/class_938 net/minecraft/client/render/entity/SalmonEntityRenderer
FIELD field_4767 TEXTURE Lnet/minecraft/class_2960;
FIELD field_53198 smallModel Lnet/minecraft/class_599;
FIELD field_53199 mediumModel Lnet/minecraft/class_599;
FIELD field_53200 largeModel Lnet/minecraft/class_599;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/class_10201 net/minecraft/client/render/entity/equipment/EquipmentModelLoader
FIELD field_54189 EMPTY Lnet/minecraft/class_10186;
FIELD field_54190 models Ljava/util/Map;
METHOD method_64087 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10186;
ARG 1 id
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
CLASS net/minecraft/class_10197 net/minecraft/client/render/entity/equipment/EquipmentRenderer
FIELD field_54179 equipmentModelLoader Lnet/minecraft/class_10201;
FIELD field_54180 layerTextures Ljava/util/function/Function;
FIELD field_54181 trimSprites Ljava/util/function/Function;
METHOD <init> (Lnet/minecraft/class_10201;Lnet/minecraft/class_1059;)V
ARG 1 equipmentModelLoader
ARG 2 armorTrimsAtlas
METHOD method_64076 getDyeColor (Lnet/minecraft/class_10186$class_10189;I)I
ARG 0 layer
ARG 1 dyeColor
METHOD method_64077 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Ljava/util/function/Function;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V
ARG 1 layerType
ARG 2 modelId
ARG 3 model
ARG 4 stack
ARG 5 renderLayerFunction
ARG 6 matrices
ARG 7 vertexConsumers
ARG 8 light
METHOD method_64078 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Ljava/util/function/Function;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;)V
ARG 1 layerType
ARG 2 modelId
ARG 3 model
ARG 4 stack
ARG 5 renderLayerFunction
ARG 6 matrices
ARG 7 vertexConsumers
ARG 8 light
ARG 9 texture
METHOD method_64079 (Lnet/minecraft/class_10197$class_10198;)Lnet/minecraft/class_2960;
ARG 0 key
METHOD method_64080 (Lnet/minecraft/class_1059;Lnet/minecraft/class_10197$class_10199;)Lnet/minecraft/class_1058;
ARG 1 key
CLASS class_10198 LayerTextureKey
CLASS class_10199 TrimSpriteKey
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,24 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
FIELD field_4831 outerModel Lnet/minecraft/class_572;
FIELD field_53218 babyInnerModel Lnet/minecraft/class_572;
FIELD field_53219 babyOuterModel Lnet/minecraft/class_572;
FIELD field_54183 equipmentRenderer Lnet/minecraft/class_10197;
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_10197;)V
ARG 1 context
ARG 2 innerModel
ARG 3 outerModel
ARG 4 equipmentRenderer
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_10197;)V
ARG 1 context
ARG 2 innerModel
ARG 3 outerModel
ARG 4 babyInnerModel
ARG 5 babyOuterModel
ARG 6 equipmentRenderer
METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_10034;Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 state
ARG 4 stack
ARG 5 slot
ARG 6 light
ARG 7 armorModel
Expand All @@ -28,3 +32,9 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
ARG 2 slot
METHOD method_4173 usesInnerModel (Lnet/minecraft/class_1304;)Z
ARG 1 slot
METHOD method_64081 hasModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;)Z
ARG 0 stack
ARG 1 slot
METHOD method_64082 hasModel (Lnet/minecraft/class_10192;Lnet/minecraft/class_1304;)Z
ARG 0 component
ARG 1 slot
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
CLASS net/minecraft/class_979 net/minecraft/client/render/entity/feature/ElytraFeatureRenderer
FIELD field_4852 model Lnet/minecraft/class_563;
FIELD field_53215 babyModel Lnet/minecraft/class_563;
FIELD field_54185 equipmentRenderer Lnet/minecraft/class_10197;
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10197;)V
ARG 1 context
ARG 2 loader
ARG 3 equipmentRenderer
METHOD method_64084 getTexture (Lnet/minecraft/class_10034;)Lnet/minecraft/class_2960;
ARG 0 state
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
CLASS net/minecraft/class_4073 net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer
FIELD field_53216 model Lnet/minecraft/class_9947;
FIELD field_53217 babyModel Lnet/minecraft/class_9947;
FIELD field_54182 equipmentRenderer Lnet/minecraft/class_10197;
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10197;)V
ARG 1 context
ARG 2 loader
ARG 3 equipmentRenderer
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
CLASS net/minecraft/class_988 net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer
FIELD field_53220 model Lnet/minecraft/class_578;
FIELD field_53221 babyModel Lnet/minecraft/class_578;
FIELD field_54184 equipmentRenderer Lnet/minecraft/class_10197;
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10197;)V
ARG 1 context
ARG 2 loader
ARG 3 equipmentRenderer
METHOD method_64083 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_10043;Lnet/minecraft/class_1799;Lnet/minecraft/class_2960;I)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 state
ARG 4 stack
ARG 5 modelId
ARG 6 light
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ CLASS net/minecraft/class_9085 net/minecraft/client/render/entity/feature/WolfAr
FIELD field_49582 CRACK_TEXTURES Ljava/util/Map;
FIELD field_53235 model Lnet/minecraft/class_624;
FIELD field_53236 babyModel Lnet/minecraft/class_624;
FIELD field_54186 equipmentRenderer Lnet/minecraft/class_10197;
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10197;)V
ARG 1 context
ARG 2 loader
ARG 3 equipmentRenderer
METHOD method_57819 renderCracks (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_3879;)V
ARG 1 matrices
ARG 2 vertexConsumers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ CLASS net/minecraft/class_10042 net/minecraft/client/render/entity/state/LivingE
FIELD field_53463 sleepingDirection Lnet/minecraft/class_2350;
FIELD field_53464 customName Lnet/minecraft/class_2561;
FIELD field_53465 pose Lnet/minecraft/class_4050;
FIELD field_53466 headEquippedItemModel Lnet/minecraft/class_1087;
FIELD field_53467 headEquippedStack Lnet/minecraft/class_1799;
FIELD field_53466 equippedHeadItemModel Lnet/minecraft/class_1087;
FIELD field_53467 equippedHeadStack Lnet/minecraft/class_1799;
FIELD field_53468 mainArm Lnet/minecraft/class_1306;
FIELD field_53469 rightHandItemModel Lnet/minecraft/class_1087;
FIELD field_53470 rightHandStack Lnet/minecraft/class_1799;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ CLASS net/minecraft/class_10043 net/minecraft/client/render/entity/state/LlamaEn
FIELD field_53473 variant Lnet/minecraft/class_1501$class_7993;
FIELD field_53474 hasChest Z
FIELD field_53476 trader Z
FIELD field_54187 bodyArmor Lnet/minecraft/class_1799;
8 changes: 8 additions & 0 deletions mappings/net/minecraft/client/render/item/ItemModels.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
CLASS net/minecraft/class_763 net/minecraft/client/render/item/ItemModels
FIELD field_54157 models Ljava/util/Map;
FIELD field_54158 missingModelSupplier Ljava/util/function/Supplier;
FIELD field_54159 idToModel Ljava/util/function/Function;
METHOD <init> (Lnet/minecraft/class_1092;)V
ARG 1 modelManager
METHOD method_3308 getModel (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1087;
ARG 1 stack
METHOD method_64056 clearModels ()V
METHOD method_64057 getModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087;
ARG 1 id
METHOD method_64058 (Lnet/minecraft/class_1092;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087;
ARG 1 id
Loading