diff --git a/build.gradle b/build.gradle index d7784bb83b..7a366a12b9 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w05a" +def minecraft_version = "23w06a" filament { minecraftVersion = minecraft_version diff --git a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping index 3cd3ff752a..faf8035d7d 100644 --- a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping +++ b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping @@ -3,10 +3,6 @@ CLASS com/mojang/blaze3d/platform/TextureUtil ARG 0 id METHOD getDebugTexturePath (Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 path - METHOD initTexture (Ljava/nio/IntBuffer;II)V - ARG 0 imageData - ARG 1 width - ARG 2 height METHOD prepareImage (III)V ARG 0 id ARG 1 width diff --git a/mappings/net/minecraft/block/CaveVines.mapping b/mappings/net/minecraft/block/CaveVines.mapping index d890338c76..2e38800301 100644 --- a/mappings/net/minecraft/block/CaveVines.mapping +++ b/mappings/net/minecraft/block/CaveVines.mapping @@ -3,10 +3,7 @@ CLASS net/minecraft/class_5803 net/minecraft/block/CaveVines FIELD field_28688 BERRIES Lnet/minecraft/class_2746; METHOD method_33618 hasBerries (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_33619 pickBerries (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269; - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_33619 pickBerries (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269; METHOD method_37361 (ILnet/minecraft/class_2680;)I ARG 1 state METHOD method_37362 getLuminanceSupplier (I)Ljava/util/function/ToIntFunction; diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping index ccfb809aa8..5bd59426c6 100644 --- a/mappings/net/minecraft/block/ComposterBlock.mapping +++ b/mappings/net/minecraft/block/ComposterBlock.mapping @@ -9,29 +9,15 @@ CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock ARG 1 item METHOD method_17755 ([Lnet/minecraft/class_265;)V ARG 0 shapes - METHOD method_17756 addToComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 item + METHOD method_17756 addToComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2680; METHOD method_17758 registerDefaultCompostableItems ()V - METHOD method_17759 emptyComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_17759 emptyComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; METHOD method_18027 playEffects (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V ARG 0 world ARG 1 pos ARG 2 fill - METHOD method_26373 compost (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 stack - ARG 3 pos - METHOD method_26374 emptyFullComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_26373 compost (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + METHOD method_26374 emptyFullComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; CLASS class_3925 DummyInventory CLASS class_3963 ComposterInventory FIELD field_17569 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/FarmlandBlock.mapping b/mappings/net/minecraft/block/FarmlandBlock.mapping index 9d5f61476d..d864452cec 100644 --- a/mappings/net/minecraft/block/FarmlandBlock.mapping +++ b/mappings/net/minecraft/block/FarmlandBlock.mapping @@ -5,10 +5,7 @@ CLASS net/minecraft/class_2344 net/minecraft/block/FarmlandBlock METHOD method_10124 hasCrop (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_10125 setToDirt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_10125 setToDirt (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V METHOD method_10126 isWaterNearby (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/LecternBlock.mapping b/mappings/net/minecraft/block/LecternBlock.mapping index 1ba8825ab1..5d357f0497 100644 --- a/mappings/net/minecraft/block/LecternBlock.mapping +++ b/mappings/net/minecraft/block/LecternBlock.mapping @@ -20,24 +20,17 @@ CLASS net/minecraft/class_3715 net/minecraft/block/LecternBlock ARG 0 world ARG 1 pos ARG 2 state - METHOD method_17472 putBookIfAbsent (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)Z - ARG 0 player + METHOD method_17472 putBookIfAbsent (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)Z ARG 1 world ARG 2 pos ARG 3 state ARG 4 stack - METHOD method_17473 setHasBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 hasBook + METHOD method_17473 setHasBook (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V METHOD method_17474 updateNeighborAlways (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos ARG 2 state - METHOD method_17475 putBook (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V - ARG 0 player - ARG 1 world + METHOD method_17475 putBook (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V ARG 2 pos ARG 3 state ARG 4 stack diff --git a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping index ed3de6ea86..8ab825eb6f 100644 --- a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping +++ b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping @@ -11,10 +11,7 @@ CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock METHOD method_26157 getLightLevel (Lnet/minecraft/class_2680;I)I ARG 0 state ARG 1 maxLevel - METHOD method_26382 charge (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 0 world - ARG 1 pos - ARG 2 state + METHOD method_26382 charge (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V METHOD method_27353 isNether (Lnet/minecraft/class_1937;)Z ARG 0 world METHOD method_29289 isChargeItem (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/class_8133.mapping b/mappings/net/minecraft/class_8133.mapping new file mode 100644 index 0000000000..f86e2b9703 --- /dev/null +++ b/mappings/net/minecraft/class_8133.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8133 + METHOD method_48222 refreshPositions ()V + METHOD method_48227 forEachElement (Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 92a1d4e7d1..d2d57ce846 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -64,7 +64,7 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 4 mouseY METHOD method_47419 shouldShowOperatorTab (Lnet/minecraft/class_1657;)Z ARG 1 player - METHOD method_47420 updateDisplayParameters (Lnet/minecraft/class_7699;Z)V + METHOD method_47420 updateDisplayParameters (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)V ARG 1 enabledFeatures ARG 2 showOperatorTab METHOD method_47421 refreshSelectedTab (Ljava/util/Collection;)V diff --git a/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping index 10b91990f8..88eb06f55c 100644 --- a/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsLis FIELD field_2741 bindingName Lnet/minecraft/class_2561; FIELD field_2743 resetButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_459;Lnet/minecraft/class_304;Lnet/minecraft/class_2561;)V - ARG 2 binding ARG 3 bindingName METHOD method_19870 (Lnet/minecraft/class_304;Lnet/minecraft/class_4185;)V ARG 2 button diff --git a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping index df0e297887..9545e96cdd 100644 --- a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping @@ -10,4 +10,3 @@ CLASS net/minecraft/class_6599 net/minecraft/client/gui/screen/option/KeybindsSc ARG 1 button METHOD method_38532 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_48270 update ()V diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping index 3af406cb2f..1878e0ac62 100644 --- a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping @@ -45,7 +45,6 @@ CLASS net/minecraft/class_7941 net/minecraft/client/gui/screen/option/TelemetryE ARG 1 textRenderer ARG 2 title METHOD method_47644 appendTitle (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;I)V - ARG 1 textRenderer ARG 2 title ARG 3 marginBottom METHOD method_47645 appendText (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping index a60ac7bc8e..eeeb293f89 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_7745 net/minecraft/client/gui/screen/pack/Experimental FIELD field_40445 DETAILS Lnet/minecraft/class_2561; FIELD field_40447 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_40448 enabledProfiles Ljava/util/Collection; - FIELD field_40449 message Lnet/minecraft/class_5489; METHOD (Ljava/util/Collection;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;)V ARG 1 enabledProfiles ARG 2 callback @@ -14,8 +13,6 @@ CLASS net/minecraft/class_7745 net/minecraft/client/gui/screen/pack/Experimental ARG 1 button METHOD method_45668 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_45669 getMessageHeight ()I - METHOD method_45670 getTitleY ()I CLASS class_7746 DetailsScreen FIELD field_40451 packList Lnet/minecraft/class_7745$class_7746$class_7747; METHOD method_45671 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 9dd3ae7733..e9e0289321 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_2727 updateSaveFolderName (Ljava/lang/String;)V ARG 1 saveDirectoryName METHOD method_2736 createLevel ()V - METHOD method_29682 applyDataPacks (Lnet/minecraft/class_3283;)V + METHOD method_29682 applyDataPacks (Lnet/minecraft/class_3283;ZLjava/util/function/Consumer;)V ARG 1 dataPackManager METHOD method_29685 copyDataPack (Ljava/nio/file/Path;Lnet/minecraft/class_310;)Ljava/nio/file/Path; ARG 0 srcFolder @@ -81,7 +81,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 path METHOD method_45678 (Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; ARG 1 context - METHOD method_45679 validateDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;)V + METHOD method_45679 validateDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;Ljava/util/function/Consumer;)V ARG 1 dataPackManager ARG 2 dataConfiguration METHOD method_45681 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_525$class_7749;)Lnet/minecraft/class_7193; @@ -91,9 +91,6 @@ 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_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_48644 (Lnet/minecraft/class_339;)V @@ -133,8 +130,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_42179 MORE_TAB_TITLE_TEXT Lnet/minecraft/class_2561; FIELD field_42180 GAME_RULES_TEXT Lnet/minecraft/class_2561; FIELD field_42181 DATA_PACKS_TEXT Lnet/minecraft/class_2561; - METHOD method_48666 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_48667 (Ljava/util/Optional;)V ARG 1 gameRules METHOD method_48668 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping index 40420eb4e5..a3eea59d3f 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping @@ -21,13 +21,16 @@ CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreen ARG 2 getter ARG 3 setter CLASS class_8098 Option - FIELD field_42201 button Lnet/minecraft/class_5676; - FIELD field_42202 getter Ljava/util/function/BooleanSupplier; - FIELD field_42203 toggleable Ljava/util/function/BooleanSupplier; + FIELD comp_1261 button Lnet/minecraft/class_5676; + FIELD comp_1262 getter Ljava/util/function/BooleanSupplier; + FIELD comp_1263 toggleable Ljava/util/function/BooleanSupplier; METHOD (Lnet/minecraft/class_5676;Ljava/util/function/BooleanSupplier;Ljava/util/function/BooleanSupplier;)V ARG 1 button ARG 2 getter ARG 3 toggleable + METHOD comp_1261 button ()Lnet/minecraft/class_5676; + METHOD comp_1262 getter ()Ljava/util/function/BooleanSupplier; + METHOD comp_1263 toggleable ()Ljava/util/function/BooleanSupplier; METHOD method_48688 refresh ()V CLASS class_8099 OptionBuilder FIELD field_42204 text Lnet/minecraft/class_2561; @@ -41,18 +44,13 @@ CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreen ARG 2 getter ARG 3 setter ARG 4 buttonWidth - METHOD method_48689 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 1 button METHOD method_48690 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 1 button ARG 2 value - METHOD method_48691 build (Lnet/minecraft/class_8096$class_8097;Lnet/minecraft/class_7845;II)Lnet/minecraft/class_8096$class_8098; + METHOD method_48691 build (Lnet/minecraft/class_8096$class_8097;Lnet/minecraft/class_7845;I)Lnet/minecraft/class_8096$class_8098; ARG 1 gridBuilder ARG 2 gridWidget ARG 3 row - ARG 4 column - METHOD method_48692 (Ljava/lang/Boolean;)Lnet/minecraft/class_7919; - ARG 1 value METHOD method_48693 toggleable (Ljava/util/function/BooleanSupplier;)Lnet/minecraft/class_8096$class_8099; ARG 1 toggleable METHOD method_48694 tooltip (Lnet/minecraft/class_2561;)Lnet/minecraft/class_8096$class_8099; diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 6a1b656dc8..323d68ddfc 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -53,7 +53,6 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_25358 setWidth (I)V ARG 1 width METHOD method_25359 renderButton (Lnet/minecraft/class_4587;II)V - ARG 1 matrices ARG 2 mouseX ARG 3 mouseY METHOD method_25360 getNarrationMessage ()Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping index ea5c065dd3..1255f221fe 100644 --- a/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping @@ -1,17 +1,2 @@ CLASS net/minecraft/class_7940 net/minecraft/client/gui/widget/MultilineTextWidget - FIELD field_41341 text Lnet/minecraft/class_5489; - FIELD field_41342 fontHeight I FIELD field_41343 centered Z - METHOD (Lnet/minecraft/class_5489;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;Z)V - ARG 1 multilineText - ARG 2 textRenderer - ARG 3 text - ARG 4 centered - METHOD method_47617 createCentered (ILnet/minecraft/class_327;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7940; - ARG 0 width - ARG 1 textRenderer - ARG 2 text - METHOD method_47618 createNonCentered (ILnet/minecraft/class_327;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7940; - ARG 0 width - ARG 1 textRenderer - ARG 2 text diff --git a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping index 4d8ca257ab..fa3f0b9979 100644 --- a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_8019 net/minecraft/client/gui/widget/NarratedMultilineTextWidget - FIELD field_41798 title Lnet/minecraft/class_2561; FIELD field_41799 FOCUSED_BORDER_COLOR I FIELD field_41800 UNFOCUSED_BORDER_COLOR I FIELD field_41801 BACKGROUND_COLOR I FIELD field_41802 EXPANSION I FIELD field_41803 BORDER_WIDTH I METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;I)V - ARG 1 textRenderer ARG 2 text ARG 3 width diff --git a/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping b/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping index 0642c1668b..f50a37f597 100644 --- a/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping @@ -6,9 +6,6 @@ CLASS net/minecraft/class_7843 net/minecraft/client/gui/widget/SimplePositioning FIELD field_40768 minHeight I FIELD field_40769 minWidth I FIELD field_40770 mainPositioner Lnet/minecraft/class_7847; - METHOD method_46439 of (II)Lnet/minecraft/class_7843; - ARG 0 minWidth - ARG 1 minHeight METHOD method_46440 setPos (IIILjava/util/function/Consumer;F)V ARG 0 low ARG 1 high diff --git a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping index a1135a366f..9522a00358 100644 --- a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping @@ -11,8 +11,6 @@ CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidg ARG 5 tabs METHOD method_48618 setWidth (I)V ARG 1 width - METHOD method_48620 selectTab (Lnet/minecraft/class_8087;)V - ARG 1 tab METHOD method_48621 (Lnet/minecraft/class_8087;Lnet/minecraft/class_4185;)V ARG 2 button METHOD method_48623 builder (Lnet/minecraft/class_8088;I)Lnet/minecraft/class_8089$class_8090; @@ -21,8 +19,6 @@ CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidg METHOD method_48624 selectTab (Ljava/util/Optional;Lnet/minecraft/class_8087;)V ARG 1 button ARG 2 tab - METHOD method_48625 selectTab (I)V - ARG 1 index METHOD method_48626 (Lnet/minecraft/class_4185;)V ARG 0 button CLASS class_8090 Builder diff --git a/mappings/net/minecraft/client/gui/widget/TextWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextWidget.mapping index 39c0736998..b814962315 100644 --- a/mappings/net/minecraft/client/gui/widget/TextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextWidget.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_7842 net/minecraft/client/gui/widget/TextWidget - FIELD field_40764 textColor I - FIELD field_40765 textRenderer Lnet/minecraft/class_327; FIELD field_42121 horizontalAlignment F METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V ARG 1 x diff --git a/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping b/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping index 6e03ba5f7c..c503807098 100644 --- a/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping @@ -8,17 +8,10 @@ CLASS net/minecraft/class_7838 net/minecraft/client/gui/widget/WrapperWidget ARG 2 y ARG 3 width ARG 4 height - METHOD method_48222 refreshPositions ()V METHOD method_48223 (ILnet/minecraft/class_8021;)V ARG 2 element - METHOD method_48224 (Lnet/minecraft/class_8021;)V - ARG 0 element - METHOD method_48225 (Ljava/util/function/Consumer;Lnet/minecraft/class_8021;)V - ARG 1 element METHOD method_48226 (ILnet/minecraft/class_8021;)V ARG 2 element - METHOD method_48227 forEachElement (Ljava/util/function/Consumer;)V - ARG 1 consumer CLASS class_7839 WrappedElement FIELD field_40752 widget Lnet/minecraft/class_8021; FIELD field_40753 positioner Lnet/minecraft/class_7847$class_7848; diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index b88d3cb84d..49a1880b62 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -139,7 +139,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1904 useKey Lnet/minecraft/class_304; COMMENT A key binding for using an item, such as placing a block. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_RIGHT the right mouse button} by default. - FIELD field_1905 heldItemTooltips Z FIELD field_1906 spectatorOutlinesKey Lnet/minecraft/class_304; COMMENT A key binding for highlighting players in {@linkplain net.minecraft.world.GameMode#SPECTATOR spectator mode}. COMMENT Not bound to any keys by default. diff --git a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping index 79c3f961e9..f1e7ecc2d1 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping @@ -1,36 +1,14 @@ CLASS net/minecraft/class_4446 net/minecraft/client/realms/util/RealmsTextureManager FIELD field_20253 TEXTURES Ljava/util/Map; - FIELD field_20254 SKIN_FETCH_STATUS Ljava/util/Map; - FIELD field_20255 FETCHED_SKINS Ljava/util/Map; FIELD field_20256 LOGGER Lorg/slf4j/Logger; FIELD field_22730 ISLES Lnet/minecraft/class_2960; - METHOD method_21558 bindFace (Ljava/lang/String;)V - ARG 0 uuid - METHOD method_21559 withBoundFace (Ljava/lang/String;Ljava/lang/Runnable;)V - ARG 0 uuid - ARG 1 r - METHOD method_21560 bindWorldTemplate (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 id - ARG 1 image - METHOD method_21561 bindDefaultFace (Ljava/util/UUID;)V - ARG 0 uuid - METHOD method_21564 getTextureId (Ljava/lang/String;Ljava/lang/String;)I + METHOD method_21564 getTextureId (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 id ARG 1 image CLASS class_4447 RealmsTexture - FIELD field_20258 image Ljava/lang/String; - FIELD field_20259 textureId I - METHOD (Ljava/lang/String;I)V + FIELD comp_1254 image Ljava/lang/String; + FIELD comp_1255 textureId Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 image - ARG 2 textureId - CLASS class_6596 RealmsTextureImage - FIELD field_34775 width I - FIELD field_34776 height I - FIELD field_34777 buffer Ljava/nio/IntBuffer; - FIELD field_34778 FALLBACK Ljava/util/function/Supplier; - METHOD (IILjava/nio/IntBuffer;)V - ARG 1 width - ARG 2 height - ARG 3 buffer - METHOD method_38510 fromBase64 (Ljava/lang/String;)Lnet/minecraft/class_4446$class_6596; - ARG 0 string + METHOD comp_1254 image ()Ljava/lang/String; + METHOD comp_1255 textureId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping index 6e5d993bc0..acefa8663b 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil FIELD field_20260 gameProfileCache Lcom/google/common/cache/LoadingCache; - FIELD field_20261 AUTHENTICATION_SERVICE Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; FIELD field_20262 SESSION_SERVICE Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_32129 SECONDS_PER_MINUTE I FIELD field_32130 SECONDS_PER_HOUR I @@ -9,8 +8,6 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil ARG 0 milliseconds METHOD method_21568 uuidToName (Ljava/lang/String;)Ljava/lang/String; ARG 0 uuid - METHOD method_21569 getTextures (Ljava/lang/String;)Ljava/util/Map; - ARG 0 uuid METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 0 date CLASS 1 diff --git a/mappings/net/minecraft/client/realms/util/SkinProcessor.mapping b/mappings/net/minecraft/client/realms/util/SkinProcessor.mapping deleted file mode 100644 index 52886ec8ea..0000000000 --- a/mappings/net/minecraft/client/realms/util/SkinProcessor.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_4449 net/minecraft/client/realms/util/SkinProcessor - FIELD field_20263 pixels [I - FIELD field_20264 width I - FIELD field_20265 height I - METHOD method_21572 doNotchTransparencyHack (IIII)V - ARG 1 x0 - ARG 2 y0 - ARG 3 x1 - ARG 4 y1 - METHOD method_21573 process (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; - ARG 1 image - METHOD method_21574 setNoAlpha (IIII)V - ARG 1 x0 - ARG 2 y0 - ARG 3 x1 - ARG 4 y1 diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index d8ff654016..dbaa9326f0 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -159,7 +159,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 2 tickDelta ARG 3 changingFov METHOD method_3198 tiltViewWhenHurt (Lnet/minecraft/class_4587;F)V - ARG 1 matrices ARG 2 tickDelta METHOD method_3199 updateFovMultiplier ()V METHOD method_3202 shouldRenderBlockOutline ()Z diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index bcca4dd09b..9965862cf6 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -190,8 +190,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 renderLayer METHOD method_22987 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V ARG 1 info - METHOD method_22989 renderChunkDebugInfo (Lnet/minecraft/class_4184;)V - ARG 1 camera + METHOD method_22989 renderChunkDebugInfo (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4184;)V METHOD method_22990 getEntityOutlinesFramebuffer ()Lnet/minecraft/class_276; METHOD method_23793 getLightmapCoordinates (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I ARG 0 world @@ -253,18 +252,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 matrices ARG 2 projectionMatrix ARG 3 tickDelta - METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V - ARG 0 buffer - ARG 1 x1 - ARG 3 y1 - ARG 5 z1 - ARG 7 x2 - ARG 9 y2 - ARG 11 z2 - ARG 13 red - ARG 14 green - ARG 15 blue - ARG 16 alpha + METHOD method_3258 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDDDDFFFF)V METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FDDD)V ARG 1 matrices ARG 2 projectionMatrix diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping index 46235b501f..362e976bae 100644 --- a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -27,67 +27,31 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere ARG 2 pos METHOD method_23807 addHive (Lnet/minecraft/class_4703$class_4705;)V ARG 1 hive - METHOD method_23808 drawHive (Lnet/minecraft/class_2338;)V - ARG 0 pos - METHOD method_23809 drawBox (Lnet/minecraft/class_2338;FFFFF)V - ARG 0 pos - ARG 1 expand - ARG 2 red - ARG 3 green - ARG 4 blue - ARG 5 alpha + METHOD method_23808 drawHive (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;)V METHOD method_23810 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4703$class_5243;)Z ARG 1 bee - METHOD method_23811 (Lnet/minecraft/class_2338;Ljava/util/Map;Lnet/minecraft/class_4703$class_4705;)V - ARG 3 hive - METHOD method_23812 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 2 hivePos - ARG 3 bees - METHOD method_23813 drawHiveBees (Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 1 pos - ARG 2 bees - METHOD method_23814 drawString (Lnet/minecraft/class_2374;ILjava/lang/String;IF)V - ARG 0 pos - ARG 1 line - ARG 2 string - ARG 3 color - ARG 4 size - METHOD method_23815 drawString (Ljava/lang/String;Lnet/minecraft/class_4703$class_4705;II)V - ARG 0 string - ARG 1 hive - ARG 2 line - ARG 3 color - METHOD method_23816 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;II)V - ARG 0 string - ARG 1 pos - ARG 2 line - ARG 3 color - METHOD method_23817 (Ljava/util/Map$Entry;)V - ARG 0 entry + METHOD method_23813 drawHiveBees (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Ljava/util/List;)V + METHOD method_23814 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2374;ILjava/lang/String;IF)V + METHOD method_23815 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_4703$class_4705;II)V + METHOD method_23816 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_2338;II)V METHOD method_23818 (Ljava/util/Map;Lnet/minecraft/class_4703$class_5243;)V ARG 1 bee METHOD method_23819 removeOutdatedHives ()V - METHOD method_23820 drawPath (Lnet/minecraft/class_4703$class_5243;)V - ARG 1 bee - METHOD method_23821 drawHiveInfo (Lnet/minecraft/class_4703$class_4705;Ljava/util/Collection;)V - ARG 1 hive - ARG 2 blacklistingBees + METHOD method_23820 drawPath (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4703$class_5243;)V + METHOD method_23821 drawHiveInfo (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4703$class_4705;Ljava/util/Collection;)V METHOD method_23822 getBeesForHive (Lnet/minecraft/class_2338;)Ljava/util/Collection; ARG 1 hivePos - METHOD method_23823 render ()V - METHOD method_23824 drawBee (Lnet/minecraft/class_4703$class_5243;)V - ARG 1 bee + METHOD method_23823 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V + METHOD method_23824 drawBee (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4703$class_5243;)V METHOD method_23825 toString (Ljava/util/Collection;)Ljava/lang/String; ARG 0 bees - METHOD method_23826 drawFlowers ()V + METHOD method_23826 drawFlowers (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V METHOD method_23827 isTargeted (Lnet/minecraft/class_4703$class_5243;)Z ARG 1 bee METHOD method_23828 getCameraPos ()Lnet/minecraft/class_4184; METHOD method_23829 isInRange (Lnet/minecraft/class_4703$class_5243;)Z ARG 1 bee METHOD method_23830 getBeesByHive ()Ljava/util/Map; - METHOD method_23831 (Lnet/minecraft/class_4703$class_5243;)V - ARG 1 bee METHOD method_23832 updateTargetedEntity ()V METHOD method_23952 removeInvalidBees ()V METHOD method_23953 (Ljava/util/Map$Entry;)Z diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index d5f3e07e64..9167ae7657 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -21,17 +21,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_20413 reset ()V - METHOD method_23098 drawBox (DDDDDDFFFF)V - ARG 0 minX - ARG 2 minY - ARG 4 minZ - ARG 6 maxX - ARG 8 maxY - ARG 10 maxZ - ARG 12 red - ARG 13 green - ARG 14 blue - ARG 15 alpha + METHOD method_23098 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDDDDFFFF)V METHOD method_23099 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;DDD)V ARG 1 matrices ARG 2 vertexConsumers @@ -41,55 +31,13 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer METHOD method_23101 getTargetedEntity (Lnet/minecraft/class_1297;I)Ljava/util/Optional; ARG 0 entity ARG 1 maxDistance - METHOD method_23102 drawBox (Lnet/minecraft/class_238;FFFF)V - ARG 0 box - ARG 1 red - ARG 2 green - ARG 3 blue - ARG 4 alpha - METHOD method_23103 drawBox (Lnet/minecraft/class_2338;FFFFF)V - ARG 0 pos - ARG 1 expand - ARG 2 red - ARG 3 green - ARG 4 blue - ARG 5 alpha - METHOD method_23104 drawBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;FFFF)V - ARG 0 pos1 - ARG 1 pos2 - ARG 2 red - ARG 3 green - ARG 4 blue - ARG 5 alpha - METHOD method_23105 drawString (Ljava/lang/String;DDDI)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color - METHOD method_23106 drawString (Ljava/lang/String;DDDIF)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color - ARG 8 size - METHOD method_23107 drawString (Ljava/lang/String;DDDIFZFZ)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color - ARG 8 size - ARG 9 center - ARG 10 offset - ARG 11 visibleThroughObjects - METHOD method_23108 drawString (Ljava/lang/String;IIII)V - ARG 0 string - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 color + METHOD method_23102 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_238;FFFF)V + METHOD method_23103 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;FFFFF)V + METHOD method_23104 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;FFFF)V + METHOD method_23105 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;DDDI)V + METHOD method_23106 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;DDDIF)V + METHOD method_23107 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;DDDIFZFZ)V + METHOD method_23108 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;IIII)V METHOD method_3713 toggleShowChunkBorder ()Z CLASS class_864 Renderer METHOD method_20414 clear ()V diff --git a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping index caa1bd6409..b44bdff8e5 100644 --- a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping @@ -12,18 +12,9 @@ CLASS net/minecraft/class_5739 net/minecraft/client/render/debug/GameEventDebugR METHOD method_33088 addListener (Lnet/minecraft/class_5716;I)V ARG 1 positionSource ARG 2 range - METHOD method_33089 drawBoxIfCameraReady (Lnet/minecraft/class_238;FFFF)V - ARG 0 box - ARG 1 red - ARG 2 green - ARG 3 blue - ARG 4 alpha - METHOD method_33090 (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V - ARG 7 pos + METHOD method_33089 drawBoxIfCameraReady (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_238;FFFF)V METHOD method_33091 (Lnet/minecraft/class_5739$class_5741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLnet/minecraft/class_243;)V ARG 9 pos - METHOD method_33092 (Lnet/minecraft/class_243;)V - ARG 0 pos CLASS class_5740 Entry FIELD comp_678 startingMs J FIELD comp_679 event Lnet/minecraft/class_5712; diff --git a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping index 79d3971c04..e3732a266e 100644 --- a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping @@ -8,9 +8,7 @@ CLASS net/minecraft/class_4503 net/minecraft/client/render/debug/GameTestDebugRe ARG 4 duration METHOD method_23110 (JLjava/util/Map$Entry;)Z ARG 2 entry - METHOD method_23111 renderMarker (Lnet/minecraft/class_2338;Lnet/minecraft/class_4503$class_4504;)V - ARG 1 pos - ARG 2 marker + METHOD method_23111 renderMarker (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Lnet/minecraft/class_4503$class_4504;)V CLASS class_4504 Marker FIELD field_20521 color I FIELD field_20522 message Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping index 958833395c..f23c4b856a 100644 --- a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping @@ -7,9 +7,6 @@ CLASS net/minecraft/class_4205 net/minecraft/client/render/debug/GoalSelectorDeb METHOD method_19430 setGoalSelectorList (ILjava/util/List;)V ARG 1 index ARG 2 selectors - METHOD method_23116 (Lnet/minecraft/class_2338;Ljava/lang/Integer;Ljava/util/List;)V - ARG 1 index - ARG 2 selectors METHOD method_35799 removeGoalSelectorList (I)V ARG 1 index CLASS class_4206 GoalSelector diff --git a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping index fd0ee16d46..9e75e0eff4 100644 --- a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping @@ -5,32 +5,13 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebug FIELD field_4615 pathTimes Ljava/util/Map; FIELD field_4616 paths Ljava/util/Map; FIELD field_4617 nodeSizes Ljava/util/Map; - METHOD method_23117 drawPathLines (Lnet/minecraft/class_11;DDD)V - ARG 0 path - ARG 1 cameraX - ARG 3 cameraY - ARG 5 cameraZ - METHOD method_23118 drawPath (Lnet/minecraft/class_11;FZZDDD)V - ARG 0 path - ARG 1 nodeSize - ARG 2 drawDebugNodes - ARG 3 drawLabels - ARG 4 cameraX - ARG 6 cameraY - ARG 8 cameraZ + METHOD method_23117 drawPathLines (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_11;DDD)V + METHOD method_23118 drawPath (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_11;FZZDDD)V METHOD method_23119 getManhattanDistance (Lnet/minecraft/class_2338;DDD)F ARG 0 pos ARG 1 x ARG 3 y ARG 5 z - METHOD method_23121 drawPathInternal (Lnet/minecraft/class_11;FZZDDD)V - ARG 0 path - ARG 1 nodeSize - ARG 2 drawDebugNodes - ARG 3 drawLabels - ARG 4 cameraX - ARG 6 cameraY - ARG 8 cameraZ METHOD method_3869 addPath (ILnet/minecraft/class_11;F)V ARG 1 id ARG 2 path diff --git a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping index 5003e83b92..3d419b1016 100644 --- a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping @@ -7,10 +7,6 @@ CLASS net/minecraft/class_4304 net/minecraft/client/render/debug/RaidCenterDebug ARG 1 client METHOD method_20561 setRaidCenters (Ljava/util/Collection;)V ARG 1 raidCenters - METHOD method_23122 drawRaidCenter (Lnet/minecraft/class_2338;)V - ARG 0 pos - METHOD method_23123 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;I)V - ARG 0 string - ARG 1 pos - ARG 2 color + METHOD method_23122 drawRaidCenter (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;)V + METHOD method_23123 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_2338;I)V METHOD method_23125 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index 85a8295345..2e9f6edcb1 100644 --- a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -31,48 +31,15 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen ARG 1 entity METHOD method_23127 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4232;)Z ARG 1 brain - METHOD method_23128 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4233;)V - ARG 2 poi - METHOD method_23129 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 2 pos - ARG 3 brains - METHOD method_23131 drawGhostPointOfInterest (Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 1 pos - ARG 2 brains - METHOD method_23132 drawString (Lnet/minecraft/class_2374;ILjava/lang/String;IF)V - ARG 0 pos - ARG 1 offsetY - ARG 2 string - ARG 3 color - ARG 4 size - METHOD method_23133 drawString (Ljava/lang/String;Lnet/minecraft/class_4207$class_4233;II)V - ARG 0 string - ARG 1 pointOfInterest - ARG 2 offsetY - ARG 3 color - METHOD method_23134 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;II)V - ARG 0 string - ARG 1 pos - ARG 2 offsetY - ARG 3 color - METHOD method_23135 draw (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_23136 drawPath (Lnet/minecraft/class_4207$class_4232;DDD)V - ARG 1 brain - ARG 2 cameraX - ARG 4 cameraY - ARG 6 cameraZ - METHOD method_23137 drawPointOfInterestInfo (Lnet/minecraft/class_4207$class_4233;)V - ARG 1 pointOfInterest - METHOD method_23138 drawPointOfInterest (Lnet/minecraft/class_2338;)V - ARG 0 pos - METHOD method_23140 drawBrain (Lnet/minecraft/class_4207$class_4232;DDD)V - ARG 1 brain - ARG 2 cameraX - ARG 4 cameraY - ARG 6 cameraZ + METHOD method_23131 drawGhostPointOfInterest (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Ljava/util/List;)V + METHOD method_23132 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2374;ILjava/lang/String;IF)V + METHOD method_23133 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_4207$class_4233;II)V + METHOD method_23134 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_2338;II)V + METHOD method_23135 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V + METHOD method_23136 drawPath (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4207$class_4232;DDD)V + METHOD method_23137 drawPointOfInterestInfo (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4207$class_4233;)V + METHOD method_23138 drawPointOfInterest (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;)V + METHOD method_23140 drawBrain (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4207$class_4232;DDD)V METHOD method_23141 getNamesOfPointOfInterestTicketHolders (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; ARG 1 pointOfInterest METHOD method_23142 getBrainsContainingPointOfInterest (Lnet/minecraft/class_2338;)Ljava/util/Collection; @@ -83,8 +50,6 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen METHOD method_23146 updateTargetedEntity ()V METHOD method_23147 isClose (Lnet/minecraft/class_4207$class_4232;)Z ARG 1 brain - METHOD method_23148 (DDDLnet/minecraft/class_4207$class_4232;)V - ARG 7 brain METHOD method_24804 (Ljava/util/Map$Entry;)Z ARG 1 entry METHOD method_24805 removeRemovedBrains ()V diff --git a/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping index f614c465b1..fb01a7efe8 100644 --- a/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping @@ -1,15 +1,8 @@ CLASS net/minecraft/class_4841 net/minecraft/client/render/debug/VillageSectionsDebugRenderer FIELD field_22409 sections Ljava/util/Set; FIELD field_32917 RANGE I - METHOD method_24806 drawSections (DDD)V - ARG 1 cameraX - ARG 3 cameraY - ARG 5 cameraZ - METHOD method_24807 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4076;)V - ARG 1 section METHOD method_24808 addSection (Lnet/minecraft/class_4076;)V ARG 1 pos METHOD method_24809 removeSection (Lnet/minecraft/class_4076;)V ARG 1 pos - METHOD method_24810 drawBoxAtCenterOf (Lnet/minecraft/class_4076;)V - ARG 0 pos + METHOD method_24810 drawBoxAtCenterOf (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4076;)V diff --git a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping index 225e4ea783..6423904fde 100644 --- a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_989 net/minecraft/client/render/entity/feature/HeldIte METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_759;)V ARG 1 context ARG 2 heldItemRenderer - METHOD method_4192 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_4192 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity ARG 2 stack ARG 3 transformationMode diff --git a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping index dbdc2acff2..8de108312d 100644 --- a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_756 net/minecraft/client/render/item/BuiltinModelItemR METHOD (Lnet/minecraft/class_824;Lnet/minecraft/class_5599;)V ARG 1 blockEntityRenderDispatcher ARG 2 entityModelLoader - METHOD method_3166 render (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + METHOD method_3166 render (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 stack ARG 2 mode ARG 3 matrices diff --git a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping index 999147dde0..34b1b4b4f4 100644 --- a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping @@ -104,7 +104,7 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer ARG 4 pitch ARG 5 equipProgress ARG 6 swingProgress - METHOD method_3233 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_3233 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity ARG 2 stack ARG 3 renderMode diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index b34fba75bf..7cea3157e0 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 3 bakery ARG 4 colors ARG 5 builtinModelItemRenderer - METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;III)V + METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;III)V ARG 1 entity ARG 2 item ARG 3 renderMode @@ -30,7 +30,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 8 light ARG 9 overlay ARG 10 seed - METHOD method_23178 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;IILnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;I)V + METHOD method_23178 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;IILnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;I)V ARG 1 stack ARG 2 transformationType ARG 3 light @@ -39,7 +39,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 6 vertexConsumers ARG 7 world ARG 8 seed - METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V + METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V ARG 1 stack ARG 2 renderMode ARG 3 leftHanded diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 8bc5586a77..6099abd79f 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked METHOD method_3434 getOverrides ()Ljava/util/List; METHOD method_3437 deserialize (Ljava/io/Reader;)Lnet/minecraft/class_793; ARG 0 input - METHOD method_3438 getTransformation (Lnet/minecraft/class_809$class_811;)Lnet/minecraft/class_804; + METHOD method_3438 getTransformation (Lnet/minecraft/class_811;)Lnet/minecraft/class_804; ARG 1 renderMode METHOD method_3439 isTextureReference (Ljava/lang/String;)Z ARG 0 reference diff --git a/mappings/net/minecraft/client/render/model/json/Mode.mapping b/mappings/net/minecraft/client/render/model/json/Mode.mapping new file mode 100644 index 0000000000..6709e720e3 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/Mode.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_811 net/minecraft/client/render/model/json/Mode + METHOD method_29998 isFirstPerson ()Z diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping index be17af23bf..646300fc4e 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping @@ -19,18 +19,14 @@ CLASS net/minecraft/class_809 net/minecraft/client/render/model/json/ModelTransf ARG 8 fixed METHOD (Lnet/minecraft/class_809;)V ARG 1 other - METHOD method_3501 isTransformationDefined (Lnet/minecraft/class_809$class_811;)Z + METHOD method_3501 isTransformationDefined (Lnet/minecraft/class_811;)Z ARG 1 renderMode - METHOD method_3503 getTransformation (Lnet/minecraft/class_809$class_811;)Lnet/minecraft/class_804; + METHOD method_3503 getTransformation (Lnet/minecraft/class_811;)Lnet/minecraft/class_804; ARG 1 renderMode CLASS class_810 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson ARG 2 unused ARG 3 context - METHOD method_3504 parseModelTransformation (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_804; + METHOD method_3504 parseModelTransformation (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;Lnet/minecraft/class_811;)Lnet/minecraft/class_804; ARG 1 ctx - ARG 2 json - ARG 3 key - CLASS class_811 Mode - METHOD method_29998 isFirstPerson ()Z diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index aa2db44c77..f9ea3ffa08 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -566,8 +566,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 tickDelta METHOD method_31469 (Lnet/minecraft/class_1297;)Z ARG 0 entity - METHOD method_31470 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z - ARG 1 entity METHOD method_31471 onSpawnPacket (Lnet/minecraft/class_2604;)V COMMENT Called on the client when the entity receives a spawn packet. COMMENT @@ -975,7 +973,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getPassengersDeep COMMENT @see #hasPassenger(Predicate) ARG 1 passenger - METHOD method_5627 addPassenger (Lnet/minecraft/class_1297;)Z + METHOD method_5627 addPassenger (Lnet/minecraft/class_1297;)V COMMENT Adds {@code passenger} as a passenger. This should not be called COMMENT normally; call {@link #startRiding(Entity)} instead. (Note that COMMENT the entity to pass and the entity to call are swapped in this case; diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index 9b979d64e0..c9a43a6790 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -5,18 +5,14 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_29998 BREAK_SHIELD B FIELD field_29999 PULL_HOOKED_ENTITY B FIELD field_30000 HIT_ARMOR_STAND B - FIELD field_30001 DAMAGE_FROM_THORNS B FIELD field_30002 STOP_LOOKING_AT_VILLAGER B FIELD field_30003 USE_TOTEM_OF_UNDYING B - FIELD field_30004 DAMAGE_FROM_DROWNING B - FIELD field_30005 DAMAGE_FROM_FIRE B FIELD field_30006 ADD_DOLPHIN_HAPPY_VILLAGER_PARTICLES B FIELD field_30007 STUN_RAVAGER B FIELD field_30008 TAME_OCELOT_FAILED B FIELD field_30009 TAME_OCELOT_SUCCESS B FIELD field_30010 ADD_SPLASH_PARTICLES B FIELD field_30011 ADD_CLOUD_PARTICLES B - FIELD field_30012 DAMAGE_FROM_BERRY_BUSH B FIELD field_30013 CREATE_EATING_PARTICLES B FIELD field_30014 ADD_PORTAL_PARTICLES B FIELD field_30015 BREAK_MAINHAND B @@ -30,8 +26,6 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_30023 DRIP_RICH_HONEY B FIELD field_30024 SWAP_HANDS B FIELD field_30025 RESET_WOLF_SHAKE B - FIELD field_30026 DAMAGE_FROM_FREEZING B - FIELD field_30027 DAMAGE_FROM_GENERIC_SOURCE B FIELD field_30028 PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES B FIELD field_30029 PLAY_ATTACK_SOUND B FIELD field_30031 ADD_NEGATIVE_PLAYER_REACTION_PARTICLES B diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index f88370b464..b79b60a4a2 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_6094 spawnGroup Lnet/minecraft/class_1311; FIELD field_6101 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6106 translationKey Ljava/lang/String; - METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;IILnet/minecraft/class_7699;)V + METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;IIZLnet/minecraft/class_7699;)V ARG 1 factory ARG 2 spawnGroup ARG 3 saveable @@ -27,7 +27,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 8 dimensions ARG 9 maxTrackDistance ARG 10 trackTickInterval - ARG 11 requiredFeatures METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; ARG 1 feetX diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 34df233cad..a2dd58c2fd 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -333,8 +333,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_42149 disablesShield ()Z METHOD method_44201 isArmorSlot (Lnet/minecraft/class_1304;)Z ARG 1 slot - METHOD method_44202 playEquipSound (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_45324 areItemsDifferent (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 stack ARG 2 stack2 @@ -603,9 +601,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 target METHOD method_6115 isUsingItem ()Z METHOD method_6116 onEquipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V - ARG 1 slot ARG 2 oldStack - ARG 3 newStack METHOD method_6117 getLastAttackedTime ()I METHOD method_6118 getEquippedStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; ARG 1 slot diff --git a/mappings/net/minecraft/entity/Tameable.mapping b/mappings/net/minecraft/entity/Tameable.mapping index e93233898e..c63fda1091 100644 --- a/mappings/net/minecraft/entity/Tameable.mapping +++ b/mappings/net/minecraft/entity/Tameable.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_6025 net/minecraft/entity/Tameable - METHOD method_35057 getOwner ()Lnet/minecraft/class_1297; + METHOD method_35057 getOwner ()Lnet/minecraft/class_1309; METHOD method_6139 getOwnerUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index 77b3589a1f..82f17db0ee 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -72,7 +72,6 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit METHOD method_6827 damageLivingEntities (Ljava/util/List;)V ARG 1 entities METHOD method_6828 crystalDestroyed (Lnet/minecraft/class_1511;Lnet/minecraft/class_2338;Lnet/minecraft/class_1282;)V - ARG 1 crystal ARG 2 pos ARG 3 source METHOD method_6829 getFight ()Lnet/minecraft/class_2881; diff --git a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping b/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping deleted file mode 100644 index ea0e4e8ddd..0000000000 --- a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_1286 net/minecraft/entity/damage/BadRespawnPointDamageSource - METHOD (Lnet/minecraft/class_243;)V - ARG 1 pos - METHOD method_5551 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; - ARG 0 style diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index ace7bdcdde..d069446769 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -1,122 +1,9 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource - FIELD field_16992 SWEET_BERRY_BUSH Lnet/minecraft/class_1282; - FIELD field_27856 FREEZE Lnet/minecraft/class_1282; - FIELD field_28100 fallingBlock Z - FIELD field_28399 fromFalling Z - FIELD field_28400 STALAGMITE Lnet/minecraft/class_1282; - FIELD field_34004 neutral Z - COMMENT Whether the attacked entity should be neutral to the attacker. - COMMENT - COMMENT @apiNote This is used by goats to prevent rammed mobs from retaliating. - COMMENT Damages that are neutral do not cause {@link LivingEntity#setAttacker(LivingEntity)} - COMMENT to be called. - FIELD field_39449 bypassesProtection Z - FIELD field_5839 unblockable Z - FIELD field_5840 bypassesArmor Z - FIELD field_5841 name Ljava/lang/String; - FIELD field_5842 DRYOUT Lnet/minecraft/class_1282; - FIELD field_5843 FLY_INTO_WALL Lnet/minecraft/class_1282; - FIELD field_5844 CRAMMING Lnet/minecraft/class_1282; - FIELD field_5845 exhaustion F - FIELD field_5846 MAGIC Lnet/minecraft/class_1282; - FIELD field_5848 CACTUS Lnet/minecraft/class_1282; - FIELD field_5849 OUT_OF_WORLD Lnet/minecraft/class_1282; - FIELD field_5850 WITHER Lnet/minecraft/class_1282; - FIELD field_5851 magic Z - FIELD field_5852 STARVE Lnet/minecraft/class_1282; - FIELD field_5853 projectile Z - FIELD field_5854 ON_FIRE Lnet/minecraft/class_1282; - FIELD field_5855 IN_WALL Lnet/minecraft/class_1282; - FIELD field_5856 DRAGON_BREATH Lnet/minecraft/class_1282; - FIELD field_5857 outOfWorld Z - FIELD field_5858 HOT_FLOOR Lnet/minecraft/class_1282; - FIELD field_5859 DROWN Lnet/minecraft/class_1282; - FIELD field_5861 LIGHTNING_BOLT Lnet/minecraft/class_1282; - FIELD field_5862 explosive Z - FIELD field_5863 LAVA Lnet/minecraft/class_1282; - FIELD field_5864 scaleWithDifficulty Z - FIELD field_5866 fire Z - FIELD field_5867 IN_FIRE Lnet/minecraft/class_1282; - FIELD field_5868 FALL Lnet/minecraft/class_1282; - FIELD field_5869 GENERIC Lnet/minecraft/class_1282; - METHOD (Ljava/lang/String;)V - ARG 1 name - METHOD method_21748 sting (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_24907 firework (Lnet/minecraft/class_1671;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 firework - ARG 1 attacker - METHOD method_29238 witherSkull (Lnet/minecraft/class_1687;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 witherSkull - ARG 1 attacker - METHOD method_32872 isFallingBlock ()Z - METHOD method_32873 setFallingBlock ()Lnet/minecraft/class_1282; - METHOD method_33329 isFromFalling ()Z - METHOD method_33330 setFromFalling ()Lnet/minecraft/class_1282; - METHOD method_37353 setNeutral ()Lnet/minecraft/class_1282; - METHOD method_37354 isNeutral ()Z - METHOD method_43964 sonicBoom (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_44327 bypassesProtection ()Z - METHOD method_44328 setBypassesProtection ()Lnet/minecraft/class_1282; - METHOD method_46392 fallingBlock (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_46393 anvil (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_46394 fallingStalactite (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_5504 isUnblockable ()Z - METHOD method_5505 setOutOfWorld ()Lnet/minecraft/class_1282; METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561; - ARG 1 entity - METHOD method_5507 setFire ()Lnet/minecraft/class_1282; - METHOD method_5508 setBypassesArmor ()Lnet/minecraft/class_1282; - METHOD method_5509 setUnblockable ()Lnet/minecraft/class_1282; METHOD method_5510 getPosition ()Lnet/minecraft/class_243; - METHOD method_5511 mob (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_5512 explosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 explosion - ARG 1 attacker - METHOD method_5513 thorns (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 attacker METHOD method_5514 isScaledWithDifficulty ()Z - METHOD method_5515 setUsesMagic ()Lnet/minecraft/class_1282; - METHOD method_5516 setScaledWithDifficulty ()Lnet/minecraft/class_1282; - METHOD method_5517 setProjectile ()Lnet/minecraft/class_1282; - METHOD method_5518 setExplosive ()Lnet/minecraft/class_1282; - METHOD method_5519 mobProjectile (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; - ARG 0 projectile - ARG 1 attacker - METHOD method_5520 trident (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 trident - ARG 1 attacker - METHOD method_5521 fireball (Lnet/minecraft/class_3855;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 fireball - ARG 1 attacker - METHOD method_5522 arrow (Lnet/minecraft/class_1665;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 projectile - ARG 1 attacker - METHOD method_5523 badRespawnPoint (Lnet/minecraft/class_243;)Lnet/minecraft/class_1282; - ARG 0 pos - METHOD method_5524 thrownProjectile (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 projectile - ARG 1 attacker METHOD method_5525 getName ()Ljava/lang/String; METHOD method_5526 getSource ()Lnet/minecraft/class_1297; - METHOD method_5527 isMagic ()Z METHOD method_5528 getExhaustion ()F METHOD method_5529 getAttacker ()Lnet/minecraft/class_1297; METHOD method_5530 isSourceCreativePlayer ()Z - METHOD method_5531 explosion (Lnet/minecraft/class_1927;)Lnet/minecraft/class_1282; - ARG 0 explosion - METHOD method_5532 player (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_5533 isProjectile ()Z - METHOD method_5534 isFire ()Z - METHOD method_5535 isExplosive ()Z - METHOD method_5536 magic (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 magic - ARG 1 attacker - METHOD method_5537 bypassesArmor ()Z - METHOD method_5538 isOutOfWorld ()Z diff --git a/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping b/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping deleted file mode 100644 index d9fb41d46b..0000000000 --- a/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_1285 net/minecraft/entity/damage/EntityDamageSource - FIELD field_5879 source Lnet/minecraft/class_1297; - FIELD field_5880 thorns Z - METHOD (Ljava/lang/String;Lnet/minecraft/class_1297;)V - ARG 1 name - ARG 2 source - METHOD method_5549 isThorns ()Z - METHOD method_5550 setThorns ()Lnet/minecraft/class_1285; diff --git a/mappings/net/minecraft/entity/damage/PositionedDamageSource.mapping b/mappings/net/minecraft/entity/damage/PositionedDamageSource.mapping deleted file mode 100644 index 3960f515d8..0000000000 --- a/mappings/net/minecraft/entity/damage/PositionedDamageSource.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_7835 net/minecraft/entity/damage/PositionedDamageSource - FIELD field_40729 pos Lnet/minecraft/class_243; - METHOD (Ljava/lang/String;Lnet/minecraft/class_243;)V - ARG 1 name - ARG 2 pos diff --git a/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping b/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping deleted file mode 100644 index fd630b3c56..0000000000 --- a/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1284 net/minecraft/entity/damage/ProjectileDamageSource - FIELD field_40728 attacker Lnet/minecraft/class_1297; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V - ARG 1 name - ARG 2 projectile - ARG 3 attacker diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index 13ef1889a6..0d9ec356a4 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -22,7 +22,3 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/Painting METHOD method_43403 getSize (Lnet/minecraft/class_6880;)I ARG 0 variant METHOD method_43405 getDefaultVariant ()Lnet/minecraft/class_6880; - METHOD method_45378 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; - ARG 0 id - METHOD method_45379 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; - ARG 0 entry diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 3519e2bd29..8281cb9977 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -23,7 +23,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_6969 eatingGrassAnimationProgress F FIELD field_6970 angryTicks I FIELD field_6971 eatingGrassTicks I - FIELD field_6972 OWNER_UUID Lnet/minecraft/class_2940; FIELD field_6973 eatingTicks I FIELD field_6975 soundTicks I FIELD field_6976 jumpStrength F @@ -139,7 +138,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 tame METHOD method_6767 getAngryAnimationProgress (F)F ARG 1 tickDelta - METHOD method_6768 getOwnerUuid ()Ljava/util/UUID; METHOD method_6769 setHorseFlag (IZ)V ARG 1 bitmask ARG 2 flag diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 878e50ae2a..3c257a4e5a 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -128,7 +128,6 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity ARG 5 maxYDifference METHOD method_18307 eatBerries ()V METHOD method_33586 pickGlowBerries (Lnet/minecraft/class_2680;)V - ARG 1 state METHOD method_33587 pickSweetBerries (Lnet/minecraft/class_2680;)V ARG 1 state CLASS class_4026 FoxSwimGoal diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index de9895c6fb..364d645b9b 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -14,9 +14,7 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 1 source ARG 2 world ARG 3 vehicle - METHOD method_42284 open (Ljava/util/function/BiConsumer;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; - ARG 1 gameEventEmitter - ARG 2 player + METHOD method_42284 open (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_42286 removeInventoryStack (II)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping index c6bff418ac..7fddbcc0a1 100644 --- a/mappings/net/minecraft/item/ArmorItem.mapping +++ b/mappings/net/minecraft/item/ArmorItem.mapping @@ -18,7 +18,6 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem METHOD method_7684 dispenseArmor (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z ARG 0 pointer ARG 1 armor - METHOD method_7685 getSlotType ()Lnet/minecraft/class_1304; METHOD method_7686 getMaterial ()Lnet/minecraft/class_1741; METHOD method_7687 getProtection ()I CLASS class_8051 Type diff --git a/mappings/net/minecraft/item/ArmorStandItem.mapping b/mappings/net/minecraft/item/ArmorStandItem.mapping index 7a5597b9c7..61cf838849 100644 --- a/mappings/net/minecraft/item/ArmorStandItem.mapping +++ b/mappings/net/minecraft/item/ArmorStandItem.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_1742 net/minecraft/item/ArmorStandItem - METHOD method_7701 setRotations (Lnet/minecraft/class_1531;Lnet/minecraft/class_5819;)V - ARG 1 stand - ARG 2 random diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 6033fb7038..1c1935371d 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -120,8 +120,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT

When overriding this, {@link #isItemBarVisible} and {@link #getItemBarColor} should COMMENT also be overridden. ARG 1 stack - METHOD method_31570 getEquipSound ()Lnet/minecraft/class_3414; - COMMENT {@return the sound for equipping the item, or {@code null} if no sound is played} METHOD method_31571 getItemBarColor (Lnet/minecraft/class_1799;)I COMMENT {@return the RGB color of the item bar, usually used for durability display} COMMENT diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping index ca934acb75..63678d0943 100644 --- a/mappings/net/minecraft/item/ItemGroup.mapping +++ b/mappings/net/minecraft/item/ItemGroup.mapping @@ -24,9 +24,7 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup METHOD method_45412 contains (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_45414 getSearchTabStacks ()Ljava/util/Collection; - METHOD method_47306 updateEntries (Lnet/minecraft/class_7699;Z)V - ARG 1 enabledFeatures - ARG 2 operatorEnabled + METHOD method_47306 updateEntries (Lnet/minecraft/class_1761$class_8128;)V METHOD method_47307 create (Lnet/minecraft/class_1761$class_7915;I)Lnet/minecraft/class_1761$class_7913; ARG 0 location ARG 1 column @@ -91,10 +89,8 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup ARG 1 row ARG 2 column METHOD method_47315 special ()Lnet/minecraft/class_1761$class_7913; - METHOD method_47316 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47316 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled METHOD method_47317 entries (Lnet/minecraft/class_1761$class_7914;)Lnet/minecraft/class_1761$class_7913; ARG 1 entryCollector METHOD method_47318 type (Lnet/minecraft/class_1761$class_7916;)Lnet/minecraft/class_1761$class_7913; @@ -109,9 +105,7 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup METHOD method_47323 noScrollbar ()Lnet/minecraft/class_1761$class_7913; METHOD method_47324 build ()Lnet/minecraft/class_1761; CLASS class_7914 EntryCollector - METHOD accept (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 1 enabledFeatures + METHOD accept (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 2 entries - ARG 3 operatorEnabled CLASS class_7915 Row CLASS class_7916 Type diff --git a/mappings/net/minecraft/item/ItemGroups.mapping b/mappings/net/minecraft/item/ItemGroups.mapping index 9087e856c7..4ee04fa0e4 100644 --- a/mappings/net/minecraft/item/ItemGroups.mapping +++ b/mappings/net/minecraft/item/ItemGroups.mapping @@ -9,40 +9,25 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups FIELD field_40206 INVENTORY Lnet/minecraft/class_1761; FIELD field_40207 GROUPS Ljava/util/List; FIELD field_40743 NATURAL Lnet/minecraft/class_1761; - FIELD field_41057 enabledFeatures Lnet/minecraft/class_7699; - FIELD field_41058 operatorEnabled Z FIELD field_41059 COLORED_BLOCKS Lnet/minecraft/class_1761; FIELD field_41060 TOOLS Lnet/minecraft/class_1761; FIELD field_41061 FOOD_AND_DRINK Lnet/minecraft/class_1761; FIELD field_41062 INGREDIENTS Lnet/minecraft/class_1761; FIELD field_41063 OPERATOR Lnet/minecraft/class_1761; - METHOD method_45426 addInstruments (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1792;Lnet/minecraft/class_6862;Lnet/minecraft/class_1761$class_7705;)V + METHOD method_45426 addInstruments (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Lnet/minecraft/class_1792;Lnet/minecraft/class_6862;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries - ARG 1 item - ARG 2 instrumentTag - ARG 3 visibility - METHOD method_45427 addPotions (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1792;Lnet/minecraft/class_1761$class_7705;)V + METHOD method_45427 addPotions (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Lnet/minecraft/class_1792;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries - ARG 1 item - ARG 2 visibility - METHOD method_45428 addMaxLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V + METHOD method_45428 addMaxLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries - ARG 1 targets - ARG 2 visibility - METHOD method_45430 addAllLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V + METHOD method_45430 addAllLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries - ARG 1 targets - ARG 2 visibility METHOD method_47328 getDefaultTab ()Lnet/minecraft/class_1761; - METHOD method_47329 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47329 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47330 updateDisplayParameters (Lnet/minecraft/class_7699;Z)Z + METHOD method_47330 updateDisplayParameters (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)Z ARG 0 enabledFeatures ARG 1 operatorEnabled - METHOD method_47331 (Lnet/minecraft/class_7699;ZLnet/minecraft/class_1761;)V - ARG 2 group METHOD method_47332 addSuspiciousStews (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries ARG 1 visibility @@ -51,62 +36,33 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups METHOD method_47334 collect ([Lnet/minecraft/class_1761;)Ljava/util/List; ARG 0 groups METHOD method_47335 getGroupsToDisplay ()Ljava/util/List; - METHOD method_47336 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47336 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47337 updateEntries (Lnet/minecraft/class_7699;Z)V - ARG 0 enabledFeatures - ARG 1 operatorEnabled - METHOD method_47338 (Lnet/minecraft/class_7699;ZLnet/minecraft/class_1761;)V - ARG 2 group + METHOD method_47337 updateEntries (Lnet/minecraft/class_1761$class_8128;)V METHOD method_47339 addFireworkRockets (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries ARG 1 visibility METHOD method_47340 (Lnet/minecraft/class_1761;)Z ARG 0 group METHOD method_47341 getGroups ()Ljava/util/List; - METHOD method_47342 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47342 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47343 displayParametersMatch (Lnet/minecraft/class_7699;Z)Z - ARG 0 enabledFeatures - ARG 1 operatorEnabled METHOD method_47344 getSearchGroup ()Lnet/minecraft/class_1761; - METHOD method_47345 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47345 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47347 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47347 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47349 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47349 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47351 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47351 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47353 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47353 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47355 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47355 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47357 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47357 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47359 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47359 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled - METHOD method_47361 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V - ARG 0 enabledFeatures + METHOD method_47361 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 1 entries - ARG 2 operatorEnabled diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 4473d21fea..10128ee435 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -180,7 +180,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 tooltipSection METHOD method_30268 addHideFlag (Lnet/minecraft/class_1799$class_5422;)V ARG 1 tooltipSection - METHOD method_31572 getEquipSound ()Lnet/minecraft/class_3414; METHOD method_31573 isIn (Lnet/minecraft/class_6862;)Z COMMENT {@return whether the item is in {@code tag}} ARG 1 tag diff --git a/mappings/net/minecraft/item/Wearable.mapping b/mappings/net/minecraft/item/Wearable.mapping index 71eedcdea6..ed71d4a9b3 100644 --- a/mappings/net/minecraft/item/Wearable.mapping +++ b/mappings/net/minecraft/item/Wearable.mapping @@ -2,8 +2,10 @@ 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. + METHOD method_31570 getEquipSound ()Lnet/minecraft/class_3414; METHOD method_48576 equipAndSwap (Lnet/minecraft/class_1792;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; ARG 1 item ARG 2 world ARG 3 user ARG 4 hand + METHOD method_7685 getSlotType ()Lnet/minecraft/class_1304; diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index ff90039bf5..f70896e371 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -1,26 +1,7 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredicate - FIELD field_9531 bypassesInvulnerability Ljava/lang/Boolean; - FIELD field_9532 bypassesArmor Ljava/lang/Boolean; FIELD field_9533 EMPTY Lnet/minecraft/class_2022; FIELD field_9534 directEntity Lnet/minecraft/class_2048; - FIELD field_9535 isProjectile Ljava/lang/Boolean; - FIELD field_9536 isExplosion Ljava/lang/Boolean; - FIELD field_9537 bypassesMagic Ljava/lang/Boolean; - FIELD field_9538 isLightning Ljava/lang/Boolean; FIELD field_9539 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9540 isFire Ljava/lang/Boolean; - FIELD field_9541 isMagic Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)V - ARG 1 isProjectile - ARG 2 isExplosion - ARG 3 bypassesArmor - ARG 4 bypassesInvulnerability - ARG 5 bypassesMagic - ARG 6 isFire - ARG 7 isMagic - ARG 8 isLightning - ARG 9 directEntity - ARG 10 sourceEntity METHOD method_8845 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1282;)Z ARG 1 world ARG 2 pos @@ -31,47 +12,16 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredic ARG 1 player ARG 2 damageSource METHOD method_8848 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8849 getBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; - ARG 0 obj - ARG 1 name - METHOD method_8850 addProperty (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Boolean;)V - ARG 1 json - ARG 2 key - ARG 3 value CLASS class_2023 Builder - FIELD field_9542 bypassesMagic Ljava/lang/Boolean; - FIELD field_9543 bypassesInvulnerability Ljava/lang/Boolean; FIELD field_9544 directEntity Lnet/minecraft/class_2048; FIELD field_9545 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9546 isExplosion Ljava/lang/Boolean; - FIELD field_9547 isProjectile Ljava/lang/Boolean; - FIELD field_9548 bypassesArmor Ljava/lang/Boolean; - FIELD field_9549 isFire Ljava/lang/Boolean; - FIELD field_9550 isMagic Ljava/lang/Boolean; - FIELD field_9551 isLightning Ljava/lang/Boolean; METHOD method_35130 directEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity METHOD method_35131 sourceEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity METHOD method_35132 sourceEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity - METHOD method_35133 explosion (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 explosion - METHOD method_35134 bypassesArmor (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 bypassesArmor - METHOD method_35135 bypassesInvulnerability (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 bypassesInvulnerability - METHOD method_35136 bypassesMagic (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 bypassesMagic - METHOD method_35137 fire (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 fire - METHOD method_35138 magic (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 magic METHOD method_8851 build ()Lnet/minecraft/class_2022; - METHOD method_8852 projectile (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 projectile - METHOD method_8853 lightning (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 lightning METHOD method_8854 directEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity METHOD method_8855 create ()Lnet/minecraft/class_2022$class_2023; diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index 630a0226b9..730e8f8b46 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller METHOD method_12821 fillInputSlots (Lnet/minecraft/class_1860;Z)V ARG 1 recipe ARG 2 craftAll - METHOD method_12822 returnInputs (Z)V + METHOD method_12822 returnInputs ()V METHOD method_12823 getFreeInventorySlots ()I METHOD method_12824 fillInputSlot (Lnet/minecraft/class_1735;Lnet/minecraft/class_1799;)V ARG 1 slot diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index cf8c6cd0d9..d8abd71287 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -33,10 +33,6 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_34265 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 2 stack METHOD method_34266 getIndex ()I - METHOD method_44206 setStackNoCallbacks (Lnet/minecraft/class_1799;)V - COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Unlike - COMMENT {@link #setStack} subclasses may not override this method to perform additional operations. - ARG 1 stack METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 8be453683d..a5880870a1 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -240,8 +240,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 entity METHOD method_48069 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity - METHOD method_48070 (ZLcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; - ARG 1 context METHOD method_48071 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity METHOD method_48072 (Lnet/minecraft/class_1297;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/server/command/SummonCommand.mapping b/mappings/net/minecraft/server/command/SummonCommand.mapping index 8127a16cce..977d594aa1 100644 --- a/mappings/net/minecraft/server/command/SummonCommand.mapping +++ b/mappings/net/minecraft/server/command/SummonCommand.mapping @@ -19,5 +19,3 @@ CLASS net/minecraft/class_3138 net/minecraft/server/command/SummonCommand ARG 2 pos ARG 3 nbt ARG 4 initialize - METHOD method_18192 (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; - ARG 1 entity diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping index 8d7b12d441..84ed090866 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 1 session ARG 2 safeMode ARG 3 dataPackManager - METHOD method_41892 tryLoad (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Ljava/lang/Runnable;)V + METHOD method_41892 tryLoad (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Ljava/lang/Runnable;Z)V ARG 0 client ARG 1 parent ARG 2 lifecycle diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 0a395db262..72c01bd4bc 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -282,22 +282,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT @implNote Unlike {@link java.util.List#lastIndexOf}, the returned function will COMMENT return {@code 0} when given values not in the passed list. ARG 0 values - METHOD method_43926 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, - COMMENT otherwise {@code null}} - COMMENT - COMMENT

This is the nullable equivalent to {@link Optional#map}. - ARG 0 value - ARG 1 mapper - METHOD method_43927 mapOrElse (Ljava/lang/Object;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/lang/Object; - COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, - COMMENT otherwise {@code other}} - COMMENT - COMMENT

This is the nullable equivalent to {@link Optional#map} chained with - COMMENT {@link Optional#orElse}. - ARG 0 value - ARG 1 mapper - ARG 2 other METHOD method_44146 lastIndexGetter (Ljava/util/List;Ljava/util/function/IntFunction;)Ljava/util/function/ToIntFunction; COMMENT {@return a function that, when given a value in {@code values}, returns the last COMMENT index of the value in the list} diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 4bcea06513..282133e5e8 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -32,15 +32,9 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9251 thunderGradientPrev F FIELD field_9253 rainGradientPrev F FIELD field_9256 lcgBlockSeed I - METHOD (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Ljava/util/function/Supplier;ZZJI)V + METHOD (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_5455;Lnet/minecraft/class_6880;Ljava/util/function/Supplier;ZZJI)V ARG 1 properties ARG 2 registryRef - ARG 3 dimension - ARG 4 profiler - ARG 5 isClient - ARG 6 debugWorld - ARG 7 seed - ARG 9 maxChainedNeighborUpdates METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16109 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 pos