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.

Sign up for GitHub

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

23w41a misc #3691

Merged
merged 2 commits into from
Oct 14, 2023
Merged

23w41a misc #3691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
164c582
23w41a misc
Shnupbups Oct 11, 2023
d693fdf
Merge branch '23w41a' into 23w41a-stuff
Shnupbups Oct 14, 2023
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
10 changes: 10 additions & 0 deletions mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntity
FIELD field_42782 SHERDS_NBT_KEY Ljava/lang/String;
FIELD field_44706 sherds Lnet/minecraft/class_8172$class_8526;
FIELD field_46659 ITEM_NBT_KEY Ljava/lang/String;
FIELD field_46661 lastWobbleTime J
FIELD field_46662 lastWobbleType Lnet/minecraft/class_8172$class_8837;
FIELD field_46663 stack Lnet/minecraft/class_1799;
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
Expand All @@ -11,6 +15,8 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit
METHOD method_52577 getStackWith (Lnet/minecraft/class_8172$class_8526;)Lnet/minecraft/class_1799;
ARG 0 sherds
METHOD method_52578 asStack ()Lnet/minecraft/class_1799;
METHOD method_54301 wobble (Lnet/minecraft/class_8172$class_8837;)V
ARG 1 wobbleType
CLASS class_8526 Sherds
FIELD field_44707 DEFAULT Lnet/minecraft/class_8172$class_8526;
METHOD method_51512 stream ()Ljava/util/stream/Stream;
Expand All @@ -23,3 +29,7 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit
ARG 1 sherd
METHOD method_51516 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_8172$class_8526;
ARG 0 nbt
CLASS class_8837 WobbleType
FIELD field_46666 lengthInTicks I
METHOD <init> (Ljava/lang/String;II)V
ARG 3 lengthInTicks
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/SignBlockEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity
METHOD method_50010 canRunCommandClickEvent (ZLnet/minecraft/class_1657;)Z
ARG 1 front
ARG 2 player
METHOD method_54303 getInteractionFailSound ()Lnet/minecraft/class_3414;
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/debug/DebugRenderer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer
ARG 3 cameraX
ARG 5 cameraY
ARG 7 cameraZ
METHOD method_23100 (Lnet/minecraft/class_1297;)Z
ARG 0 entityx
METHOD method_23101 getTargetedEntity (Lnet/minecraft/class_1297;I)Ljava/util/Optional;
ARG 0 entity
ARG 1 maxDistance
Expand Down
4 changes: 3 additions & 1 deletion mappings/net/minecraft/entity/ItemEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
FIELD field_30457 CANNOT_PICK_UP_DELAY I
FIELD field_30458 NEVER_DESPAWN_AGE I
FIELD field_41893 owner Ljava/util/UUID;
FIELD field_46653 thrower Lnet/minecraft/class_1297;
FIELD field_7199 STACK Lnet/minecraft/class_2940;
FIELD field_7200 thrower Ljava/util/UUID;
FIELD field_7200 throwerUuid Ljava/util/UUID;
FIELD field_7201 health I
FIELD field_7202 pickupDelay I
FIELD field_7203 uniqueOffset F
Expand Down Expand Up @@ -72,6 +73,7 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
ARG 1 stack
METHOD method_6981 setThrower (Lnet/minecraft/class_1297;)V
COMMENT Sets the thrower of this item entity to {@code thrower}.
ARG 1 thrower
METHOD method_6982 setPickupDelay (I)V
COMMENT Sets the number of ticks before this item entity can be picked up
COMMENT to {@code pickupDelay}.
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/player/PlayerEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
ARG 0 c
METHOD method_53968 isUsernameValid (Ljava/lang/String;)Z
ARG 0 name
METHOD method_54292 getReachDistance (Z)F
ARG 0 creative
METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I
ARG 1 recipes
METHOD method_7255 addExperience (I)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
ARG 2 predicate
ARG 3 velocity
ARG 4 world
ARG 5 margin
METHOD method_18075 raycast (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;D)Lnet/minecraft/class_3966;
ARG 0 entity
ARG 1 min
ARG 2 max
ARG 3 box
ARG 4 predicate
ARG 5 maxDistance
METHOD method_18077 getEntityCollision (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Lnet/minecraft/class_3966;
ARG 0 world
ARG 1 entity
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
FIELD field_7703 bubbleColumnIsDrag Z
FIELD field_7704 paddlePhases [F
FIELD field_7706 ticksUnderwater F
FIELD field_7708 interpolationSteps I
FIELD field_7708 lerpTicks I
FIELD field_7709 pressingForward Z
FIELD field_7710 pressingLeft Z
FIELD field_7711 lastBubbleWobble F
Expand Down
14 changes: 7 additions & 7 deletions mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
CLASS net/minecraft/class_8836 net/minecraft/entity/vehicle/VehicleEntity
FIELD field_46655 damageWobbleTicks Lnet/minecraft/class_2940;
FIELD field_46656 damageWobbleSide Lnet/minecraft/class_2940;
FIELD field_46657 damageWobbleStrength Lnet/minecraft/class_2940;
FIELD field_46655 DAMAGE_WOBBLE_TICKS Lnet/minecraft/class_2940;
FIELD field_46656 DAMAGE_WOBBLE_SIDE Lnet/minecraft/class_2940;
FIELD field_46657 DAMAGE_WOBBLE_STRENGTH Lnet/minecraft/class_2940;
METHOD method_54293 shouldAlwaysDropItem ()Z
METHOD method_54294 getDamageWobbleStrength ()F
METHOD method_54295 getDamageWobbleTicks ()I
METHOD method_54296 getDamageWobbleSide ()I
METHOD method_54297 setDamageWobbleStrength (F)V
ARG 1 strength
ARG 1 damageWobbleStrength
METHOD method_54298 killAndDropItem (Lnet/minecraft/class_1792;)V
ARG 1 selfAsItem
METHOD method_54299 setDamageWobbleTicks (I)V
ARG 1 ticks
ARG 1 damageWobbleTicks
METHOD method_54300 setDamageWobbleSide (I)V
ARG 1 side
ARG 1 damageWobbleSide
METHOD method_7516 dropItems (Lnet/minecraft/class_1282;)V
ARG 1 source
ARG 1 damageSource
METHOD method_7557 asItem ()Lnet/minecraft/class_1792;
2 changes: 2 additions & 0 deletions mappings/net/minecraft/item/BoatItem.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ CLASS net/minecraft/class_1749 net/minecraft/item/BoatItem
METHOD method_42296 createEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_239;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1690;
ARG 1 world
ARG 2 hitResult
ARG 3 stack
ARG 4 player
1 change: 1 addition & 0 deletions mappings/net/minecraft/item/BrushItem.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem
ARG 4 userRotation
ARG 5 arm
METHOD method_49999 getHitResult (Lnet/minecraft/class_1657;)Lnet/minecraft/class_239;
ARG 1 user
METHOD method_51163 (Lnet/minecraft/class_1304;Lnet/minecraft/class_1309;)V
ARG 1 userx
METHOD method_51309 (Lnet/minecraft/class_1297;)Z
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/resource/VanillaDataPackProvider.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider
FIELD field_40051 METADATA Lnet/minecraft/class_3272;
FIELD field_40052 FEATURE_FLAGS Lnet/minecraft/class_7663;
FIELD field_40053 ID Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_8580;)V
ARG 1 symlinkFinder
METHOD method_45285 createManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283;
ARG 0 session
METHOD method_45286 createManager (Ljava/nio/file/Path;Lnet/minecraft/class_8580;)Lnet/minecraft/class_3283;
ARG 0 dataPacksPath
ARG 1 symlinkFinder
METHOD method_45287 createDefaultPack ()Lnet/minecraft/class_3268;
METHOD method_52443 createRealmsManager ()Lnet/minecraft/class_3283;
5 changes: 5 additions & 0 deletions mappings/net/minecraft/util/ItemScatterer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer
ARG 0 world
ARG 1 pos
ARG 2 stacks
METHOD method_54291 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
ARG 0 state
ARG 1 newState
ARG 2 world
ARG 3 pos
METHOD method_5449 spawn (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V
COMMENT Spawns an item entity of {@code stack} around the given position.
ARG 0 world
Expand Down