-
Notifications
You must be signed in to change notification settings - Fork 373
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
24w39a boat stuff + datafixes (#3997)
- Loading branch information
Showing
16 changed files
with
192 additions
and
3 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
mappings/net/minecraft/client/render/entity/AbstractBoatEntityRenderer.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| CLASS net/minecraft/class_10262 net/minecraft/client/render/entity/AbstractBoatEntityRenderer | ||
| METHOD method_64517 getModel ()Lnet/minecraft/class_583; | ||
| METHOD method_64520 getRenderLayer ()Lnet/minecraft/class_1921; | ||
| METHOD method_64521 renderWaterMask (Lnet/minecraft/class_10004;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V | ||
| ARG 1 state | ||
| ARG 2 matrices | ||
| ARG 3 vertexConsumers | ||
| ARG 4 light |
9 changes: 8 additions & 1 deletion
9
mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,11 @@ | ||
| CLASS net/minecraft/class_881 net/minecraft/client/render/entity/BoatEntityRenderer | ||
| FIELD field_53182 model Lnet/minecraft/class_3879; | ||
| FIELD field_53182 waterMaskModel Lnet/minecraft/class_3879; | ||
| FIELD field_54501 texture Lnet/minecraft/class_2960; | ||
| FIELD field_54502 model Lnet/minecraft/class_583; | ||
| METHOD <init> (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;)V | ||
| ARG 1 ctx | ||
| ARG 2 layer | ||
| METHOD method_62386 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; | ||
| ARG 0 id | ||
| METHOD method_64523 (Ljava/lang/String;)Ljava/lang/String; | ||
| ARG 0 path |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
mappings/net/minecraft/client/render/entity/RaftEntityRenderer.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| CLASS net/minecraft/class_10263 net/minecraft/client/render/entity/RaftEntityRenderer | ||
| FIELD field_54503 model Lnet/minecraft/class_583; | ||
| FIELD field_54504 texture Lnet/minecraft/class_2960; | ||
| METHOD <init> (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;)V | ||
| ARG 1 context | ||
| ARG 2 layer | ||
| METHOD method_64540 (Ljava/lang/String;)Ljava/lang/String; | ||
| ARG 0 path |
7 changes: 7 additions & 0 deletions
7
mappings/net/minecraft/client/render/entity/model/AbstractBoatEntityModel.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| CLASS net/minecraft/class_10261 net/minecraft/client/render/entity/model/AbstractBoatEntityModel | ||
| FIELD field_54480 leftPaddle Lnet/minecraft/class_630; | ||
| FIELD field_54481 rightPaddle Lnet/minecraft/class_630; | ||
| METHOD method_64515 setPaddleAngles (FILnet/minecraft/class_630;)V | ||
| ARG 0 angle | ||
| ARG 1 paddle | ||
| ARG 2 modelPart |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| CLASS net/minecraft/class_10246 net/minecraft/datafixer/fix/BoatSplitFix | ||
| METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V | ||
| ARG 1 outputSchema | ||
| METHOD method_64402 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; | ||
| ARG 2 typed | ||
| METHOD method_64404 isBoat (Ljava/lang/String;)Z | ||
| ARG 0 id | ||
| METHOD method_64405 isChestBoat (Ljava/lang/String;)Z | ||
| ARG 0 id | ||
| METHOD method_64406 isBoatOrChestBoat (Ljava/lang/String;)Z | ||
| ARG 0 id | ||
| METHOD method_64407 getNewBoatIdFromOldType (Ljava/lang/String;)Ljava/lang/String; | ||
| ARG 0 type | ||
| METHOD method_64408 getNewChestBoatIdFromOldType (Ljava/lang/String;)Ljava/lang/String; | ||
| ARG 0 type |
7 changes: 7 additions & 0 deletions
7
mappings/net/minecraft/datafixer/fix/ContainerBlockEntityLockPredicateFix.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| CLASS net/minecraft/class_10247 net/minecraft/datafixer/fix/ContainerBlockEntityLockPredicateFix | ||
| METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V | ||
| ARG 1 outputSchema | ||
| METHOD method_64409 fixLock (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; | ||
| ARG 0 typed | ||
| METHOD method_64410 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; | ||
| ARG 0 dynamic |
5 changes: 5 additions & 0 deletions
5
mappings/net/minecraft/datafixer/fix/LockComponentPredicateFix.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| CLASS net/minecraft/class_10248 net/minecraft/datafixer/fix/LockComponentPredicateFix | ||
| METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V | ||
| ARG 1 outputSchema | ||
| METHOD method_64411 fixLock (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; | ||
| ARG 0 dynamic |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| CLASS net/minecraft/class_10249 net/minecraft/datafixer/schema/Schema4067 | ||
| METHOD method_64412 registerChestBoatFix (Ljava/util/Map;Ljava/lang/String;)V | ||
| ARG 2 entityId |
83 changes: 83 additions & 0 deletions
83
mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| CLASS net/minecraft/class_10255 net/minecraft/entity/vehicle/AbstractBoatEntity | ||
| FIELD field_54428 pressingRight Z | ||
| FIELD field_54429 pressingForward Z | ||
| FIELD field_54430 pressingBack Z | ||
| FIELD field_54431 waterLevel D | ||
| FIELD field_54432 nearbySlipperiness F | ||
| FIELD field_54433 location Lnet/minecraft/class_10255$class_1691; | ||
| FIELD field_54434 lastLocation Lnet/minecraft/class_10255$class_1691; | ||
| FIELD field_54435 fallVelocity D | ||
| FIELD field_54436 onBubbleColumnSurface Z | ||
| FIELD field_54437 bubbleColumnIsDrag Z | ||
| FIELD field_54438 bubbleWobbleStrength F | ||
| FIELD field_54439 bubbleWobble F | ||
| FIELD field_54440 lastBubbleWobble F | ||
| FIELD field_54441 leashData Lnet/minecraft/class_9817$class_9818; | ||
| FIELD field_54442 itemSupplier Ljava/util/function/Supplier; | ||
| FIELD field_54443 boatPitch D | ||
| FIELD field_54444 pressingLeft Z | ||
| FIELD field_54446 EMIT_SOUND_EVENT_PADDLE_ROTATION D | ||
| COMMENT A boat will emit a sound event every time a paddle is near this rotation. | ||
| FIELD field_54448 LEFT_PADDLE_MOVING Lnet/minecraft/class_2940; | ||
| FIELD field_54449 RIGHT_PADDLE_MOVING Lnet/minecraft/class_2940; | ||
| FIELD field_54450 BUBBLE_WOBBLE_TICKS Lnet/minecraft/class_2940; | ||
| FIELD field_54452 NEXT_PADDLE_PHASE F | ||
| FIELD field_54453 paddlePhases [F | ||
| FIELD field_54454 velocityDecay F | ||
| FIELD field_54455 ticksUnderwater F | ||
| FIELD field_54456 yawVelocity F | ||
| FIELD field_54457 lerpTicks I | ||
| FIELD field_54458 x D | ||
| FIELD field_54459 y D | ||
| FIELD field_54460 z D | ||
| FIELD field_54461 boatYaw D | ||
| METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Ljava/util/function/Supplier;)V | ||
| ARG 1 type | ||
| ARG 2 world | ||
| ARG 3 itemSupplier | ||
| METHOD method_64476 handleBubbleColumn ()V | ||
| METHOD method_64477 updatePositionAndRotation ()V | ||
| METHOD method_64478 checkLocation ()Lnet/minecraft/class_10255$class_1691; | ||
| METHOD method_64479 checkBoatInWater ()Z | ||
| METHOD method_64480 getUnderWaterLocation ()Lnet/minecraft/class_10255$class_1691; | ||
| METHOD method_64481 updateVelocity ()V | ||
| METHOD method_64482 updatePaddles ()V | ||
| METHOD method_64483 getBubbleWobbleTicks ()I | ||
| METHOD method_64484 lerpBubbleWobble (F)F | ||
| ARG 1 tickDelta | ||
| METHOD method_64485 lerpPaddlePhase (IF)F | ||
| ARG 1 paddle | ||
| ARG 2 tickDelta | ||
| METHOD method_64486 canCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z | ||
| ARG 0 entity | ||
| ARG 1 other | ||
| METHOD method_64487 setInputs (ZZZZ)V | ||
| ARG 1 pressingLeft | ||
| ARG 2 pressingRight | ||
| ARG 3 pressingForward | ||
| ARG 4 pressingBack | ||
| METHOD method_64488 isSmallerThanBoat (Lnet/minecraft/class_1297;)Z | ||
| ARG 1 entity | ||
| METHOD method_64489 getPassengerAttachmentY (Lnet/minecraft/class_4048;)D | ||
| ARG 1 dimensions | ||
| METHOD method_64490 setPaddlesMoving (ZZ)V | ||
| ARG 1 left | ||
| ARG 2 right | ||
| METHOD method_64491 isPaddleMoving (I)Z | ||
| ARG 1 paddle | ||
| METHOD method_64492 clampPassengerYaw (Lnet/minecraft/class_1297;)V | ||
| ARG 1 passenger | ||
| METHOD method_64493 (Lnet/minecraft/class_1297;)Z | ||
| ARG 0 passenger | ||
| METHOD method_64494 getPaddleSound ()Lnet/minecraft/class_3414; | ||
| METHOD method_64495 getWaterHeightBelow ()F | ||
| METHOD method_64496 setBubbleWobbleTicks (I)V | ||
| ARG 1 bubbleWobbleTicks | ||
| METHOD method_64497 getNearbySlipperiness ()F | ||
| METHOD method_64498 initPosition (DDD)V | ||
| ARG 1 x | ||
| ARG 3 y | ||
| ARG 5 z | ||
| METHOD method_64499 getPassengerHorizontalOffset ()F | ||
| METHOD method_64500 getMaxPassengers ()I | ||
| CLASS class_1691 Location |
7 changes: 7 additions & 0 deletions
7
mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| CLASS net/minecraft/class_10256 net/minecraft/entity/vehicle/AbstractChestBoatEntity | ||
| FIELD field_54462 INVENTORY_SIZE I | ||
| FIELD field_54463 inventory Lnet/minecraft/class_2371; | ||
| FIELD field_54464 lootTable Lnet/minecraft/class_5321; | ||
| FIELD field_54465 lootTableSeed J | ||
| METHOD method_64501 generateLoot (Lnet/minecraft/class_1657;)V | ||
| ARG 1 player |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| CLASS net/minecraft/class_10257 net/minecraft/entity/vehicle/ChestRaftEntity |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| CLASS net/minecraft/class_10258 net/minecraft/entity/vehicle/RaftEntity |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| CLASS net/minecraft/class_1749 net/minecraft/item/BoatItem | ||
| FIELD field_54469 boatEntityType Lnet/minecraft/class_1299; | ||
| METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792$class_1793;)V | ||
| ARG 1 boatEntityType | ||
| ARG 2 settings | ||
| METHOD method_42296 createEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_239;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_10255; | ||
| ARG 1 world | ||
| ARG 2 hitResult | ||
| ARG 3 stack | ||
| ARG 4 player |