diff --git a/build.gradle b/build.gradle index 0e88804482..c467367d83 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.5-pre2" +def minecraft_version = "1.20.5-pre3" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping index 3c00307dbc..a0fe0436bf 100644 --- a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH FIELD field_45594 LOST_CONNECTION_TEXT Lnet/minecraft/class_2561; FIELD field_45595 queuedPackets Ljava/util/List; FIELD field_45944 LOGGER Lorg/slf4j/Logger; - FIELD field_48398 transferring Z FIELD field_48399 serverCookies Ljava/util/Map; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping index bf5955dc9d..e84e756795 100644 --- a/mappings/net/minecraft/client/option/SimpleOption.mapping +++ b/mappings/net/minecraft/client/option/SimpleOption.mapping @@ -186,7 +186,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption FIELD field_37873 callbacks Lnet/minecraft/class_7172$class_7176; FIELD field_37874 tooltipFactory Lnet/minecraft/class_7172$class_7277; FIELD field_41334 changeCallback Ljava/util/function/Consumer; - METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_7172$class_7277;Ljava/util/function/Consumer;)V + METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_7172$class_7277;Ljava/util/function/Consumer;Z)V ARG 1 options ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 8b464d90e9..75bb1d09e8 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent + FIELD comp_2422 pages Ljava/util/List; FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I FIELD field_49378 MAX_TITLE_LENGTH I FIELD field_49379 MAX_GENERATION I diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d66b75ae3e..5c1ef5d54c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -2291,15 +2291,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 entity METHOD method_59657 getPassengerNearestTo (Lnet/minecraft/class_243;)Ljava/util/Optional; ARG 1 pos - METHOD method_59816 collectCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Ljava/util/List;Lnet/minecraft/class_238;)Ljava/util/List; - ARG 0 entity - ARG 1 world - ARG 2 collisions - ARG 3 entityBoundingBox - METHOD method_59817 findPotentialStepHeights (Lnet/minecraft/class_238;Ljava/util/List;F)[F - ARG 0 entityBoundingBox - ARG 1 collisions - ARG 2 maxStepHeight METHOD method_5982 checkDespawn ()V COMMENT Checks whether the entity should be despawned. COMMENT diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 7b8cf5c76d..1b2489ce75 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -45,13 +45,7 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity ARG 5 z ARG 7 power ARG 8 uncertainty - METHOD method_59525 onDeflected ()V - METHOD method_59526 deflectOrCollide (Lnet/minecraft/class_239;)Lnet/minecraft/class_9109; - ARG 1 hitResult - METHOD method_59679 setVelocityAfterPunching (Lnet/minecraft/class_1297;)V - ARG 1 attacker - METHOD method_59682 onPunched (Lnet/minecraft/class_1282;)Z - ARG 1 damageSource + METHOD method_59525 onDeflected (Lnet/minecraft/class_1297;Z)V METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index 6e75bd7363..f7a7d7aa0e 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -308,10 +308,6 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound ARG 0 dynamic METHOD method_29142 (Lnet/minecraft/class_2487;)Lcom/mojang/serialization/Dynamic; ARG 0 nbt - METHOD method_29143 toMap ()Ljava/util/Map; - COMMENT {@return the compound as an unmodifiable map} - COMMENT - COMMENT

Changes to this compound will be propagated to the returned map. METHOD method_33133 isEmpty ()Z COMMENT {@return whether the compound has no entries} METHOD method_36110 putByteArray (Ljava/lang/String;Ljava/util/List;)V diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index 14a0d3e583..29797ac0f6 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -83,35 +83,17 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps ARG 1 map ARG 2 key ARG 3 value - METHOD method_10638 (Lnet/minecraft/class_2487;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; - ARG 2 key - METHOD method_10666 (Ljava/lang/String;Ljava/lang/String;)Z - ARG 1 k METHOD method_10667 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; ARG 0 nbt - METHOD method_10670 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V - ARG 2 k METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V ARG 0 entry ARG 2 pair - METHOD method_29148 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2487;Ljava/lang/String;)V - ARG 3 key METHOD method_29152 (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V ARG 1 entry - METHOD method_29153 (Lnet/minecraft/class_2487;Ljava/util/function/BiConsumer;)V - ARG 2 entryConsumer - METHOD method_29159 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V - ARG 2 key - METHOD method_29161 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V - ARG 2 key METHOD method_46230 (Ljava/util/List;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult; ARG 1 merger - METHOD method_46231 (Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V - ARG 1 nbt METHOD method_46232 unpackMarker (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520; ARG 0 nbt - METHOD method_46233 (Lnet/minecraft/class_2499;Ljava/util/function/Consumer;)V - ARG 1 consumer METHOD method_46234 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult; ARG 1 merger METHOD method_46235 createMerger (Lnet/minecraft/class_2520;)Ljava/util/Optional; @@ -126,8 +108,6 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps ARG 1 nbt METHOD get (Ljava/lang/String;)Ljava/lang/Object; ARG 1 key - METHOD method_29166 (Lnet/minecraft/class_2487;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; - ARG 2 key CLASS class_5320 MapBuilder METHOD append (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 key diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping index a97361398b..4804c262bd 100644 --- a/mappings/net/minecraft/registry/RegistryOps.mapping +++ b/mappings/net/minecraft/registry/RegistryOps.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps ARG 1 registryInfoGetter METHOD method_46626 (Lnet/minecraft/class_6903$class_7862;)Lcom/mojang/serialization/DataResult; ARG 0 info - METHOD method_46627 caching (Lnet/minecraft/class_6903$class_7863;)Lnet/minecraft/class_6903$class_7863; - ARG 0 registryInfoGetter METHOD method_46628 getOwner (Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 registryRef METHOD method_46629 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6903$class_7862;)Ljava/util/Optional; @@ -36,9 +34,6 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps ARG 1 registryLookup METHOD method_57110 withDelegate (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/class_6903; ARG 1 delegate - CLASS 1 - FIELD field_40854 registryRefToInfo Ljava/util/Map; - CLASS 2 CLASS class_7862 RegistryInfo FIELD comp_1131 entryLookup Lnet/minecraft/class_7871; METHOD comp_1131 entryLookup ()Lnet/minecraft/class_7871; diff --git a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping index 5c491d92bf..e475aed38d 100644 --- a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping @@ -3,13 +3,6 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator FIELD field_14535 REGULAR_TEMPLATES [Lnet/minecraft/class_2960; FIELD field_14536 DEFAULT_POSITION Lnet/minecraft/class_2338; FIELD field_34939 LOOT_TABLES Ljava/util/Map; - METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Z)V - ARG 0 structureTemplateManager - ARG 1 pos - ARG 2 rotation - ARG 3 holder - ARG 4 random - ARG 5 beached CLASS class_3416 Piece FIELD field_14538 grounded Z METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V