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

Map parts of MinecraftClient involving changing worlds and interacting #281

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Map parts of MinecraftClient involving changing worlds and interacting #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/MinecraftClient.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
COMMENT @see net.minecraft.server.integrated.IntegratedServer
COMMENT @see net.minecraft.client.render.GameRenderer
FIELD field_0_2522 resourcePackDir Ljava/io/File;
FIELD field_0_2528 windowFocused Z
FIELD field_0_2546 taskQueue Ljava/util/Queue;
FIELD field_16240 profiler Lnet/minecraft/class_3689;
FIELD field_16240 profiler Lnet/minecraft/class_3695;
Expand Down Expand Up @@ -208,6 +209,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_41782 navigationType Lnet/minecraft/class_8015;
METHOD <init> (Lnet/minecraft/class_542;)V
ARG 1 args
METHOD method_0_2253 setWorld (Lnet/minecraft/class_638;Ljava/lang/String;)V
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to say this mapping is kinda tentative since there isn't any direct same method in 1.20

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried to dig through yarn but I wasn't able to find any mappings for this method for 1.12 or 1.11. The method completely changes in (I assume) 1.13.

ARG 1 world
METHOD method_0_2258 submit (Ljava/util/concurrent/Callable;)Lcom/google/common/util/concurrent/ListenableFuture;
METHOD method_1476 checkIs64Bit ()Z
METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300;
Expand Down
3 changes: 2 additions & 1 deletion mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
ARG 2 world
ARG 3 hand
ARG 4 hitResult
METHOD method_2896 (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_243;)Z
METHOD method_2896 interactBlock (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_243;)Z
ARG 1 player
METHOD method_2897 stopUsingItem (Lnet/minecraft/class_1657;)V
ARG 1 player
Expand Down Expand Up @@ -135,6 +135,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
ARG 1 player
ARG 2 world
ARG 3 hand
METHOD method_2919 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)Z
METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1934;
METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1940$class_1934;
METHOD method_2921 breakBlockOrFire (Lnet/minecraft/class_310;Lnet/minecraft/class_636;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer
ARG 1 client
ARG 2 entityRenderDispatcher
ARG 3 itemRenderer
METHOD method_0_3480 resetEquipProgressItemInteract ()V
METHOD method_22976 renderItem (FLnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_746;I)V
ARG 1 tickDelta
ARG 2 matrices
Expand All @@ -47,6 +48,7 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer
ARG 5 light
METHOD method_3214 applyCameraAngles (F)V
ARG 1 tickDelta
METHOD method_3215 resetEquipProgressBlockInteract ()V
METHOD method_3215 resetEquipProgress (Lnet/minecraft/class_1268;)V
ARG 1 hand
METHOD method_3216 renderArm (Lnet/minecraft/class_1306;)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/server/MinecraftServer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ CLASS net/minecraft/server/MinecraftServer
ARG 1 report
METHOD method_3745 setFlightEnabled (Z)V
ARG 1 flightEnabled
METHOD method_3747 stop ()V
METHOD method_3747 stop (Z)V
COMMENT Stops this server.
COMMENT
Expand Down
14 changes: 14 additions & 0 deletions mappings/net/minecraft/util/hit/HitResult.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
CLASS net/minecraft/class_239 net/minecraft/util/hit/HitResult
FIELD field_1326 entity Lnet/minecraft/class_1297;
FIELD field_1327 side Lnet/minecraft/class_2350;
FIELD field_1328 blockPos Lnet/minecraft/class_2338;
FIELD field_1329 pos Lnet/minecraft/class_243;
FIELD field_1330 type Lnet/minecraft/class_239$class_240;
METHOD <init> (Lnet/minecraft/class_239$class_240;Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;)V
ARG 1 type
ARG 2 pos
ARG 3 side
ARG 4 blockPos
METHOD <init> (Lnet/minecraft/class_243;)V
ARG 1 pos
METHOD <init> (Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;)V
ARG 1 pos
ARG 2 side
ARG 3 blockPos
METHOD method_1015 getBlockPos ()Lnet/minecraft/class_2338;
METHOD method_17783 getType ()Lnet/minecraft/class_239$class_240;
METHOD method_17784 getPos ()Lnet/minecraft/class_243;
METHOD method_24801 squaredDistanceTo (Lnet/minecraft/class_1297;)D
Expand Down
Loading