diff --git a/build.gradle b/build.gradle index 17a8fda245..96aa53f0df 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20-pre2" +def minecraft_version = "1.20-pre3" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 624a050a6a..5b105286b0 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -55,13 +55,11 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_19118 screen Lnet/minecraft/class_500; FIELD field_19119 client Lnet/minecraft/class_310; FIELD field_19120 server Lnet/minecraft/class_642; - FIELD field_19121 iconTextureId Lnet/minecraft/class_2960; - FIELD field_19123 icon Lnet/minecraft/class_1043; + FIELD field_19123 icon Lnet/minecraft/class_8573; FIELD field_19124 time J FIELD field_42874 favicon [B METHOD (Lnet/minecraft/class_4267;Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V ARG 2 screen - ARG 3 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; METHOD method_20134 draw (Lnet/minecraft/class_332;IILnet/minecraft/class_2960;)V ARG 1 context @@ -76,4 +74,3 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_48274 pinged ()Z METHOD method_48275 protocolVersionMatches ()Z METHOD method_49300 uploadFavicon ([B)Z - ARG 1 favicon diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 6f0dbad52c..b7f9735a42 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -49,13 +49,11 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_19136 client Lnet/minecraft/class_310; FIELD field_19137 screen Lnet/minecraft/class_526; FIELD field_19138 level Lnet/minecraft/class_34; - FIELD field_19139 iconLocation Lnet/minecraft/class_2960; FIELD field_19140 iconPath Ljava/nio/file/Path; - FIELD field_19141 icon Lnet/minecraft/class_1043; + FIELD field_19141 icon Lnet/minecraft/class_8573; FIELD field_19142 time J METHOD (Lnet/minecraft/class_528;Lnet/minecraft/class_528;Lnet/minecraft/class_34;)V ARG 2 levelList - ARG 3 level METHOD method_20164 play ()V METHOD method_20165 (Lnet/minecraft/class_1940;Lnet/minecraft/class_7193;Ljava/nio/file/Path;Z)V ARG 4 confirmed @@ -70,7 +68,6 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 1 confirmed METHOD method_20173 recreate ()V METHOD method_20174 start ()V - METHOD method_20175 getIconTexture ()Lnet/minecraft/class_1043; METHOD method_27032 (Lnet/minecraft/class_32$class_5143;Ljava/lang/String;Z)V ARG 3 edited METHOD method_29990 openReadingWorldScreen ()V diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index ce88810d48..ee7f91055b 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager ARG 2 texture METHOD method_30299 closeTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V ARG 1 id - ARG 2 texture METHOD method_34590 getOrDefault (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Lnet/minecraft/class_1044; ARG 1 id ARG 2 fallback diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 573629a19d..d90cc1e92b 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -421,9 +421,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z - METHOD method_24201 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V + METHOD method_24201 updatePassengerPosition (Lnet/minecraft/class_1297;)V ARG 1 passenger - ARG 2 positionUpdater METHOD method_24203 refreshPositionAfterTeleport (DDD)V ARG 1 x ARG 3 y @@ -2205,7 +2204,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@return whether the entity can be hit with a projectile or be targeted by COMMENT the player crosshair} METHOD method_5864 getType ()Lnet/minecraft/class_1299; - METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;)V + METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V ARG 1 passenger METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5869 isSubmergedInWater ()Z diff --git a/mappings/net/minecraft/entity/damage/DamageRecord.mapping b/mappings/net/minecraft/entity/damage/DamageRecord.mapping index 3d4081a9aa..b26b96bc4a 100644 --- a/mappings/net/minecraft/entity/damage/DamageRecord.mapping +++ b/mappings/net/minecraft/entity/damage/DamageRecord.mapping @@ -1,24 +1,9 @@ CLASS net/minecraft/class_1281 net/minecraft/entity/damage/DamageRecord - FIELD field_5833 fallDistance F - FIELD field_5834 entityHealth F - FIELD field_5835 damage F - FIELD field_5836 entityAge I - FIELD field_5837 damageSource Lnet/minecraft/class_1282; - FIELD field_5838 fallDeathSuffix Ljava/lang/String; - METHOD (Lnet/minecraft/class_1282;IFFLjava/lang/String;F)V + FIELD comp_1535 damageSource Lnet/minecraft/class_1282; + FIELD comp_1536 damage F + FIELD comp_1538 fallDistance F + METHOD (Lnet/minecraft/class_1282;FLnet/minecraft/class_8572;F)V ARG 1 damageSource - ARG 2 entityAge - ARG 3 entityOriginalHealth - ARG 4 damage - ARG 5 fallDeathSuffix - ARG 6 fallDistance - METHOD method_35035 getEntityAge ()I - METHOD method_35036 getEntityHealth ()F - METHOD method_35037 getNewEntityHealth ()F - METHOD method_35038 getAttacker ()Lnet/minecraft/class_1297; - METHOD method_5498 getAttackerName ()Lnet/minecraft/class_2561; - METHOD method_5499 getDamageSource ()Lnet/minecraft/class_1282; - METHOD method_5500 getFallDeathSuffix ()Ljava/lang/String; - METHOD method_5501 getFallDistance ()F - METHOD method_5502 isAttackerLiving ()Z - METHOD method_5503 getDamage ()F + METHOD comp_1535 damageSource ()Lnet/minecraft/class_1282; + METHOD comp_1536 damage ()F + METHOD comp_1538 fallDistance ()F diff --git a/mappings/net/minecraft/entity/damage/DamageTracker.mapping b/mappings/net/minecraft/entity/damage/DamageTracker.mapping index 9d490f432c..bda3f83043 100644 --- a/mappings/net/minecraft/entity/damage/DamageTracker.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTracker.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker FIELD field_29968 ATTACK_DAMAGE_COOLDOWN I FIELD field_42274 INTENTIONAL_GAME_DESIGN_ISSUE_LINK_STYLE Lnet/minecraft/class_2583; FIELD field_5870 recentDamage Ljava/util/List; - FIELD field_5871 fallDeathSuffix Ljava/lang/String; FIELD field_5872 hasDamage Z FIELD field_5873 ageOnLastUpdate I FIELD field_5874 recentlyAttacked Z @@ -12,23 +11,10 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker FIELD field_5877 entity Lnet/minecraft/class_1309; METHOD (Lnet/minecraft/class_1309;)V ARG 1 entity - METHOD method_33937 getBiggestAttackerId ()I - COMMENT Gets the Entity ID of the biggest attacker - COMMENT @see #getBiggestAttacker() for getting the entity itself - METHOD method_35039 hasDamage ()Z - METHOD method_35040 wasRecentlyAttacked ()Z - METHOD method_35041 getMostRecentDamage ()Lnet/minecraft/class_1281; METHOD method_5539 update ()V - METHOD method_5540 getEntity ()Lnet/minecraft/class_1309; - METHOD method_5541 getBiggestAttacker ()Lnet/minecraft/class_1309; - METHOD method_5542 setFallDeathSuffix ()V - METHOD method_5543 getFallDeathSuffix (Lnet/minecraft/class_1281;)Ljava/lang/String; - ARG 1 damageRecord METHOD method_5544 getBiggestFall ()Lnet/minecraft/class_1281; - METHOD method_5545 clearFallDeathSuffix ()V METHOD method_5546 getTimeSinceLastAttack ()I - METHOD method_5547 onDamage (Lnet/minecraft/class_1282;FF)V + METHOD method_5547 onDamage (Lnet/minecraft/class_1282;F)V ARG 1 damageSource ARG 2 originalHealth - ARG 3 damage METHOD method_5548 getDeathMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping index a32411162a..d699c753cd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping @@ -1,16 +1,9 @@ CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket FIELD field_29133 entityId I - FIELD field_29134 killerId I FIELD field_29135 message Lnet/minecraft/class_2561; - METHOD (IILnet/minecraft/class_2561;)V + METHOD (ILnet/minecraft/class_2561;)V ARG 1 entityId - ARG 2 killerId - ARG 3 message - METHOD (Lnet/minecraft/class_1283;Lnet/minecraft/class_2561;)V - ARG 1 damageTracker - ARG 2 message METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_34144 getEntityId ()I METHOD method_34145 getMessage ()Lnet/minecraft/class_2561; - METHOD method_36153 getKillerId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping index 40b00d8139..adbea594af 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_5890 net/minecraft/network/packet/s2c/play/EndCombatS2CPacket - FIELD field_29131 attackerId I FIELD field_29132 timeSinceLastAttack I - METHOD (II)V + METHOD (I)V ARG 1 attackerId - ARG 2 timeSinceLastAttack METHOD (Lnet/minecraft/class_1283;)V ARG 1 damageTracker METHOD (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/server/ServerMetadata.mapping b/mappings/net/minecraft/server/ServerMetadata.mapping index dd1c158f4c..84a51d9e7b 100644 --- a/mappings/net/minecraft/server/ServerMetadata.mapping +++ b/mappings/net/minecraft/server/ServerMetadata.mapping @@ -34,8 +34,6 @@ CLASS net/minecraft/class_2926 net/minecraft/server/ServerMetadata METHOD method_49098 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS class_8145 Favicon - FIELD field_42536 HEIGHT I - FIELD field_42537 WIDTH I FIELD field_42538 CODEC Lcom/mojang/serialization/Codec; FIELD field_42539 DATA_URI_PREFIX Ljava/lang/String; METHOD method_49093 (Lnet/minecraft/class_2926$class_8145;)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping index 57125d12ce..81d8e30150 100644 --- a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping +++ b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping @@ -27,8 +27,7 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry METHOD method_14306 syncEntityData ()V COMMENT Synchronizes tracked data and attributes METHOD method_18756 tick ()V - METHOD method_18757 sendPackets (Ljava/util/function/Consumer;)V - ARG 1 sender + METHOD method_18757 sendPackets (Lnet/minecraft/class_3222;Ljava/util/function/Consumer;)V METHOD method_18758 sendSyncPacket (Lnet/minecraft/class_2596;)V COMMENT Sends a packet for synchronization with watcher and tracked player (if applicable) ARG 1 packet diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 490dfffe9c..2e588ea077 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35951 runAtTick (JLjava/lang/Runnable;)V ARG 1 tick ARG 3 runnable - METHOD method_35952 (Lnet/minecraft/class_1297;)Z - ARG 0 entity METHOD method_35953 expectEntityAt (Lnet/minecraft/class_1297;III)V ARG 1 entity ARG 2 x