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

feat[1.12.2]: Map almost all parameters and fields #172

Merged
merged 6 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
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
4 changes: 2 additions & 2 deletions mappings/1.0.0#1.0.1.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -6001,7 +6001,7 @@ c net/minecraft/unmapped/C_1140528 net/minecraft/world/storage/WorldSaveInfo
m (Lnet/minecraft/unmapped/C_1140528;)I m_9773276 m_9773276
p 1 p_1
m (Ljava/lang/Object;)I compareTo compareTo
p 1 p_1
p 1 o
m ()I m_9442171 getGameMode
m (Ljava/lang/String;Ljava/lang/String;JJIZZ)V <init> <init>
p 1 p_1
Expand Down Expand Up @@ -8571,7 +8571,7 @@ c net/minecraft/unmapped/C_1392594$C_9379979 Result
p 1 p_1
m ()I m_0651687 getColor
m (Ljava/lang/Object;)I compareTo compareTo
p 1 p_1
p 1 o
c net/minecraft/unmapped/C_3187103 net/minecraft/client/gui/screen/inventory/menu/EnchantingPhrases
f Lnet/minecraft/unmapped/C_3187103; f_8364781 INSTANCE
f Ljava/util/Random; f_3815306 random
Expand Down
8 changes: 4 additions & 4 deletions mappings/1.0.0-rc1#1.0.0-rc2-3.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ c net/minecraft/unmapped/C_7006834$4816709 4816709
m (Lnet/minecraft/unmapped/C_7006834;)V <init> <init>
p 1 p_1
m (Ljava/awt/event/ActionEvent;)V actionPerformed actionPerformed
p 1 p_1
p 1 e
c net/minecraft/unmapped/C_7102748 net/minecraft/server/gui/MinecraftServerGui
f Ljava/util/logging/Logger; f_9711239 LOGGER
f Lnet/minecraft/server/MinecraftServer; f_5726894 server
Expand All @@ -1279,19 +1279,19 @@ c net/minecraft/unmapped/C_7102748$3093966 3093966
p 1 p_1
p 2 p_2
m (Ljava/awt/event/ActionEvent;)V actionPerformed actionPerformed
p 1 p_1
p 1 e
c net/minecraft/unmapped/C_7102748$3568167 3568167
f Lnet/minecraft/server/MinecraftServer; f_3148831 f_3148831
m (Lnet/minecraft/server/MinecraftServer;)V <init> <init>
p 1 p_1
m (Ljava/awt/event/WindowEvent;)V windowClosing windowClosing
p 1 p_1
p 1 e
c net/minecraft/unmapped/C_7102748$6190168 6190168
f Lnet/minecraft/unmapped/C_7102748; f_4809850 f_4809850
m (Lnet/minecraft/unmapped/C_7102748;)V <init> <init>
p 1 p_1
m (Ljava/awt/event/FocusEvent;)V focusGained focusGained
p 1 p_1
p 1 e
c net/minecraft/unmapped/C_7366354 net/minecraft/server/world/ServerWorld
f Lnet/minecraft/unmapped/C_3571139; f_4355570 chunkCache
f Z f_8250949 bypassSpawnProtection
Expand Down
4 changes: 2 additions & 2 deletions mappings/1.0.1#11w47a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ c net/minecraft/unmapped/C_1392594$C_9379979 Result
p 1 p_1
m ()I m_0651687 getColor
m (Ljava/lang/Object;)I compareTo compareTo
p 1 p_1
p 1 o
c net/minecraft/unmapped/C_3387138
m ()Ljava/lang/String; m_4535639 m_4535639
c net/minecraft/unmapped/C_3891497
Expand Down Expand Up @@ -2570,7 +2570,7 @@ c net/minecraft/unmapped/C_1140528 net/minecraft/world/storage/WorldSaveInfo
m ()I m_9442171 getGameMode
m ()Z m_3125494 isHardcore
m (Ljava/lang/Object;)I compareTo compareTo
p 1 p_1
p 1 o
c net/minecraft/unmapped/C_1207477 net/minecraft/client/render/model/entity/QuadrupedModel
f Lnet/minecraft/unmapped/C_0289174; f_2456311 head
f Lnet/minecraft/unmapped/C_0289174; f_7634779 body
Expand Down
2 changes: 1 addition & 1 deletion mappings/1.1#12w03a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ c net/minecraft/unmapped/C_1013763
m (F)V m_3300694 m_3300694
p 1 p_1
m ()F m_6481881 m_6481881
m (Lnet/minecraft/unmapped/C_6385858;)Z m_9004216 attack
m (Lnet/minecraft/unmapped/C_6385858;)Z m_9004216 tryAttack
Copy link
Member

Choose a reason for hiding this comment

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

Having looked at the relevant methods, I think it'd make more sense to change the one in LivingEntity. PlayerEntity.attack handles things like hunger and item damage, in addition to dealing damage to the target entity. LivingEntity.attack only handles dealing damage. So I'd rename that one to something like doDamage or dealDamage. What are your thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i've used tryAttack, as i explained on discord, because it can fail, plus its what yarn calls it on 1.14+.

this said, doDamage and dealDamage while might be more descriptive, sound a bit more confusing, as one expects an entity to attack, not to just "do damage"; but if you think its better, i can rename it to either of the two, don't want to stall this for an opinion.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

would tryDamage work?

p 1 target
c net/minecraft/unmapped/C_1415320
m ()Z m_9276055 isInLove
Expand Down
8 changes: 4 additions & 4 deletions mappings/1.10.2#16w32a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -727,8 +727,8 @@ c net/minecraft/unmapped/C_5009044
p 2 item
p 3 hand
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_4360192;)Lnet/minecraft/unmapped/C_6544668; m_4777054 interact
p 1 p_1
p 2 p_2
p 1 target
p 2 hand
m (Lnet/minecraft/unmapped/C_9550253;Z)V m_0278228 addMessage
p 1 message
p 2 actionBar
Expand Down Expand Up @@ -2052,7 +2052,7 @@ c net/minecraft/unmapped/C_3507951$3239445 3239445
m (Lnet/minecraft/unmapped/C_2441996;)Z m_6204306 m_6204306
p 1 p_1
m (Ljava/lang/Object;)Z apply apply
p 1 p_1
p 1 input
c net/minecraft/unmapped/C_3507951$6742250 6742250
f Lnet/minecraft/unmapped/C_3635204; f_0043916 f_0043916
f Ljava/util/Map; f_3976528 f_3976528
Expand All @@ -2062,7 +2062,7 @@ c net/minecraft/unmapped/C_3507951$6742250 6742250
m (Lnet/minecraft/unmapped/C_2441996;)Z m_0147184 m_0147184
p 1 p_1
m (Ljava/lang/Object;)Z apply apply
p 1 p_1
p 1 input
c net/minecraft/unmapped/C_1793890
m (Lnet/minecraft/unmapped/C_8554894;Lnet/minecraft/unmapped/C_1160655;)V <init> <init>
p 1 p_1
Expand Down
2 changes: 1 addition & 1 deletion mappings/1.12-pre2#1.12-pre3-1409.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ c net/minecraft/unmapped/C_4286596
p 2 p_2
m (Lnet/minecraft/unmapped/C_5942367;Z)V m_1515450 fill
p 1 contents
p 2 p_2
p 2 addOffhand
c net/minecraft/unmapped/C_4939758
m (Lnet/minecraft/unmapped/C_9764860;)V m_7736934 m_7736934
p 1 p_1
Expand Down
4 changes: 2 additions & 2 deletions mappings/1.12-pre5#1.12-pre6.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -851,8 +851,8 @@ c net/minecraft/unmapped/C_3665071
p 1 mouseX
p 2 mouseY
p 3 button
p 4 p_4
p 5 p_5
p 4 pageWidth
p 5 pageHeight
p 6 p_6
p 7 p_7
m (Ljava/util/List;)V m_3682460 recipesShown
Expand Down
16 changes: 8 additions & 8 deletions mappings/1.12.2#17w43a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ c net/minecraft/client/Minecraft
m (I)Z m_7253110 handleDebugKey
p 1 key
m ()V m_7242143 handleMouseEvents
m (Ljava/lang/String;[Ljava/lang/Object;)V m_6506161 m_6506161
m (Ljava/lang/String;[Ljava/lang/Object;)V m_6506161 addDebugChatMessage
p 1 p_1
p 2 p_2
m (IJ)V m_6415751 m_6415751
Expand Down Expand Up @@ -434,10 +434,10 @@ c net/minecraft/unmapped/C_1021050
p 3 u2
p 4 v2
m (IIII)V m_9054370 doLegacyTransparencyHack
p 1 p_1
p 2 p_2
p 3 p_3
p 4 p_4
p 1 u1
p 2 v1
p 3 u2
p 4 v2
m (Lnet/minecraft/unmapped/C_7131921;)Lnet/minecraft/unmapped/C_7131921; m_3689096 m_3689096
p 1 p_1
m (Lnet/minecraft/unmapped/C_7131921;IIII)V m_9054370 doLegacyTransparencyHack
Expand Down Expand Up @@ -6487,7 +6487,7 @@ c net/minecraft/unmapped/C_7464728$C_8228305 CacheLoader
m (Lnet/minecraft/unmapped/C_0561170;)Lnet/minecraft/unmapped/C_3605284; m_5398410 loadFromAssets
p 1 id
m (Ljava/lang/Object;)Ljava/lang/Object; load load
p 1 p_1
p 1 key
m (Lnet/minecraft/unmapped/C_7464728;Lnet/minecraft/unmapped/C_7464728$7410399;)V <init> <init>
p 1 p_1
p 2 p_2
Expand Down Expand Up @@ -6997,8 +6997,8 @@ c net/minecraft/unmapped/C_3665071
p 1 mouseX
p 2 mouseY
p 3 button
p 4 p_4
p 5 p_5
p 4 pageWidth
p 5 pageHeight
p 6 p_6
p 7 p_7
m (DDIIIII)Z m_9416587 mouseClicked
Expand Down
32 changes: 16 additions & 16 deletions mappings/1.13-pre3#1.13-pre4.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ c net/minecraft/unmapped/C_0386427$0027322 0027322
m (Lio/netty/channel/ChannelFuture;)V m_1182008 m_1182008
p 1 p_1
m (Lio/netty/util/concurrent/Future;)V operationComplete operationComplete
p 1 p_1
p 1 future
c net/minecraft/unmapped/C_0400468
m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_3544601;Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_9844932;Lnet/minecraft/unmapped/C_6707278;Lnet/minecraft/unmapped/C_6707278;)Lnet/minecraft/unmapped/C_2441996; m_5408908 m_5408908
p 1 p_1
Expand Down Expand Up @@ -170,7 +170,7 @@ c net/minecraft/unmapped/C_1591456$2363444 2363444
p 2 p_2
p 3 p_3
m (Lio/netty/util/concurrent/Future;)V operationComplete operationComplete
p 1 p_1
p 1 future
c net/minecraft/unmapped/C_1851525
m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_3906126;Lnet/minecraft/unmapped/C_6707278;Lnet/minecraft/unmapped/C_2441996;)V m_6138806 m_6138806
p 1 p_1
Expand Down Expand Up @@ -202,8 +202,8 @@ c net/minecraft/unmapped/C_1896634$2622244 2622244
p 1 p_1
p 2 p_2
m (Ljava/lang/Object;Ljava/lang/Object;)I compare compare
p 1 p_1
p 2 p_2
p 1 o1
p 2 o2
c net/minecraft/unmapped/C_1896634$3430155 3430155
m ()V <init> <init>
m (Lnet/minecraft/unmapped/C_0324512;)Z m_3140466 m_3140466
Expand All @@ -218,8 +218,8 @@ c net/minecraft/unmapped/C_1896634$6542686 6542686
p 1 p_1
p 2 p_2
m (Ljava/lang/Object;Ljava/lang/Object;)I compare compare
p 1 p_1
p 2 p_2
p 1 o1
p 2 o2
c net/minecraft/unmapped/C_1896634$8703389 8703389
m ()V <init> <init>
m (Lnet/minecraft/unmapped/C_0324512;)Z m_7915007 m_7915007
Expand Down Expand Up @@ -864,7 +864,7 @@ c net/minecraft/unmapped/C_7006834$4816709 4816709
m (Lnet/minecraft/unmapped/C_7006834;)V <init> <init>
p 1 p_1
m (Ljava/awt/event/ActionEvent;)V actionPerformed actionPerformed
p 1 p_1
p 1 e
c net/minecraft/unmapped/C_7029902
m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_5250955;Lnet/minecraft/unmapped/C_6707278;)Z m_6314636 m_6314636
p 1 p_1
Expand Down Expand Up @@ -895,7 +895,7 @@ c net/minecraft/unmapped/C_7102748$3093966 3093966
p 1 p_1
p 2 p_2
m (Ljava/awt/event/ActionEvent;)V actionPerformed actionPerformed
p 1 p_1
p 1 e
c net/minecraft/unmapped/C_7102748$8230050 8230050
f Ljavax/swing/JTextArea; f_3557043 f_3557043
f Ljavax/swing/JScrollPane; f_7009871 f_7009871
Expand Down Expand Up @@ -1038,7 +1038,7 @@ c net/minecraft/unmapped/C_8752044$4252041 4252041
f Lnet/minecraft/unmapped/C_8752044; f_2408120 f_2408120
f Lnet/minecraft/unmapped/C_9550253; f_1561277 f_1561277
m (Lio/netty/util/concurrent/Future;)V operationComplete operationComplete
p 1 p_1
p 1 future
m (Lnet/minecraft/unmapped/C_8752044;Lnet/minecraft/unmapped/C_9550253;)V <init> <init>
p 1 p_1
p 2 p_2
Expand Down Expand Up @@ -1296,8 +1296,8 @@ c net/minecraft/unmapped/C_4473452$8719942 8719942
m (Lnet/minecraft/unmapped/C_4473452;)V <init> <init>
p 1 p_1
m (Ljava/io/File;Ljava/lang/String;)Z accept accept
p 1 p_1
p 2 p_2
p 1 dir
p 2 name
c net/minecraft/unmapped/C_6707278
m (IIIIII)Ljava/util/Iterator; m_1343455 m_1343455
p 0 p_0
Expand Down Expand Up @@ -2100,8 +2100,8 @@ c net/minecraft/unmapped/C_3526030$0934552 0934552
p 1 p_1
p 2 p_2
m (Ljava/lang/Object;Ljava/lang/Object;)I compare compare
p 1 p_1
p 2 p_2
p 1 o1
p 2 o2
c net/minecraft/unmapped/C_1492128
c net/minecraft/unmapped/C_1492128$C_7723875
m (Ljava/net/URL;)Ljava/lang/Process; m_7424508 m_7424508
Expand Down Expand Up @@ -3018,9 +3018,9 @@ c net/minecraft/unmapped/C_0890491$3328360 3328360
p 2 p_2
p 3 p_3
m (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; deserialize deserialize
p 1 p_1
p 2 p_2
p 3 p_3
p 1 element
p 2 type
p 3 ctx
c net/minecraft/unmapped/C_5389817
m (Lnet/minecraft/unmapped/C_2587956;Lnet/minecraft/unmapped/C_2587956;)Z m_0772164 m_0772164
p 0 p_0
Expand Down
2 changes: 1 addition & 1 deletion mappings/1.14.1#1.14.2-pre1.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ c net/minecraft/unmapped/C_6605607
m (Lnet/minecraft/unmapped/C_6605607;)I m_3423112 m_3423112
p 1 p_1
m (Ljava/lang/Object;)I compareTo compareTo
p 1 p_1
p 1 o
m ()Ljava/util/Comparator; m_7859181 m_7859181
m (Lnet/minecraft/unmapped/C_6605607;Lnet/minecraft/unmapped/C_6605607;)I m_3423112 compareTo
p 0 p_0
Expand Down
14 changes: 7 additions & 7 deletions mappings/1.6.2-091847#13w36a-09051446.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -8485,7 +8485,7 @@ c net/minecraft/unmapped/C_5933891$5612187 5612187
m (Lnet/minecraft/unmapped/C_9550253;)Ljava/util/Iterator; m_2733947 m_2733947
p 1 p_1
m (Ljava/lang/Object;)Ljava/lang/Object; apply apply
p 1 p_1
p 1 input
c net/minecraft/unmapped/C_6049345 net/minecraft/world/gen/feature/AbstractTreeFeature
m (Z)V <init> <init>
p 1 p_1
Expand Down Expand Up @@ -9325,13 +9325,13 @@ c net/minecraft/unmapped/C_9399734$C_1753510 Serializer
p 2 p_2
p 3 p_3
m (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; serialize serialize
p 1 p_1
p 2 p_2
p 3 p_3
p 1 value
p 2 type
p 3 ctx
m (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; deserialize deserialize
p 1 p_1
p 2 p_2
p 3 p_3
p 1 element
p 2 type
p 3 ctx
c net/minecraft/unmapped/C_9620658 net/minecraft/nbt/NbtException
m ()V <init> <init>
m (Ljava/lang/String;)V <init> <init>
Expand Down
4 changes: 2 additions & 2 deletions mappings/1.7.2#13w47a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ c net/minecraft/unmapped/C_9685768
p 6 p_6
p 7 p_7
c net/minecraft/unmapped/C_6954368
f I f_1077993 f_1077993
f I f_5804353 f_5804353
f I f_1077993 damagedAtAge
f I f_5804353 lastStatusChangeAge
c net/minecraft/unmapped/C_0027843
m ()Ljava/lang/String; m_7252614 m_7252614
c net/minecraft/unmapped/C_4707822
Expand Down
4 changes: 2 additions & 2 deletions mappings/1.7.4#14w02a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -12892,8 +12892,8 @@ c net/minecraft/unmapped/C_5100287$1522442 1522442
p 1 p_1
p 2 p_2
m (Ljava/lang/Object;Ljava/lang/Object;)I compare compare
p 1 p_1
p 2 p_2
p 1 u
p 2 t
c net/minecraft/unmapped/C_5100287$2862430 2862430
f I f_8170382 f_8170382
f I f_1144617 f_1144617
Expand Down
8 changes: 4 additions & 4 deletions mappings/1.8.8#15w31a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ c net/minecraft/unmapped/C_3688914$9613589 9613589
m (Lnet/minecraft/unmapped/C_6385858;)Z m_7175431 m_7175431
p 1 p_1
m (Ljava/lang/Object;)Z apply apply
p 1 p_1
p 1 entity
c net/minecraft/unmapped/C_3699792
f Lnet/minecraft/unmapped/C_0743638; f_1762411 streamOverlay
f Lnet/minecraft/unmapped/C_4740250; f_1762411 bossEventOverlay
Expand Down Expand Up @@ -3890,8 +3890,8 @@ c net/minecraft/unmapped/C_9255863
p 8 p_8
p 9 p_9
c net/minecraft/unmapped/C_9368128
f I f_1353051 f_1353051
f I f_4178226 f_4178226
f I f_1353051 STACK
f I f_4178226 ROTATION
m (Lnet/minecraft/unmapped/C_5009044;)Z m_7287105 m_7287105
p 1 p_1
m (Lnet/minecraft/unmapped/C_5009044;Lnet/minecraft/unmapped/C_2750078;Lnet/minecraft/unmapped/C_4360192;)Z m_7287105 m_7287105
Expand Down Expand Up @@ -7648,7 +7648,7 @@ c net/minecraft/unmapped/C_4879372$2103614 2103614
m (Lnet/minecraft/unmapped/C_6385858;)Z m_6965146 m_6965146
p 1 p_1
m (Ljava/lang/Object;)Z apply apply
p 1 p_1
p 1 input
c net/minecraft/unmapped/C_4879372$C_2814287 StructureBlock
f Lnet/minecraft/unmapped/C_6707278; f_8990606 pos
f Lnet/minecraft/unmapped/C_2441996; f_4833388 state
Expand Down
8 changes: 4 additions & 4 deletions mappings/1.9.3-pre1#1.9.3-pre2.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ c net/minecraft/client/Minecraft$5013206 5013206
m ()V run run
c net/minecraft/unmapped/C_1021050
m (IIII)V m_9054370 doLegacyTransparencyHack
p 1 p_1
p 2 p_2
p 3 p_3
p 4 p_4
p 1 u1
p 2 v1
p 3 u2
p 4 v2
c net/minecraft/unmapped/C_1111347
f Ljava/util/List; f_6168604 blockEntities
m (Lnet/minecraft/unmapped/C_6755599;ZI)V <init> <init>
Expand Down
4 changes: 2 additions & 2 deletions mappings/12w06a#12w07a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,8 @@ c net/minecraft/unmapped/C_4473452$8719942 8719942
m (Lnet/minecraft/unmapped/C_4473452;)V <init> <init>
p 1 p_1
m (Ljava/io/File;Ljava/lang/String;)Z accept accept
p 1 p_1
p 2 p_2
p 1 dir
p 2 name
c net/minecraft/unmapped/C_3290276 net/minecraft/world/chunk/BlockSource
f [B f_4145846 BLOCKS
m ()V <init> <init>
Expand Down
2 changes: 1 addition & 1 deletion mappings/12w19a#12w21a.tinydiff
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ c net/minecraft/unmapped/C_3507951
m (Lnet/minecraft/unmapped/C_1237929;)I m_1385733 m_1385733
p 1 p_1
m (Ljava/lang/Object;)I compareTo compareTo
p 1 p_1
p 1 o
c net/minecraft/unmapped/C_5480695 net/minecraft/server/command/BanIpCommand net/minecraft/server/dedicated/command/BanIpCommand
m (Lnet/minecraft/unmapped/C_2182707;Ljava/lang/String;)V m_0220471 banIp
p 1 source
Expand Down
Loading