diff --git a/build.gradle b/build.gradle index 412fbe15d2..d7784bb83b 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w04a" +def minecraft_version = "23w05a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/class_8100.mapping b/mappings/net/minecraft/class_8100.mapping new file mode 100644 index 0000000000..ec1e58b7fd --- /dev/null +++ b/mappings/net/minecraft/class_8100.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8100 + CLASS class_4539 Mode + FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping index e75c5b0314..20906fdf69 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping @@ -9,9 +9,5 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo FIELD field_42038 isNarratorUsable Z METHOD (Lnet/minecraft/class_315;)V ARG 1 gameOptions - METHOD method_48257 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_48258 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_48259 yMargin ()I METHOD method_48260 tickNarratorPrompt ()V diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index 7e3806a5a4..449db56034 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen FIELD field_17774 PANORAMA_CUBE_MAP Lnet/minecraft/class_751; FIELD field_17775 PANORAMA_OVERLAY Lnet/minecraft/class_2960; FIELD field_18222 doBackgroundFade Z - FIELD field_19102 ACCESSIBILITY_ICON_TEXTURE Lnet/minecraft/class_2960; FIELD field_23775 LOGGER Lorg/slf4j/Logger; FIELD field_2585 backgroundRenderer Lnet/minecraft/class_766; FIELD field_2586 splashText Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index ad6da8e77f..27a4ebb805 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -24,18 +24,6 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc ARG 2 client ARG 3 advancement ARG 4 display - METHOD method_2321 drawTextureRepeatedly (Lnet/minecraft/class_4587;IIIIIIII)V - COMMENT Draws a textured rectangle repeatedly to cover the area of {@code - COMMENT width} and {@code height}. The last texture is clipped to fit the area. - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 u - ARG 7 v - ARG 8 textureWidth - ARG 9 textureHeight METHOD method_2322 addChild (Lnet/minecraft/class_456;)V ARG 1 widget METHOD method_2323 renderLines (Lnet/minecraft/class_4587;IIZ)V @@ -43,21 +31,6 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc ARG 2 x ARG 3 y ARG 4 border - METHOD method_2324 renderDescriptionBackground (Lnet/minecraft/class_4587;IIIIIIIII)V - COMMENT Renders the description background. - COMMENT - COMMENT @implNote This splits the area into 9 parts (4 corners, 4 edges and 1 - COMMENT central box) and draws each of them. - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 cornerSize - ARG 7 textureWidth - ARG 8 textureHeight - ARG 9 u - ARG 10 v METHOD method_2325 renderWidgets (Lnet/minecraft/class_4587;II)V ARG 1 matrices ARG 2 x diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping index 3d187cb1c4..53b6de43fd 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -38,7 +38,6 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_31357 onSearchChange (Ljava/lang/String;)V ARG 1 currentSearch METHOD method_31359 getScreenHeight ()I - METHOD method_31360 getRowCount ()I METHOD method_31361 getPlayerListBottom ()I METHOD method_31362 getSearchBoxX ()I METHOD method_31394 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index a2d9de104d..3227f27f7a 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -22,8 +22,6 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 5 areaCenterX ARG 6 areaCenterY ARG 7 delta - METHOD method_2618 renderGrid (Lnet/minecraft/class_4587;IIIIII)V - ARG 1 matrices CLASS class_509 AlternativeButtonWidget FIELD field_3114 recipe Lnet/minecraft/class_1860; FIELD field_3115 craftable Z diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index bd74bf160f..8e3fa06d34 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -1,65 +1,21 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldScreen - FIELD field_24286 difficultyButton Lnet/minecraft/class_5676; - FIELD field_24287 gameRulesButton Lnet/minecraft/class_4185; - FIELD field_24288 gameRules Lnet/minecraft/class_1928; - FIELD field_24588 moreOptionsDialog Lnet/minecraft/class_5292; FIELD field_25477 dataPackTempDir Ljava/nio/file/Path; - FIELD field_25478 dataPacksButton Lnet/minecraft/class_4185; - FIELD field_25479 dataConfiguration Lnet/minecraft/class_7712; FIELD field_25480 LOGGER Lorg/slf4j/Logger; FIELD field_25792 packManager Lnet/minecraft/class_3283; FIELD field_25898 GAME_MODE_TEXT Lnet/minecraft/class_2561; - FIELD field_26598 ENTER_SEED_TEXT Lnet/minecraft/class_2561; - FIELD field_26599 SEED_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_26600 ENTER_NAME_TEXT Lnet/minecraft/class_2561; - FIELD field_26601 RESULT_FOLDER_TEXT Lnet/minecraft/class_2561; - FIELD field_26602 ALLOW_COMMANDS_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_27998 currentDifficulty Lnet/minecraft/class_1267; - FIELD field_3178 hardcore Z - FIELD field_3179 tweakedCheats Z - FIELD field_3182 enableCheatsButton Lnet/minecraft/class_5676; - FIELD field_3185 lastMode Lnet/minecraft/class_525$class_4539; - FIELD field_3186 gameModeSwitchButton Lnet/minecraft/class_5676; FIELD field_3187 parent Lnet/minecraft/class_437; - FIELD field_3188 levelNameField Lnet/minecraft/class_342; - FIELD field_3192 cheatsEnabled Z - FIELD field_3193 moreOptionsButton Lnet/minecraft/class_4185; - FIELD field_3194 firstGameModeDescriptionLine Lnet/minecraft/class_2561; - FIELD field_3195 levelName Ljava/lang/String; FIELD field_3196 saveDirectoryName Ljava/lang/String; - FIELD field_3199 secondGameModeDescriptionLine Lnet/minecraft/class_2561; - FIELD field_3201 currentMode Lnet/minecraft/class_525$class_4539; - FIELD field_3202 moreOptionsOpen Z - FIELD field_3205 createLevelButton Lnet/minecraft/class_4185; FIELD field_32434 TEMP_DIR_PREFIX Ljava/lang/String; FIELD field_37911 PREPARING_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7712;Lnet/minecraft/class_5292;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V ARG 1 parent - ARG 2 dataConfiguration - ARG 3 moreOptionsDialog - METHOD method_19416 (Ljava/lang/String;)V - ARG 1 levelName METHOD method_19921 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19922 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19923 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V - ARG 1 mode - METHOD method_2710 setMoreOptionsOpen (Z)V - ARG 1 moreOptionsOpen - METHOD method_2721 toggleMoreOptions ()V - METHOD method_2722 updateSettingsLabels ()V - METHOD method_2727 updateSaveFolderName ()V + METHOD method_2727 updateSaveFolderName (Ljava/lang/String;)V METHOD method_2736 createLevel ()V - METHOD method_27614 (Lnet/minecraft/class_1928;)V - ARG 1 gameRules - METHOD method_27615 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_27616 (Ljava/util/Optional;)V - ARG 1 optionalGameRules - METHOD method_28084 setMoreOptionsOpen ()V METHOD method_29682 applyDataPacks (Lnet/minecraft/class_3283;)V ARG 1 dataPackManager METHOD method_29685 copyDataPack (Ljava/nio/file/Path;Lnet/minecraft/class_310;)Ljava/nio/file/Path; @@ -75,32 +31,16 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 dataPackFile METHOD method_29689 (Ljava/nio/file/Path;)V ARG 0 path - METHOD method_29692 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_29693 getDataPackTempDir ()Ljava/nio/file/Path; - METHOD method_29694 openPackScreen ()V + METHOD method_29694 openPackScreen (Lnet/minecraft/class_7712;)V METHOD method_29695 clearDataPackTempDir ()V METHOD method_29983 (Ljava/util/List;Ljava/lang/String;)Z ARG 1 name - METHOD method_30296 getScannedPack ()Lcom/mojang/datafixers/util/Pair; + METHOD method_30296 getScannedPack (Lnet/minecraft/class_7712;)Lcom/mojang/datafixers/util/Pair; METHOD method_30297 onCloseScreen ()V METHOD method_31130 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V ARG 0 client ARG 1 parent - METHOD method_32667 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 0 button - METHOD method_32668 (Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V - ARG 1 button - ARG 2 difficulty - METHOD method_32669 (Lnet/minecraft/class_5676;Lnet/minecraft/class_525$class_4539;)V - ARG 1 button - ARG 2 mode - METHOD method_32670 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 cheatsEnabled - METHOD method_32671 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 1 button - METHOD method_32672 getDifficulty ()Lnet/minecraft/class_1267; METHOD method_40212 create (Lnet/minecraft/class_437;Lnet/minecraft/class_1940;Lnet/minecraft/class_7193;Ljava/nio/file/Path;)Lnet/minecraft/class_525; ARG 0 parent ARG 1 levelInfo @@ -140,21 +80,9 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 3 context METHOD method_45682 (Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; ARG 1 json - METHOD method_45684 (Lnet/minecraft/class_7193;)V - ARG 1 generatorOptionsHolder METHOD method_45685 (Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object; ARG 1 void_ ARG 2 throwable METHOD method_45686 (Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; ARG 0 context - METHOD method_45688 (Z)V - ARG 1 confirmed - CLASS class_4539 Mode - FIELD field_20628 translationSuffix Ljava/lang/String; - FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; - FIELD field_27999 text Lnet/minecraft/class_2561; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_1934;)V - ARG 3 translationSuffix - ARG 4 defaultGameMode - METHOD method_32673 asText ()Lnet/minecraft/class_2561; CLASS class_7749 WorldCreationSettings diff --git a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping index 5a71254960..d3e5cbe926 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScreen FIELD field_23776 LOGGER Lorg/slf4j/Logger; FIELD field_23777 storageSession Lnet/minecraft/class_32$class_5143; - FIELD field_25481 GSON Lcom/google/gson/Gson; FIELD field_26603 ENTER_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_3168 saveButton Lnet/minecraft/class_4185; FIELD field_3169 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; @@ -31,12 +30,6 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr ARG 1 button METHOD method_27030 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_29067 (Lcom/mojang/serialization/DataResult$PartialResult;)V - ARG 0 result - METHOD method_29068 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_29699 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 1 json METHOD method_29784 onBackupConfirm (Lnet/minecraft/class_32;Ljava/lang/String;)V ARG 0 storage ARG 1 levelName diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping deleted file mode 100644 index 7c1bf31eb9..0000000000 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ /dev/null @@ -1,102 +0,0 @@ -CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptionsDialog - FIELD field_24589 bonusItemsButton Lnet/minecraft/class_5676; - FIELD field_24592 textRenderer Lnet/minecraft/class_327; - FIELD field_24593 parentWidth I - FIELD field_24594 seedTextField Lnet/minecraft/class_342; - FIELD field_24595 mapFeaturesButton Lnet/minecraft/class_5676; - FIELD field_24596 mapTypeButton Lnet/minecraft/class_5676; - FIELD field_24597 customizeTypeButton Lnet/minecraft/class_4185; - FIELD field_24598 generatorOptionsHolder Lnet/minecraft/class_7193; - FIELD field_24600 seed Ljava/util/OptionalLong; - FIELD field_25046 LOGGER Lorg/slf4j/Logger; - FIELD field_25047 CUSTOM_TEXT Lnet/minecraft/class_2561; - FIELD field_25048 importSettingsButton Lnet/minecraft/class_4185; - FIELD field_25049 presetEntry Ljava/util/Optional; - FIELD field_26604 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_28000 SELECT_SETTINGS_FILE_TEXT Lnet/minecraft/class_2561; - FIELD field_28001 unchangeableMapTypeButton Lnet/minecraft/class_4185; - FIELD field_35754 AMPLIFIED_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_35755 amplifiedInfoText Lnet/minecraft/class_5489; - METHOD (Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V - ARG 1 generatorOptionsHolder - ARG 2 presetKey - ARG 3 seed - METHOD method_28085 isDebugWorld ()Z - METHOD method_28086 setGeneratorOptionsHolder (Lnet/minecraft/class_7193;)V - ARG 1 generatorOptionsHolder - METHOD method_28087 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V - ARG 3 button - METHOD method_28092 init (Lnet/minecraft/class_525;Lnet/minecraft/class_310;Lnet/minecraft/class_327;)V - ARG 1 parent - ARG 2 client - ARG 3 textRenderer - METHOD method_28096 getGeneratorOptionsHolder (ZZ)Lnet/minecraft/class_5285; - ARG 1 debug - ARG 2 hardcore - METHOD method_28100 (Ljava/lang/String;)V - ARG 1 seedText - METHOD method_28101 setVisible (Z)V - ARG 1 visible - METHOD method_29071 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V - ARG 3 button - METHOD method_29073 importOptions (Lnet/minecraft/class_5285;Lnet/minecraft/class_7723;)V - ARG 1 generatorOptions - ARG 2 dimensionsRegistryHolder - METHOD method_29700 getRegistryManager ()Lnet/minecraft/class_5455; - METHOD method_32676 (Lnet/minecraft/class_4185;)V - ARG 0 button - METHOD method_32678 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 bonusChest - METHOD method_32679 (Lnet/minecraft/class_525;Lnet/minecraft/class_5676;Lnet/minecraft/class_6880;)V - ARG 2 button - ARG 3 presetEntry - METHOD method_32680 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 0 button - METHOD method_32682 disableBonusItems ()V - METHOD method_32683 setMapTypeButtonVisible (Z)V - ARG 1 visible - METHOD method_32684 enableBonusItems ()V - METHOD method_37090 tickSeedTextField ()V - METHOD method_39664 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 0 button - METHOD method_41867 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7726;)V - ARG 1 result - ARG 4 worldGenSettings - METHOD method_41868 apply (Lnet/minecraft/class_7193$class_7194;)V - ARG 1 modifier - METHOD method_41869 apply (Lnet/minecraft/class_7193$class_7195;)V - ARG 1 modifier - METHOD method_41870 createPresetEntry (Lnet/minecraft/class_7193;Ljava/util/Optional;)Ljava/util/Optional; - ARG 0 generatorOptionsHolder - ARG 1 presetKey - METHOD method_41871 (Lnet/minecraft/class_7193;Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - METHOD method_41872 isAmplified (Lnet/minecraft/class_6880;)Z - ARG 0 presetEntry - METHOD method_41873 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7723;)Lnet/minecraft/class_7723; - ARG 1 dynamicRegistryManager - ARG 2 dimensionsRegistryHolder - METHOD method_41874 (Lnet/minecraft/class_6885$class_6888;)Ljava/util/List; - ARG 0 entryList - METHOD method_41876 collectPresets (Lnet/minecraft/class_2378;Lnet/minecraft/class_6862;)Ljava/util/Optional; - ARG 0 presetRegistry - ARG 1 tag - METHOD method_41877 (Ljava/util/List;)Z - ARG 0 entries - METHOD method_41878 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; - ARG 0 key - METHOD method_41882 getText (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561; - ARG 0 presetEntry - METHOD method_41883 (Lnet/minecraft/class_5321;)Z - ARG 0 key - METHOD method_41884 getGeneratorOptionsHolder ()Lnet/minecraft/class_7193; - METHOD method_45691 (Ljava/lang/Boolean;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; - ARG 1 generationOptions - METHOD method_45692 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 structures - METHOD method_45693 (Ljava/lang/Boolean;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; - ARG 1 generatorOptions - METHOD method_47654 toString (Ljava/util/OptionalLong;)Ljava/lang/String; - ARG 0 seed diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index f85d0ff7df..eaa1e1bbbf 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -50,11 +50,9 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 3 mouseY METHOD method_25358 setWidth (I)V ARG 1 width - METHOD method_25359 renderButton (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_25359 renderButton (Lnet/minecraft/class_4587;II)V ARG 2 mouseX ARG 3 mouseY - ARG 4 delta METHOD method_25360 getNarrationMessage ()Lnet/minecraft/class_5250; METHOD method_25361 clicked (DD)Z ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/widget/TextWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextWidget.mapping index 527fea2782..60a5b7b059 100644 --- a/mappings/net/minecraft/client/gui/widget/TextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextWidget.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_7842 net/minecraft/client/gui/widget/TextWidget ARG 3 width ARG 4 height ARG 5 message - ARG 6 textRenderer METHOD (IILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V ARG 1 width ARG 2 height diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index 6827085e63..a7e6a7c5ce 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -38,16 +38,4 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 item ARG 2 secondLayer ARG 3 overlay - METHOD method_48482 renderTrim (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;ZLnet/minecraft/class_572;ZFFF)V - ARG 1 matrices - ARG 2 vertexConsumers - ARG 3 light - ARG 4 trim - ARG 5 glint - ARG 6 model - ARG 7 secondTextureLayer - ARG 8 red - ARG 9 green - ARG 10 blue - METHOD method_48483 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZLnet/minecraft/class_572;ZLnet/minecraft/class_8053;)V - ARG 7 trim + METHOD method_48482 renderTrim (Lnet/minecraft/class_1741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;ZLnet/minecraft/class_572;ZFFF)V diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping index 4b1cdb6543..3b6ac6ed79 100644 --- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -27,15 +27,10 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator METHOD method_48518 suffixTrim (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 1 id ARG 2 trimMaterialName - METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Ljava/util/List;)Lcom/google/gson/JsonObject; + METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_1741;)Lcom/google/gson/JsonObject; ARG 1 id ARG 2 textures - ARG 3 trimMaterials - METHOD method_48520 getCompatibleTrimMaterials (Lnet/minecraft/class_1738;)Ljava/util/List; - ARG 1 armor - METHOD method_48521 (Lnet/minecraft/class_1738;Lnet/minecraft/class_4915$class_8072;)Z - ARG 1 material - METHOD method_48522 (Ljava/util/List;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + METHOD method_48522 (Lnet/minecraft/class_1738;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; ARG 2 id ARG 3 textures METHOD method_48523 registerArmor (Lnet/minecraft/class_1738;)V diff --git a/mappings/net/minecraft/data/client/Models.mapping b/mappings/net/minecraft/data/client/Models.mapping index bbc34ad4f0..15d878b479 100644 --- a/mappings/net/minecraft/data/client/Models.mapping +++ b/mappings/net/minecraft/data/client/Models.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4943 net/minecraft/data/client/Models FIELD field_22908 PARTICLE Lnet/minecraft/class_4942; FIELD field_22958 STEM_GROWTH_STAGES [Lnet/minecraft/class_4942; - FIELD field_42088 ARMOR Lnet/minecraft/class_4942; METHOD method_25855 block (Ljava/lang/String;Ljava/lang/String;[Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942; ARG 0 parent ARG 1 variant diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 83713683c8..9b6dcf64b5 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_36332 LOGGER Lorg/slf4j/Logger; FIELD field_37421 experienceDroppingDisabled Z FIELD field_6210 bodyTrackingIncrements I - FIELD field_6211 lastLimbDistance F FIELD field_6212 sidewaysSpeed F FIELD field_6213 deathTime I FIELD field_6214 POTION_SWIRLS_AMBIENT Lnet/minecraft/class_2940; @@ -33,7 +32,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6221 serverPitch D FIELD field_6222 itemUseTimeLeft I FIELD field_6224 serverX D - FIELD field_6225 limbDistance F FIELD field_6226 lastDamageTime J FIELD field_6227 upwardSpeed F FIELD field_6228 jumpingCooldown I @@ -57,7 +55,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6246 absorptionAmount F FIELD field_6247 HEALTH Lnet/minecraft/class_2940; FIELD field_6248 syncedArmorStacks Lnet/minecraft/class_2371; - FIELD field_6249 limbAngle F FIELD field_6250 forwardSpeed F FIELD field_6251 handSwingProgress F FIELD field_6252 handSwinging Z @@ -248,9 +245,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_28305 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 brain METHOD method_28306 createBrainProfile ()Lnet/minecraft/class_4095$class_5303; - METHOD method_29242 updateLimbs (Lnet/minecraft/class_1309;Z)V - ARG 1 entity - ARG 2 flutter + METHOD method_29242 updateLimbs (Z)V METHOD method_29499 triggerItemPickedUpByEntityCriteria (Lnet/minecraft/class_1542;)V COMMENT Called to trigger advancement criteria when an entity picks up an item COMMENT thrown by a player. diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index dbc894a0ae..688bd18f67 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -58,8 +58,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_42129 getFactorCalculationData ()Ljava/util/Optional; - METHOD method_42130 (ILnet/minecraft/class_1293$class_7247;)V - ARG 2 factorCalculationData METHOD method_42131 (Lnet/minecraft/class_1293$class_7247;)V ARG 1 factorCalculationData METHOD method_42132 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1293$class_7247;)V @@ -90,7 +88,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_38086 paddingDuration I FIELD field_38087 factorTarget F FIELD field_38088 factorCurrent F - FIELD field_38089 effectChangedTimestamp I FIELD field_38090 factorPreviousFrame F FIELD field_38091 hadEffectLastTick Z FIELD field_39111 factorStart F @@ -110,7 +107,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_42135 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Boolean; ARG 0 data METHOD method_42136 update (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD method_42137 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_42138 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping index c9defa8b5b..4104e9dc6d 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping @@ -16,6 +16,6 @@ CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil ARG 0 entity METHOD method_5576 hasHaste (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_5577 durationToString (Lnet/minecraft/class_1293;F)Ljava/lang/String; + METHOD method_5577 durationToString (Lnet/minecraft/class_1293;F)Lnet/minecraft/class_2561; ARG 0 effect ARG 1 multiplier diff --git a/mappings/net/minecraft/entity/passive/CamelEntity.mapping b/mappings/net/minecraft/entity/passive/CamelEntity.mapping index d85af493af..33bcebcb4f 100644 --- a/mappings/net/minecraft/entity/passive/CamelEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CamelEntity.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity FIELD field_40138 idleAnimationCooldown I FIELD field_40139 DASHING Lnet/minecraft/class_2940; FIELD field_40140 LAST_POSE_TICK Lnet/minecraft/class_2940; - FIELD field_40141 walkingAnimationState Lnet/minecraft/class_7094; FIELD field_40142 sittingTransitionAnimationState Lnet/minecraft/class_7094; FIELD field_40143 standingTransitionAnimationState Lnet/minecraft/class_7094; FIELD field_40144 idlingAnimationState Lnet/minecraft/class_7094; diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index f38b9bb9b2..d5e451442b 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity FIELD field_37451 longJumpingAnimationState Lnet/minecraft/class_7094; FIELD field_37452 croakingAnimationState Lnet/minecraft/class_7094; FIELD field_37453 usingTongueAnimationState Lnet/minecraft/class_7094; - FIELD field_37454 walkingAnimationState Lnet/minecraft/class_7094; - FIELD field_37455 swimmingAnimationState Lnet/minecraft/class_7094; FIELD field_37456 idlingInWaterAnimationState Lnet/minecraft/class_7094; FIELD field_37457 VARIANT Lnet/minecraft/class_2940; FIELD field_37458 TARGET Lnet/minecraft/class_2940; @@ -16,8 +14,6 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity METHOD method_41353 setVariant (Lnet/minecraft/class_7106;)V ARG 1 variant METHOD method_41355 createFrogAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_41356 shouldWalk ()Z - METHOD method_41357 shouldSwim ()Z METHOD method_41358 isValidFrogFood (Lnet/minecraft/class_1309;)Z ARG 0 entity METHOD method_41359 clearFrogTarget ()V diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index fef3f8983e..2fc5c22ef5 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial ARG 1 type METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I ARG 1 type - METHOD method_48404 isTrimmable ()Z METHOD method_7694 getName ()Ljava/lang/String; METHOD method_7695 getRepairIngredient ()Lnet/minecraft/class_1856; METHOD method_7698 getEquipSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping index 39da9d54bc..e68e18b10f 100644 --- a/mappings/net/minecraft/item/ArmorMaterials.mapping +++ b/mappings/net/minecraft/item/ArmorMaterials.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials FIELD field_41941 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_41942 BASE_DURABILITY Ljava/util/EnumMap; FIELD field_41943 protectionAmounts Ljava/util/EnumMap; - FIELD field_41944 trimmable Z FIELD field_7883 durabilityMultiplier I FIELD field_7884 name Ljava/lang/String; FIELD field_7885 repairIngredientSupplier Lnet/minecraft/class_3528; @@ -11,7 +10,7 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials FIELD field_7887 CHAIN Lnet/minecraft/class_1740; FIELD field_7894 toughness F FIELD field_7896 enchantability I - METHOD (Ljava/lang/String;ILjava/lang/String;ILjava/util/EnumMap;ILnet/minecraft/class_3414;FFLjava/util/function/Supplier;Z)V + METHOD (Ljava/lang/String;ILjava/lang/String;ILjava/util/EnumMap;ILnet/minecraft/class_3414;FFLjava/util/function/Supplier;)V ARG 3 name ARG 4 durabilityMultiplier ARG 5 protectionAmounts @@ -20,7 +19,6 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials ARG 8 toughness ARG 9 knockbackResistance ARG 10 repairIngredientSupplier - ARG 11 trimmable METHOD method_48405 (Ljava/util/EnumMap;)V ARG 0 map METHOD method_48406 (Ljava/util/EnumMap;)V diff --git a/mappings/net/minecraft/item/Wearable.mapping b/mappings/net/minecraft/item/Wearable.mapping deleted file mode 100644 index 2921ee4e8f..0000000000 --- a/mappings/net/minecraft/item/Wearable.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5151 net/minecraft/item/Wearable - COMMENT Represents a type of item that is wearable in an armor equipment slot. - COMMENT - COMMENT

This type of item can be targeted by the {@code minecraft:binding_curse} enchantment. diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping index 4582cfbc9d..9ba8a679a3 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -5,11 +5,8 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim FIELD field_41997 UPGRADE_TEXT Lnet/minecraft/class_2561; FIELD field_41998 material Lnet/minecraft/class_6880; FIELD field_41999 pattern Lnet/minecraft/class_6880; - FIELD field_42000 leggingsModelIdGetter Ljava/util/function/Supplier; - FIELD field_42001 genericModelIdGetter Ljava/util/function/Supplier; - METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V - ARG 1 material - ARG 2 pattern + FIELD field_42000 leggingsModelIdGetter Ljava/util/function/Function; + FIELD field_42001 genericModelIdGetter Ljava/util/function/Function; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_48424 getPattern ()Lnet/minecraft/class_6880; @@ -32,5 +29,5 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim METHOD method_48431 getMaterial ()Lnet/minecraft/class_6880; METHOD method_48433 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path - METHOD method_48434 getLeggingsModelId ()Lnet/minecraft/class_2960; - METHOD method_48436 getGenericModelId ()Lnet/minecraft/class_2960; + METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; + METHOD method_48436 getGenericModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping index 3a1d1f365c..2a61bcc8a1 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_8054 net/minecraft/item/trim/ArmorTrimMaterial FIELD field_42002 CODEC Lcom/mojang/serialization/Codec; FIELD field_42003 ENTRY_CODEC Lcom/mojang/serialization/Codec; - METHOD method_48438 of (Ljava/lang/String;Lnet/minecraft/class_1792;FLjava/util/Optional;Lnet/minecraft/class_2561;)Lnet/minecraft/class_8054; + METHOD method_48438 of (Ljava/lang/String;Lnet/minecraft/class_1792;FLnet/minecraft/class_2561;Ljava/util/Map;)Lnet/minecraft/class_8054; ARG 0 assetName ARG 1 ingredient ARG 2 itemModelIndex - ARG 3 incompatibleArmorMaterial - ARG 4 description diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping index be1d624c22..9fcc573b7f 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping @@ -8,12 +8,11 @@ CLASS net/minecraft/class_8055 net/minecraft/item/trim/ArmorTrimMaterials ARG 0 id METHOD method_48442 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 registry - METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;FLjava/util/Optional;)V + METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;FLjava/util/Map;)V ARG 0 registry ARG 1 key ARG 2 ingredient ARG 3 style ARG 4 itemModelIndex - ARG 5 incompatibleArmorMaterial METHOD method_48444 oneTwentyBootstrap (Lnet/minecraft/class_7891;)V ARG 0 registry diff --git a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping index 6f1d4b3d71..a5ebcd8590 100644 --- a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping @@ -8,7 +8,4 @@ CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe ARG 2 template ARG 3 base ARG 4 addition - METHOD method_48458 hasIncompatibleArmorMaterial (Lnet/minecraft/class_1799;Lnet/minecraft/class_8054;)Z - ARG 1 stack - ARG 2 trimMaterial CLASS class_8063 Serializer diff --git a/mappings/net/minecraft/screen/ScreenTexts.mapping b/mappings/net/minecraft/screen/ScreenTexts.mapping index 328aada71f..780ba33471 100644 --- a/mappings/net/minecraft/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/screen/ScreenTexts.mapping @@ -27,9 +27,7 @@ CLASS net/minecraft/class_5244 net/minecraft/screen/ScreenTexts ARG 0 texts METHOD method_37110 joinLines ([Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 texts - METHOD method_37111 joinSentences (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; - ARG 0 first - ARG 1 second + METHOD method_37111 joinSentences ([Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; METHOD method_44682 days (J)Lnet/minecraft/class_5250; ARG 0 days METHOD method_44683 hours (J)Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8091.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8091.mapping new file mode 100644 index 0000000000..f627f05937 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8091.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8091 net/minecraft/unused/packageinfo/PackageInfo8091 diff --git a/mappings/net/minecraft/util/math/MatrixUtil.mapping b/mappings/net/minecraft/util/math/MatrixUtil.mapping index 2b9b0780dc..00d8d8961b 100644 --- a/mappings/net/minecraft/util/math/MatrixUtil.mapping +++ b/mappings/net/minecraft/util/math/MatrixUtil.mapping @@ -10,17 +10,10 @@ CLASS net/minecraft/class_7837 net/minecraft/util/math/MatrixUtil ARG 0 a1 ARG 1 a2 METHOD method_46411 approximateGivensQuaternion (FFF)Lcom/mojang/datafixers/util/Pair; - COMMENT Compute the approximate Givens rotation factors (c, s) = (cos(phi), sin(phi)) for a 2×2 matrix. - COMMENT - COMMENT @return a pair (c, s) = (cos(phi), sin(phi)) - COMMENT - COMMENT @see Algorithm 2 of https://pages.cs.wisc.edu/~sifakis/papers/SVD_TR1690.pdf - ARG 0 a11 - COMMENT the top-left element of the matrix - ARG 1 a12 - COMMENT the average of the two elements on the minor diagonal - ARG 2 a22 COMMENT the bottom-right element of the matrix + ARG 0 a11 + ARG 1 a12 + ARG 2 a22 METHOD method_46412 svdDecompose (Lorg/joml/Matrix3f;)Lorg/apache/commons/lang3/tuple/Triple; COMMENT Performs an approximate singular value decomposition on a 3×3 matrix. COMMENT