diff --git a/build.gradle b/build.gradle index 34242257d4..d24046b691 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.19.3-pre3" +def minecraft_version = "1.19.3-rc1" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping index 3468d56119..ba85dcf4e8 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping @@ -3,11 +3,8 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/pack/PackListWidge FIELD field_19125 RESOURCE_PACKS_TEXTURE Lnet/minecraft/class_2960; FIELD field_19126 INCOMPATIBLE Lnet/minecraft/class_2561; FIELD field_19127 INCOMPATIBLE_CONFIRM Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_310;IILnet/minecraft/class_2561;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;IILnet/minecraft/class_2561;)V ARG 1 client - ARG 2 width - ARG 3 height - ARG 4 title CLASS class_4271 ResourcePackEntry FIELD field_19128 client Lnet/minecraft/class_310; FIELD field_19129 pack Lnet/minecraft/class_5369$class_5371; diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index c3d4985edc..875395eff8 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen METHOD method_29672 (Lnet/minecraft/class_521;Lnet/minecraft/class_5369$class_5371;)V ARG 2 pack METHOD method_29673 updatePackList (Lnet/minecraft/class_521;Ljava/util/stream/Stream;)V - ARG 1 widget - ARG 2 packs METHOD method_29674 (Ljava/nio/file/Path;Ljava/nio/file/Path;Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/nio/file/Path;)V ARG 3 toCopy METHOD method_29675 (Ljava/nio/file/Path;Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/nio/file/Path;)V diff --git a/mappings/net/minecraft/client/option/AoMode.mapping b/mappings/net/minecraft/client/option/AoMode.mapping deleted file mode 100644 index 1db11c405c..0000000000 --- a/mappings/net/minecraft/client/option/AoMode.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_4060 net/minecraft/client/option/AoMode - FIELD field_18147 BY_ID Ljava/util/function/IntFunction; - FIELD field_18148 id I - FIELD field_18149 translationKey Ljava/lang/String; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 translationKey - METHOD method_18484 byId (I)Lnet/minecraft/class_4060; - ARG 0 id diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 1e3cf71cad..e1b86f3449 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -288,8 +288,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 prefix ARG 1 value METHOD method_41784 getHideLightningFlashes ()Lnet/minecraft/class_7172; - METHOD method_41785 (Lnet/minecraft/class_4060;)V - ARG 0 value METHOD method_41788 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value @@ -367,8 +365,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 1 value METHOD method_42456 (Lnet/minecraft/class_1659;)V ARG 0 value - METHOD method_42457 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Integer; - ARG 0 either METHOD method_42458 (Lnet/minecraft/class_4061;)V ARG 0 value METHOD method_42459 (Lnet/minecraft/class_4063;)V @@ -487,8 +483,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_42541 (Ljava/lang/Integer;)V ARG 0 value METHOD method_42542 getChatOpacity ()Lnet/minecraft/class_7172; - METHOD method_42543 (Ljava/lang/Boolean;)Ljava/lang/Integer; - ARG 0 value METHOD method_42544 (Ljava/lang/Double;)I ARG 0 value METHOD method_42545 (Lnet/minecraft/class_2561;Ljava/lang/Integer;)Lnet/minecraft/class_2561; @@ -500,14 +494,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_42548 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value - METHOD method_42549 (Ljava/lang/Integer;)Ljava/lang/Integer; - ARG 0 value METHOD method_42550 getTextBackgroundOpacity ()Lnet/minecraft/class_7172; - METHOD method_42551 (Ljava/lang/Integer;)Ljava/lang/Integer; - ARG 0 value METHOD method_42552 getMainArm ()Lnet/minecraft/class_7172; - METHOD method_42553 (Ljava/lang/Integer;)Ljava/lang/Boolean; - ARG 0 value METHOD method_42554 getChatScale ()Lnet/minecraft/class_7172; METHOD method_42555 (Ljava/lang/Integer;)V ARG 0 value diff --git a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping index d46b72f5b5..ddea01b5b1 100644 --- a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp FIELD field_32185 RIGHT_CURLY_BRACKET C FIELD field_32186 DOUBLE_QUOTE C FIELD field_41706 TOO_DEEP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_41707 TOO_LARGE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_41708 EXPECTED_LIST_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_41709 INVALID_INDEX_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9898 EXAMPLES Ljava/util/Collection; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 7529812afd..d6cc77bb86 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -333,9 +333,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT {@return the stack's repair cost used in anvils} COMMENT COMMENT

This is the the value of the {@value #REPAIR_COST_KEY} key in NBT. - METHOD method_7929 isItemEqual (Lnet/minecraft/class_1799;)Z - COMMENT {@return whether this stack and {@code stack} hold the same item} - ARG 1 stack METHOD method_7930 onStoppedUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V ARG 1 world ARG 2 user @@ -610,13 +607,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see #isDamageable COMMENT @see #getDamage - METHOD method_7987 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - COMMENT {@return whether the given item stacks' items are equal} - COMMENT - COMMENT @see #areEqual - COMMENT @see #canCombine - ARG 0 left - ARG 1 right CLASS class_5422 TooltipSection FIELD field_25775 flag I METHOD method_30269 getFlag ()I diff --git a/mappings/net/minecraft/nbt/NbtByte.mapping b/mappings/net/minecraft/nbt/NbtByte.mapping index 007a14713a..8602240650 100644 --- a/mappings/net/minecraft/nbt/NbtByte.mapping +++ b/mappings/net/minecraft/nbt/NbtByte.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_2481 net/minecraft/nbt/NbtByte COMMENT The NBT byte representing {@code 1}. COMMENT COMMENT @apiNote This is often used to indicate a true boolean value. - FIELD field_33189 SIZE I METHOD (B)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtByteArray.mapping b/mappings/net/minecraft/nbt/NbtByteArray.mapping index 8ec33732a2..b28a2a5f9f 100644 --- a/mappings/net/minecraft/nbt/NbtByteArray.mapping +++ b/mappings/net/minecraft/nbt/NbtByteArray.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2479 net/minecraft/nbt/NbtByteArray COMMENT The backing array can be obtained via {@link #getByteArray()}. FIELD field_11493 value [B FIELD field_21024 TYPE Lnet/minecraft/class_4614; - FIELD field_33188 SIZE I METHOD (Ljava/util/List;)V ARG 1 value METHOD ([B)V diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index 877b3562aa..60b4e2e17a 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound FIELD field_11515 entries Ljava/util/Map; FIELD field_21029 TYPE Lnet/minecraft/class_4614; FIELD field_25128 CODEC Lcom/mojang/serialization/Codec; - FIELD field_33190 SIZE I METHOD (Ljava/util/Map;)V ARG 1 entries METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtDouble.mapping b/mappings/net/minecraft/nbt/NbtDouble.mapping index fa2fa8c7d7..74e11dc608 100644 --- a/mappings/net/minecraft/nbt/NbtDouble.mapping +++ b/mappings/net/minecraft/nbt/NbtDouble.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2489 net/minecraft/nbt/NbtDouble FIELD field_21030 ZERO Lnet/minecraft/class_2489; COMMENT The NBT double representing {@code 0.0}. FIELD field_21031 TYPE Lnet/minecraft/class_4614; - FIELD field_33192 SIZE I METHOD (D)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtElement.mapping b/mappings/net/minecraft/nbt/NbtElement.mapping index 7de965e818..5e38816c3e 100644 --- a/mappings/net/minecraft/nbt/NbtElement.mapping +++ b/mappings/net/minecraft/nbt/NbtElement.mapping @@ -83,5 +83,4 @@ CLASS net/minecraft/class_2520 net/minecraft/nbt/NbtElement ARG 1 visitor METHOD method_39876 accept (Lnet/minecraft/class_6836;)V ARG 1 visitor - METHOD method_47986 getSizeInBits ()I METHOD method_47988 getSizeInBytes ()I diff --git a/mappings/net/minecraft/nbt/NbtEnd.mapping b/mappings/net/minecraft/nbt/NbtEnd.mapping index 470571e92d..461651aab1 100644 --- a/mappings/net/minecraft/nbt/NbtEnd.mapping +++ b/mappings/net/minecraft/nbt/NbtEnd.mapping @@ -6,4 +6,3 @@ CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtEnd FIELD field_21033 INSTANCE Lnet/minecraft/class_2491; COMMENT A dummy instance of the NBT end. It will never appear nested in any parsed NBT COMMENT structure and should never be used as NBT compound values or list elements. - FIELD field_33193 SIZE I diff --git a/mappings/net/minecraft/nbt/NbtFloat.mapping b/mappings/net/minecraft/nbt/NbtFloat.mapping index 7a5e9c4883..386a398c80 100644 --- a/mappings/net/minecraft/nbt/NbtFloat.mapping +++ b/mappings/net/minecraft/nbt/NbtFloat.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2494 net/minecraft/nbt/NbtFloat FIELD field_21034 ZERO Lnet/minecraft/class_2494; COMMENT The NBT float representing {@code 0.0f}. FIELD field_21035 TYPE Lnet/minecraft/class_4614; - FIELD field_33194 SIZE I METHOD (F)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtInt.mapping b/mappings/net/minecraft/nbt/NbtInt.mapping index bc1fd32377..1f90520660 100644 --- a/mappings/net/minecraft/nbt/NbtInt.mapping +++ b/mappings/net/minecraft/nbt/NbtInt.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_2497 net/minecraft/nbt/NbtInt COMMENT Instances are immutable. FIELD field_11525 value I FIELD field_21037 TYPE Lnet/minecraft/class_4614; - FIELD field_33196 SIZE I METHOD (I)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtIntArray.mapping b/mappings/net/minecraft/nbt/NbtIntArray.mapping index 4d18a3690b..4d9f198cd0 100644 --- a/mappings/net/minecraft/nbt/NbtIntArray.mapping +++ b/mappings/net/minecraft/nbt/NbtIntArray.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2495 net/minecraft/nbt/NbtIntArray COMMENT The backing array can be obtained via {@link #getIntArray()}. FIELD field_11524 value [I FIELD field_21036 TYPE Lnet/minecraft/class_4614; - FIELD field_33195 SIZE I METHOD (Ljava/util/List;)V ARG 1 value METHOD ([I)V diff --git a/mappings/net/minecraft/nbt/NbtList.mapping b/mappings/net/minecraft/nbt/NbtList.mapping index 56ee658584..a8cf6dc2a1 100644 --- a/mappings/net/minecraft/nbt/NbtList.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList FIELD field_11550 value Ljava/util/List; FIELD field_11551 type B FIELD field_21039 TYPE Lnet/minecraft/class_4614; - FIELD field_33199 SIZE I METHOD (Ljava/util/List;B)V ARG 1 list ARG 2 type diff --git a/mappings/net/minecraft/nbt/NbtLong.mapping b/mappings/net/minecraft/nbt/NbtLong.mapping index 23e31d3ca4..4c79749bf0 100644 --- a/mappings/net/minecraft/nbt/NbtLong.mapping +++ b/mappings/net/minecraft/nbt/NbtLong.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_2503 net/minecraft/nbt/NbtLong COMMENT Instances are immutable. FIELD field_11553 value J FIELD field_21041 TYPE Lnet/minecraft/class_4614; - FIELD field_33201 SIZE I METHOD (J)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtLongArray.mapping b/mappings/net/minecraft/nbt/NbtLongArray.mapping index 5c87425cdd..2d11a0148f 100644 --- a/mappings/net/minecraft/nbt/NbtLongArray.mapping +++ b/mappings/net/minecraft/nbt/NbtLongArray.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2501 net/minecraft/nbt/NbtLongArray COMMENT The backing array can be obtained via {@link #getLongArray()}. FIELD field_11552 value [J FIELD field_21040 TYPE Lnet/minecraft/class_4614; - FIELD field_33200 SIZE I METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 value METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/nbt/NbtShort.mapping b/mappings/net/minecraft/nbt/NbtShort.mapping index a24343549e..9abf6d61d1 100644 --- a/mappings/net/minecraft/nbt/NbtShort.mapping +++ b/mappings/net/minecraft/nbt/NbtShort.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_2516 net/minecraft/nbt/NbtShort COMMENT Instances are immutable. FIELD field_11588 value S FIELD field_21043 TYPE Lnet/minecraft/class_4614; - FIELD field_33231 SIZE I METHOD (S)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtString.mapping b/mappings/net/minecraft/nbt/NbtString.mapping index 5e57b126c7..8c7add0eb8 100644 --- a/mappings/net/minecraft/nbt/NbtString.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString FIELD field_11590 value Ljava/lang/String; FIELD field_21045 TYPE Lnet/minecraft/class_4614; FIELD field_21046 EMPTY Lnet/minecraft/class_2519; - FIELD field_33241 SIZE I FIELD field_33242 DOUBLE_QUOTE C FIELD field_33243 SINGLE_QUOTE C FIELD field_33244 BACKSLASH C diff --git a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping index 73f335ebf5..ae29239b05 100644 --- a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping +++ b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_2505 net/minecraft/nbt/NbtTagSizeTracker FIELD field_11557 maxBytes J METHOD (J)V ARG 1 maxBytes - METHOD method_10623 add (J)V - ARG 1 bits diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index b04e156b1e..1806ae9cf9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -3,12 +3,11 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr FIELD field_12639 volume F FIELD field_12640 entityId I FIELD field_12641 category Lnet/minecraft/class_3419; - FIELD field_12642 sound Lnet/minecraft/class_3414; + FIELD field_12642 sound Lnet/minecraft/class_6880; FIELD field_38819 seed J METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V - ARG 1 sound + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V ARG 2 category ARG 3 entity ARG 4 volume @@ -16,7 +15,7 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr ARG 6 seed METHOD method_11880 getPitch ()F METHOD method_11881 getCategory ()Lnet/minecraft/class_3419; - METHOD method_11882 getSound ()Lnet/minecraft/class_3414; + METHOD method_11882 getSound ()Lnet/minecraft/class_6880; METHOD method_11883 getEntityId ()I METHOD method_11885 getVolume ()F METHOD method_43235 getSeed ()J diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 9de807801f..25f210e13d 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -269,11 +269,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 blockEntity METHOD method_8442 getSkyAngleRadians (F)F ARG 1 tickDelta - METHOD method_8449 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFJ)V + METHOD method_8449 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;FFJ)V ARG 1 except COMMENT the player that should not receive the sound, or {@code null} ARG 2 entity - ARG 3 sound ARG 4 category ARG 5 volume ARG 6 pitch