From e6b8db82124c0e1e4f0beef5be3e0a5683b3dedf Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 8 Mar 2023 14:39:45 +0000 Subject: [PATCH] 1.19.4-pre4 --- build.gradle | 2 +- .../net/minecraft/client/MinecraftClient.mapping | 1 - .../client/gui/screen/CreditsScreen.mapping | 4 +--- .../client/gui/screen/GameMenuScreen.mapping | 3 --- .../multiplayer/SocialInteractionsScreen.mapping | 1 - .../option/AccessibilityOptionsScreen.mapping | 1 - .../gui/screen/option/TelemetryInfoScreen.mapping | 1 - .../screen/report/AbuseReportReasonScreen.mapping | 1 - .../screen/RealmsSubscriptionInfoScreen.mapping | 1 - .../realms/gui/screen/RealmsTermsScreen.mapping | 1 - mappings/net/minecraft/client/util/Bans.mapping | 1 - .../ai/goal/StepAndDestroyBlockGoal.mapping | 1 - .../entity/decoration/DisplayEntity.mapping | 15 +++------------ .../entity/effect/StatusEffectInstance.mapping | 4 ---- .../net/minecraft/entity/mob/MobEntity.mapping | 2 -- .../net/minecraft/util/math/MatrixUtil.mapping | 11 +++-------- 16 files changed, 8 insertions(+), 42 deletions(-) diff --git a/build.gradle b/build.gradle index 2a29a2e229..6655a5edc1 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.19.4-pre3" +def minecraft_version = "1.19.4-pre4" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 450c7d1634..0d9597c8e1 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -521,7 +521,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT @see MinecraftClient#getChatRestriction() FIELD field_28944 description Lnet/minecraft/class_2561; FIELD field_39456 MORE_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_39457 JAVA_ACCOUNT_SETTINGS_URL Ljava/lang/String; METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;)V ARG 3 description METHOD method_33885 getDescription ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping index 2a367561ad..cfab3c207f 100644 --- a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -17,10 +17,8 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen FIELD field_34011 pressedCtrlKeys Lit/unimi/dsi/fastutil/ints/IntSet; FIELD field_34012 CTRL_KEY_SPEED_MULTIPLIER F FIELD field_41848 logoDrawer Lnet/minecraft/class_8020; - METHOD (ZLnet/minecraft/class_8020;Ljava/lang/Runnable;)V + METHOD (ZLjava/lang/Runnable;)V ARG 1 endCredits - ARG 2 logoDrawer - ARG 3 finishAction METHOD method_2257 closeScreen ()V METHOD method_2258 renderBackground (Lnet/minecraft/class_4587;)V ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping index 3834d344cf..c8b3faafb4 100644 --- a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_433 net/minecraft/client/gui/screen/GameMenuScreen FIELD field_19319 showMenu Z - FIELD field_32257 SNAPSHOT_FEEDBACK_URL Ljava/lang/String; - FIELD field_32258 JAVA_FEEDBACK_URL Ljava/lang/String; - FIELD field_32259 SNAPSHOT_BUGS_URL Ljava/lang/String; FIELD field_40792 exitButton Lnet/minecraft/class_4185; FIELD field_41611 RETURN_TO_MENU_TEXT Lnet/minecraft/class_2561; FIELD field_41612 DISCONNECT_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping index 53b6de43fd..db1dd61e2d 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26917 EMPTY_SEARCH_TEXT Lnet/minecraft/class_2561; FIELD field_26918 EMPTY_BLOCKED_TEXT Lnet/minecraft/class_2561; FIELD field_26919 BLOCKING_TEXT Lnet/minecraft/class_2561; - FIELD field_32423 BLOCKING_URL Ljava/lang/String; METHOD method_31350 updateServerLabel (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_31351 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping index aa947671d3..26e39c9878 100644 --- a/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen - FIELD field_32235 GUIDE_URL Ljava/lang/String; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping index b999f3be74..71cde4ef9a 100644 --- a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryInfoScreen FIELD field_41367 MARGIN I - FIELD field_41368 FEEDBACK_URL Ljava/lang/String; FIELD field_41369 TITLE_TEXT Lnet/minecraft/class_2561; FIELD field_41370 DESCRIPTION_TEXT Lnet/minecraft/class_2561; FIELD field_41371 GIVE_FEEDBACK_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping index 1ef927c00a..68e2f963af 100644 --- a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/report/AbuseRepor FIELD field_39733 DONE_BUTTON_HEIGHT I FIELD field_39734 SCREEN_WIDTH I FIELD field_39735 TOP_MARGIN I - FIELD field_39753 ABOUT_JAVA_REPORTING_URL Ljava/lang/String; FIELD field_39754 READ_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_39778 reason Lnet/minecraft/class_7573; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7573;Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping index d2767ab0f7..42578384e1 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs FIELD field_26520 MONTHS_TEXT Lnet/minecraft/class_2561; FIELD field_26521 DAY_TEXT Lnet/minecraft/class_2561; FIELD field_26522 DAYS_TEXT Lnet/minecraft/class_2561; - FIELD field_32127 EXTEND_JAVA_REALMS_URL Ljava/lang/String; FIELD field_34033 UNKNOWN_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V ARG 1 parent diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping index e9b860cdf9..4bc3962fa3 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_4426 net/minecraft/client/realms/gui/screen/RealmsTerm FIELD field_20167 mainScreen Lnet/minecraft/class_4325; FIELD field_20168 realmsServer Lnet/minecraft/class_4877; FIELD field_20170 onLink Z - FIELD field_20171 realmsToSUrl Ljava/lang/String; FIELD field_22727 parent Lnet/minecraft/class_437; FIELD field_26523 TITLE Lnet/minecraft/class_2561; FIELD field_26524 SENTENCE_ONE_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/util/Bans.mapping b/mappings/net/minecraft/client/util/Bans.mapping index 89092037b0..4f0b2ec097 100644 --- a/mappings/net/minecraft/client/util/Bans.mapping +++ b/mappings/net/minecraft/client/util/Bans.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_7588 net/minecraft/client/util/Bans - FIELD field_39719 JAVA_MODERATION_URL Ljava/lang/String; FIELD field_39720 TEMPORARY_TITLE Lnet/minecraft/class_2561; FIELD field_39721 PERMANENT_TITLE Lnet/minecraft/class_2561; METHOD method_44651 getTitle (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping index afe60977da..8ff0c06dd1 100644 --- a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_1382 net/minecraft/entity/ai/goal/StepAndDestroyBlockG ARG 2 mob ARG 3 speed ARG 5 maxYDifference - METHOD method_20307 hasAvailableTarget ()Z METHOD method_6307 tickStepping (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping index 8e530eb51f..3737e57bc1 100644 --- a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping @@ -53,8 +53,6 @@ CLASS net/minecraft/class_8113 net/minecraft/entity/decoration/DisplayEntity ARG 1 delta METHOD method_48853 setInterpolationDuration (I)V ARG 1 interpolationDuration - METHOD method_48854 (Lnet/minecraft/class_2945;)V - ARG 1 transformation METHOD method_48856 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 billboard METHOD method_48857 lerpShadowStrength (F)F @@ -132,8 +130,7 @@ CLASS net/minecraft/class_8113 net/minecraft/entity/decoration/DisplayEntity FIELD field_42418 value Ljava/lang/Object; METHOD (Ljava/lang/Object;)V ARG 1 value - METHOD method_48890 setValue (Ljava/lang/Object;)V - ARG 1 value + METHOD method_48890 setValue (FLjava/lang/Object;)V CLASS class_8121 Interpolators FIELD field_42419 interpolatedIds Lit/unimi/dsi/fastutil/ints/IntSet; FIELD field_42420 interpolators Ljava/util/List; @@ -142,13 +139,9 @@ CLASS net/minecraft/class_8113 net/minecraft/entity/decoration/DisplayEntity METHOD method_48892 addInterpolator (Lnet/minecraft/class_2940;Lnet/minecraft/class_8113$class_8120;)V ARG 1 data ARG 2 interpolator - METHOD method_48893 interpolate (Lnet/minecraft/class_2945;)V - ARG 1 dataTracker - METHOD method_48894 (Lnet/minecraft/class_8113$class_8120;Lnet/minecraft/class_2940;Lnet/minecraft/class_2945;)V - ARG 2 dataTracker - METHOD method_48895 addInterpolator (Ljava/util/Set;Ljava/util/function/Consumer;)V + METHOD method_48893 interpolate (FLnet/minecraft/class_2945;)V + METHOD method_48895 addInterpolator (Ljava/util/Set;Lnet/minecraft/class_8113$class_8217;)V ARG 1 dataSet - ARG 2 interpolator CLASS class_8122 ItemDisplayEntity FIELD field_42421 ITEM_NBT_KEY Ljava/lang/String; FIELD field_42422 ITEM_DISPLAY_NBT_KEY Ljava/lang/String; @@ -192,8 +185,6 @@ CLASS net/minecraft/class_8113 net/minecraft/entity/decoration/DisplayEntity ARG 1 nbt ARG 2 nbtKey ARG 3 flag - METHOD method_48904 (Lnet/minecraft/class_2945;)V - ARG 1 dataTracker METHOD method_48905 splitLines (Lnet/minecraft/class_8113$class_8123$class_8127;)Lnet/minecraft/class_8113$class_8123$class_8125; ARG 1 splitter METHOD method_48907 writeFlag (BLnet/minecraft/class_2487;Ljava/lang/String;B)V diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 78bf451360..65d37b6b7f 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -45,8 +43,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 6 showIcon ARG 7 hiddenEffect ARG 8 factorCalculationData - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 10947d3a49..b86469a237 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -143,8 +143,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_42150 isInAttackRange (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_42646 getItemPickUpRangeExpander ()Lnet/minecraft/class_2382; - METHOD method_46644 getSlotToEquip (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304; - ARG 1 stack METHOD method_47824 (Lnet/minecraft/class_1352;)Z ARG 0 goal METHOD method_47825 clearGoals (Ljava/util/function/Predicate;)V diff --git a/mappings/net/minecraft/util/math/MatrixUtil.mapping b/mappings/net/minecraft/util/math/MatrixUtil.mapping index 446f1d12f6..f34a22732f 100644 --- a/mappings/net/minecraft/util/math/MatrixUtil.mapping +++ b/mappings/net/minecraft/util/math/MatrixUtil.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_7837 net/minecraft/util/math/MatrixUtil FIELD field_40746 COT_PI_OVER_8 F - FIELD field_40747 COS_PI_OVER_8 F - FIELD field_40748 SIN_PI_OVER_8 F - METHOD method_46410 qrGivensQuaternion (FF)Lcom/mojang/datafixers/util/Pair; + METHOD method_46410 qrGivensQuaternion (FF)Lnet/minecraft/class_8218; COMMENT Computes the Givens quaternion for a QR factorization. COMMENT See Algorithm 4 of COMMENT https://pages.cs.wisc.edu/~sifakis/papers/SVD_TR1690.pdf. @@ -10,7 +8,7 @@ CLASS net/minecraft/class_7837 net/minecraft/util/math/MatrixUtil COMMENT @return a pair {@code (c, s) = (cos(theta), sin(theta))} ARG 0 a1 ARG 1 a2 - METHOD method_46411 approximateGivensQuaternion (FFF)Lcom/mojang/datafixers/util/Pair; + METHOD method_46411 approximateGivensQuaternion (FFF)Lnet/minecraft/class_8218; COMMENT Computes the approximate Givens rotation factors {@code (c, s) = (cos(phi), sin(phi))} for a 2×2 matrix. COMMENT See Algorithm 4 of COMMENT https://pages.cs.wisc.edu/~sifakis/papers/SVD_TR1690.pdf. @@ -27,10 +25,7 @@ CLASS net/minecraft/class_7837 net/minecraft/util/math/MatrixUtil COMMENT See Algorithm 4 of COMMENT https://pages.cs.wisc.edu/~sifakis/papers/SVD_TR1690.pdf. ARG 0 A - METHOD method_46413 affineTransform (Lorg/joml/Matrix4f;)Lorg/joml/Matrix4x3f; - ARG 0 matrix METHOD method_46414 scale (Lorg/joml/Matrix4f;F)Lorg/joml/Matrix4f; ARG 0 matrix ARG 1 scalar - METHOD method_46415 applyJacobiIteration (Lorg/joml/Matrix3f;)Lorg/joml/Quaternionf; - ARG 0 S + METHOD method_46415 applyJacobiIteration (Lorg/joml/Matrix3f;Lorg/joml/Matrix3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;)V