From 6d9dc3a565e9f8130dce25266612d2d9800b1eb1 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 22 Feb 2023 17:22:18 +0000 Subject: [PATCH] 1.19.4-pre1 --- build.gradle | 2 +- .../net/minecraft/SharedConstants.mapping | 1 - .../net/minecraft/block/HopperBlock.mapping | 2 +- mappings/net/minecraft/class_8197.mapping | 21 ++++ .../client/font/TextRenderer.mapping | 8 +- .../client/gui/DrawableHelper.mapping | 100 ------------------ .../minecraft/client/gui/LogoDrawer.mapping | 6 -- .../client/gui/hud/InGameHud.mapping | 9 +- .../screen/GameModeSelectionScreen.mapping | 5 +- .../screen/advancement/AdvancementTab.mapping | 8 +- .../advancement/AdvancementTabType.mapping | 14 +-- .../gui/screen/ingame/HandledScreen.mapping | 6 +- .../gui/screen/ingame/InventoryScreen.mapping | 14 +-- .../screen/ingame/StonecutterScreen.mapping | 5 +- .../gui/screen/option/OptionsScreen.mapping | 2 - .../client/gui/screen/pack/PackScreen.mapping | 7 -- .../RecipeGroupButtonWidget.mapping | 3 +- .../screen/world/CreateWorldScreen.mapping | 3 - .../screen/world/ExperimentsScreen.mapping | 1 - .../client/gui/widget/ClickableWidget.mapping | 17 --- .../gui/widget/IconButtonWidget.mapping | 8 -- .../client/gui/widget/PressableWidget.mapping | 1 + .../client/gui/widget/SliderWidget.mapping | 1 + .../gui/widget/TabNavigationWidget.mapping | 32 +----- .../client/gui/widget/Widget.mapping | 1 + .../net/minecraft/client/main/Main.mapping | 3 - .../realms/RealmsObjectSelectionList.mapping | 2 +- .../gui/screen/RealmsMainScreen.mapping | 4 - .../screen/RealmsNotificationsScreen.mapping | 8 -- .../client/render/item/ItemRenderer.mapping | 71 ++----------- .../texture/atlas/AtlasSourceManager.mapping | 2 - .../client/toast/TutorialToast.mapping | 5 +- mappings/net/minecraft/data/Main.mapping | 2 - .../server/BiomeParametersProvider.mapping | 2 - ...laAdventureTabAdvancementGenerator.mapping | 2 +- .../data/server/tag/ItemTagProvider.mapping | 5 +- .../data/server/tag/TagProvider.mapping | 6 -- .../OneTwentyBlockTagProvider.mapping | 2 +- .../minecraft/datafixer/DataFixTypes.mapping | 1 - .../datafixer/DataFixerPhase.mapping | 1 - .../net/minecraft/datafixer/Schemas.mapping | 3 +- .../fix/SavedDataVillageCropFix.mapping | 9 -- .../datafixer/schema/Schema1451v7.mapping | 5 - mappings/net/minecraft/entity/Entity.mapping | 3 +- .../minecraft/entity/ItemSteerable.mapping | 7 -- .../net/minecraft/entity/LivingEntity.mapping | 4 - .../minecraft/entity/SaddledComponent.mapping | 2 - .../entity/mob/RavagerEntity.mapping | 2 - .../passive/AbstractHorseEntity.mapping | 8 +- .../entity/passive/PigEntity.mapping | 1 - .../entity/passive/StriderEntity.mapping | 4 - .../play/PlayerPositionLookS2CPacket.mapping | 5 +- .../network/ServerPlayNetworkHandler.mapping | 15 --- .../world/ThreadedAnvilChunkStorage.mapping | 2 - .../minecraft/util/StringIdentifiable.mapping | 8 -- mappings/net/minecraft/util/Util.mapping | 7 +- .../net/minecraft/util/math/BlockPos.mapping | 4 - .../net/minecraft/util/math/Vec3i.mapping | 16 --- .../world/biome/SpawnSettings.mapping | 8 +- .../world/biome/source/BiomeSource.mapping | 6 +- .../source/MultiNoiseBiomeSource.mapping | 71 +------------ .../minecraft/world/gen/WorldPresets.mapping | 3 - 62 files changed, 70 insertions(+), 516 deletions(-) create mode 100644 mappings/net/minecraft/class_8197.mapping delete mode 100644 mappings/net/minecraft/datafixer/DataFixerPhase.mapping delete mode 100644 mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping delete mode 100644 mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping diff --git a/build.gradle b/build.gradle index 35c6c02266..539112de1c 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w07a" +def minecraft_version = "1.19.4-pre1" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index aaf590cdcb..8ec56fdacc 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -24,7 +24,6 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants FIELD field_34372 DEBUG_NOISE Z FIELD field_34373 CURRENT_SERIES Ljava/lang/String; FIELD field_36325 CRASH_ON_UNCAUGHT_THREAD_EXCEPTION Z - FIELD field_38828 dataFixerPhase Lnet/minecraft/class_7395; METHOD method_16673 getGameVersion ()Lnet/minecraft/class_6489; METHOD method_31372 getProtocolVersion ()I METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V diff --git a/mappings/net/minecraft/block/HopperBlock.mapping b/mappings/net/minecraft/block/HopperBlock.mapping index fd0f57c0ec..565aabc5b3 100644 --- a/mappings/net/minecraft/block/HopperBlock.mapping +++ b/mappings/net/minecraft/block/HopperBlock.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2377 net/minecraft/block/HopperBlock FIELD field_11133 EAST_RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_11134 EAST_SHAPE Lnet/minecraft/class_265; FIELD field_11135 WEST_RAYCAST_SHAPE Lnet/minecraft/class_265; - METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V ARG 1 world ARG 2 pos ARG 3 state diff --git a/mappings/net/minecraft/class_8197.mapping b/mappings/net/minecraft/class_8197.mapping new file mode 100644 index 0000000000..f181594e74 --- /dev/null +++ b/mappings/net/minecraft/class_8197.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_8197 + CLASS class_5305 Preset + FIELD comp_1309 id Lnet/minecraft/class_2960; + FIELD comp_1310 biomeSourceFunction Lnet/minecraft/class_8197$class_5305$class_8165; + FIELD field_24723 NETHER Lnet/minecraft/class_8197$class_5305; + FIELD field_24724 BY_IDENTIFIER Ljava/util/Map; + FIELD field_34499 OVERWORLD Lnet/minecraft/class_8197$class_5305; + FIELD field_42721 OVERWORLD_UPDATE_1_20 Lnet/minecraft/class_8197$class_5305; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_8197$class_5305$class_8165;)V + ARG 1 id + ARG 2 biomeSourceFunction + METHOD comp_1309 id ()Lnet/minecraft/class_2960; + METHOD comp_1310 biomeSourceFunction ()Lnet/minecraft/class_8197$class_5305$class_8165; + METHOD method_49192 (Lcom/google/common/collect/ImmutableList$Builder;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 pair + METHOD method_49193 getOverworldEntries (Ljava/util/function/Function;Lnet/minecraft/class_6554$class_8166;)Lnet/minecraft/class_6544$class_6547; + ARG 0 biomeEntryGetter + ARG 1 parametersType + CLASS class_8165 BiomeSourceFunction + METHOD apply (Ljava/util/function/Function;)Lnet/minecraft/class_6544$class_6547; + ARG 1 biomeEntryGetter diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index 65e3e56e30..d0a6dd55f5 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -31,13 +31,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 11 blue ARG 12 alpha ARG 13 light - METHOD method_1712 drawTrimmed (Lnet/minecraft/class_5348;IIII)V - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 maxWidth - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format + METHOD method_1712 drawTrimmed (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;IIII)V METHOD method_1713 getWrappedLinesHeight (Ljava/lang/String;I)I COMMENT Gets the height of the text when it has been wrapped. COMMENT diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index ec84ca5c50..d7878e1e6a 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper - FIELD field_22734 zOffset I - COMMENT The z offset used by {@link DrawableHelper}. FIELD field_22735 OPTIONS_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; COMMENT The texture used by options for background. FIELD field_22736 STATS_ICON_TEXTURE Lnet/minecraft/class_2960; @@ -56,11 +54,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 9 textureHeight COMMENT the height of the entire texture METHOD method_25292 drawHorizontalLine (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x1 - ARG 3 x2 - ARG 4 y - ARG 5 color METHOD method_25293 drawTexture (Lnet/minecraft/class_4587;IIIIFFIIII)V COMMENT Draws a textured rectangle from a region in a texture. ARG 0 matrices @@ -94,23 +87,8 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 5 color METHOD method_25295 drawTexturedQuad (Lorg/joml/Matrix4f;IIIIIFFFF)V ARG 0 matrix - ARG 1 x0 - ARG 2 x1 - ARG 3 y0 - ARG 4 y1 ARG 5 z - ARG 6 u0 - ARG 7 u1 - ARG 8 v0 - ARG 9 v1 METHOD method_25296 fillGradient (Lnet/minecraft/class_4587;IIIIII)V - ARG 1 matrices - ARG 2 startX - ARG 3 startY - ARG 4 endX - ARG 5 endY - ARG 6 colorStart - ARG 7 colorEnd METHOD method_25297 drawTexture (Lnet/minecraft/class_4587;IIIIIIIFFII)V ARG 0 matrices ARG 1 x0 @@ -132,14 +110,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 4 width ARG 5 height ARG 6 sprite - METHOD method_25299 fill (Lorg/joml/Matrix4f;IIIIII)V - ARG 0 matrix - ARG 1 x1 - ARG 2 y1 - ARG 3 x2 - ARG 4 y2 - ARG 5 z - ARG 6 color METHOD method_25300 drawCenteredTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V ARG 0 matrices ARG 1 textRenderer @@ -148,11 +118,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 4 y ARG 5 color METHOD method_25301 drawVerticalLine (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y1 - ARG 4 y2 - ARG 5 color METHOD method_25302 drawTexture (Lnet/minecraft/class_4587;IIIIII)V COMMENT Draws a textured rectangle from a region in a 256x256 texture. COMMENT @@ -160,20 +125,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper COMMENT COMMENT

The width and height of the region are the same as COMMENT the dimensions of the rectangle. - ARG 1 matrices - COMMENT the matrix stack used for rendering - ARG 2 x - COMMENT the X coordinate of the rectangle - ARG 3 y - COMMENT the Y coordinate of the rectangle - ARG 4 u - COMMENT the left-most coordinate of the texture region - ARG 5 v - COMMENT the top-most coordinate of the texture region - ARG 6 width - COMMENT the width - ARG 7 height - COMMENT the height METHOD method_25303 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V ARG 0 matrices ARG 1 textRenderer @@ -181,16 +132,9 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 3 x ARG 4 y ARG 5 color - METHOD method_25304 setZOffset (I)V - ARG 1 zOffset - METHOD method_25305 getZOffset ()I METHOD method_27533 fillGradient (Lorg/joml/Matrix4f;Lnet/minecraft/class_287;IIIIIII)V ARG 0 matrix ARG 1 builder - ARG 2 startX - ARG 3 startY - ARG 4 endX - ARG 5 endY ARG 6 z ARG 7 colorStart ARG 8 colorEnd @@ -209,10 +153,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 4 y ARG 5 color METHOD method_29343 drawWithOutline (IILjava/util/function/BiConsumer;)V - ARG 1 x - ARG 2 y - ARG 3 renderAction - COMMENT the action to render both the content and the outline, taking x and y positions as input METHOD method_33284 fillGradient (Lnet/minecraft/class_4587;IIIIIII)V ARG 0 matrices ARG 1 startX @@ -264,51 +204,11 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 10 alpha METHOD method_48466 drawTexturedQuad (Lorg/joml/Matrix4f;IIIIIFFFFFFFF)V ARG 0 matrix - ARG 1 x0 - ARG 2 x1 - ARG 3 y0 - ARG 4 y1 ARG 5 z - ARG 6 u0 - ARG 7 u1 - ARG 8 v0 - ARG 9 v1 ARG 10 red ARG 11 green ARG 12 blue ARG 13 alpha METHOD method_48585 drawRepeatingTexture (Lnet/minecraft/class_4587;IIIIIIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 u - ARG 7 v - ARG 8 textureWidth - ARG 9 textureHeight METHOD method_48586 drawNineSlicedTexture (Lnet/minecraft/class_4587;IIIIIIIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 outerSliceSize - ARG 7 centerSliceWidth - ARG 8 centerSliceHeight - ARG 9 u - ARG 10 v METHOD method_48587 drawNineSlicedTexture (Lnet/minecraft/class_4587;IIIIIIIIIIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 leftSliceWidth - ARG 7 topSliceHeight - ARG 8 rightSliceWidth - ARG 9 bottomSliceHeight - ARG 10 centerSliceWidth - ARG 11 centerSliceHeight - ARG 12 u - ARG 13 v diff --git a/mappings/net/minecraft/client/gui/LogoDrawer.mapping b/mappings/net/minecraft/client/gui/LogoDrawer.mapping index 716b2db51f..c83eeec51a 100644 --- a/mappings/net/minecraft/client/gui/LogoDrawer.mapping +++ b/mappings/net/minecraft/client/gui/LogoDrawer.mapping @@ -14,9 +14,3 @@ CLASS net/minecraft/class_8020 net/minecraft/client/gui/LogoDrawer ARG 2 screenWidth ARG 3 alpha ARG 4 y - METHOD method_48211 (Lnet/minecraft/class_4587;Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 2 x - ARG 3 y - METHOD method_48212 (Lnet/minecraft/class_4587;Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 2 x - ARG 3 y diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 689bfd52c6..0a78a8ffdc 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -58,7 +58,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 matrices ARG 2 entity METHOD method_1736 renderCrosshair (Lnet/minecraft/class_4587;)V - ARG 1 matrices METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; @@ -105,13 +104,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V COMMENT Renders the armor, health, air, and hunger bars. ARG 1 matrices - METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V - ARG 1 x - ARG 2 y - ARG 3 tickDelta - ARG 4 player - ARG 5 stack - ARG 6 seed + METHOD method_1762 renderHotbarItem (Lnet/minecraft/class_4587;IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_4587;)V diff --git a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping index 22004f0794..27570974b2 100644 --- a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping @@ -32,10 +32,7 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection ARG 4 command ARG 5 icon METHOD method_28070 getText ()Lnet/minecraft/class_2561; - METHOD method_28074 renderIcon (Lnet/minecraft/class_918;II)V - ARG 1 itemRenderer - ARG 2 x - ARG 3 y + METHOD method_28074 renderIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_918;II)V METHOD method_28075 getCommand ()Ljava/lang/String; METHOD method_28076 of (Lnet/minecraft/class_1934;)Ljava/util/Optional; ARG 0 gameMode diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping index d555931621..cad444b24f 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -28,8 +28,7 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2308 getWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement METHOD method_2309 getTitle ()Lnet/minecraft/class_2561; - METHOD method_2310 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_2310 render (Lnet/minecraft/class_4587;II)V METHOD method_2311 drawBackground (Lnet/minecraft/class_4587;IIZ)V ARG 1 matrices ARG 2 x @@ -45,10 +44,7 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc ARG 3 mouseY ARG 4 x ARG 5 y - METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V - ARG 1 x - ARG 2 y - ARG 3 itemRenderer + METHOD method_2315 drawIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_918;)V METHOD method_2316 isClickOnTab (IIDD)Z ARG 1 screenX ARG 2 screenY diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index 747c95789c..f3f2c4da2f 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -10,13 +10,8 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc ARG 5 width ARG 6 height ARG 7 tabCount - METHOD method_2301 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;IIZI)V + METHOD method_2301 drawBackground (Lnet/minecraft/class_4587;IIZI)V ARG 1 matrices - ARG 2 tab - ARG 3 x - ARG 4 y - ARG 5 selected - ARG 6 index METHOD method_2302 getTabX (I)I ARG 1 index METHOD method_2303 isClickOnTab (IIIDD)Z @@ -28,9 +23,4 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2304 getTabCount ()I METHOD method_2305 getTabY (I)I ARG 1 index - METHOD method_2306 drawIcon (IIILnet/minecraft/class_918;Lnet/minecraft/class_1799;)V - ARG 1 x - ARG 2 y - ARG 3 index - ARG 4 itemRenderer - ARG 5 icon + METHOD method_2306 drawIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_918;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping index 7477040be0..c11b4c864c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping @@ -54,11 +54,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 5 left ARG 6 top ARG 7 button - METHOD method_2382 drawItem (Lnet/minecraft/class_1799;IILjava/lang/String;)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 amountText + METHOD method_2382 drawItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;IILjava/lang/String;)V METHOD method_2383 onMouseClick (Lnet/minecraft/class_1735;IILnet/minecraft/class_1713;)V COMMENT @see net.minecraft.screen.ScreenHandler#onSlotClick(int, int, net.minecraft.screen.slot.SlotActionType, net.minecraft.entity.player.PlayerEntity) ARG 1 slot diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index bec02cb5d5..d86d7b92dd 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -10,15 +10,5 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc ARG 1 player METHOD method_19891 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_2486 drawEntity (IIIFFLnet/minecraft/class_1309;)V - ARG 0 x - ARG 1 y - ARG 2 size - ARG 3 mouseX - ARG 4 mouseY - ARG 5 entity - METHOD method_48472 drawEntity (IIILorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V - ARG 0 x - ARG 1 y - ARG 2 size - ARG 5 entity + METHOD method_2486 drawEntity (Lnet/minecraft/class_4587;IIIFFLnet/minecraft/class_1309;)V + METHOD method_48472 drawEntity (Lnet/minecraft/class_4587;IIILorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index ea8eb448fc..33a3463cc3 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -17,10 +17,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_17951 renderRecipeIcons (III)V - ARG 1 x - ARG 2 y - ARG 3 scrollOffset + METHOD method_17951 renderRecipeIcons (Lnet/minecraft/class_4587;III)V METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_4587;IIIII)V ARG 1 matrices ARG 2 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping index ded0f048e6..84d1f6ed61 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre ARG 2 gameOptions METHOD method_20374 lockDifficulty (Z)V ARG 1 difficultyLocked - METHOD method_29975 refreshResourcePacks (Lnet/minecraft/class_3283;)V - ARG 1 resourcePackManager METHOD method_39486 createDifficultyButtonWidget (IILjava/lang/String;Lnet/minecraft/class_310;)Lnet/minecraft/class_5676; ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index 9c75618522..8db1bf0386 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen FIELD field_25465 DROP_INFO Lnet/minecraft/class_2561; FIELD field_25466 FOLDER_INFO Lnet/minecraft/class_2561; FIELD field_25468 organizer Lnet/minecraft/class_5369; - FIELD field_25469 parent Lnet/minecraft/class_437; FIELD field_25472 availablePackList Lnet/minecraft/class_521; FIELD field_25473 selectedPackList Lnet/minecraft/class_521; FIELD field_25474 file Ljava/nio/file/Path; @@ -12,12 +11,6 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen FIELD field_25787 directoryWatcher Lnet/minecraft/class_5375$class_5426; FIELD field_25788 refreshTimeout J FIELD field_25789 iconTextures Ljava/util/Map; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_2561;)V - ARG 1 parent - ARG 2 packManager - ARG 3 applier - ARG 4 file - ARG 5 title METHOD method_29669 copyPacks (Lnet/minecraft/class_310;Ljava/util/List;Ljava/nio/file/Path;)V ARG 0 client ARG 1 srcPaths diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping index 33d7d9ded3..92c1c9be71 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_512 net/minecraft/client/gui/screen/recipebook/RecipeG FIELD field_3123 category Lnet/minecraft/class_314; METHOD (Lnet/minecraft/class_314;)V ARG 1 category - METHOD method_2621 renderIcons (Lnet/minecraft/class_918;)V - ARG 1 itemRenderer + METHOD method_2621 renderIcons (Lnet/minecraft/class_4587;Lnet/minecraft/class_918;)V METHOD method_2622 checkForNewRecipes (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_2623 getCategory ()Lnet/minecraft/class_314; diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 46c5e7da4d..41b2a04439 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -96,9 +96,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/util/function/Consumer;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object; - ARG 2 void_ - ARG 3 throwable METHOD method_45686 (Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; ARG 0 context METHOD method_48643 (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;Ljava/util/function/Consumer;Z)V diff --git a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping index 384e6a5efd..537812beca 100644 --- a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_8134 net/minecraft/client/gui/screen/world/Experiments ARG 1 parent ARG 2 resourcePackManager ARG 3 applier - METHOD method_49015 navigateBack ()V METHOD method_49016 getDataPackName (Lnet/minecraft/class_3288;)Lnet/minecraft/class_2561; ARG 0 packProfile METHOD method_49017 (Lnet/minecraft/class_3288;Ljava/lang/Boolean;)V diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 6a1b656dc8..148331d497 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -37,25 +37,15 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 1 alpha METHOD method_25351 isValidClickButton (I)Z ARG 1 button - METHOD method_25353 renderBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;II)V - ARG 1 matrices - ARG 2 client - ARG 3 mouseX - ARG 4 mouseY METHOD method_25354 playDownSound (Lnet/minecraft/class_1144;)V ARG 1 soundManager METHOD method_25355 setMessage (Lnet/minecraft/class_2561;)V ARG 1 message - METHOD method_25356 getYImage ()I METHOD method_25357 onRelease (DD)V ARG 1 mouseX ARG 3 mouseY 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; METHOD method_25361 clicked (DD)Z ARG 1 mouseX @@ -80,7 +70,6 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_47402 setTooltipDelay (I)V ARG 1 delay METHOD method_47937 getTooltipPositioner ()Lnet/minecraft/class_8000; - METHOD method_48203 getTexture ()Lnet/minecraft/class_2960; METHOD method_48579 renderButton (Lnet/minecraft/class_4587;IIF)V ARG 1 matrices ARG 2 mouseX @@ -98,11 +87,5 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 9 height ARG 10 textureWidth ARG 11 textureHeight - METHOD method_48589 drawMessage (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;III)V - ARG 1 matrices - ARG 2 textRenderer - ARG 3 centerX - ARG 4 y - ARG 5 color METHOD method_48591 setNavigationOrder (I)V ARG 1 navigationOrder diff --git a/mappings/net/minecraft/client/gui/widget/IconButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/IconButtonWidget.mapping index f9a781d54d..5e3c95ab8f 100644 --- a/mappings/net/minecraft/client/gui/widget/IconButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/IconButtonWidget.mapping @@ -4,18 +4,10 @@ CLASS net/minecraft/class_8084 net/minecraft/client/gui/widget/IconButtonWidget FIELD field_42125 iconWidth I FIELD field_42126 iconHeight I METHOD (Lnet/minecraft/class_2561;IIIIIIIIILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V - ARG 1 message - ARG 2 u - ARG 3 v ARG 4 xOffset ARG 5 yOffset - ARG 6 hoveredVOffset ARG 7 iconWidth ARG 8 iconHeight - ARG 9 textureWidth - ARG 10 textureHeight - ARG 11 texture - ARG 12 pressAction METHOD method_48600 getXWithOffset ()I METHOD method_48601 builder (Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)Lnet/minecraft/class_8084$class_8085; ARG 0 message diff --git a/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping index 77524be225..de8c0719e4 100644 --- a/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_4264 net/minecraft/client/gui/widget/PressableWidget COMMENT A pressable widget has a press action. It is pressed when it is clicked. It is COMMENT also pressed when enter or space keys are pressed when it is selected. METHOD method_25306 onPress ()V + METHOD method_48589 drawMessage (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;I)V diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index cd65f528c6..71cf5b3230 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -22,4 +22,5 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget METHOD method_25347 setValue (D)V ARG 1 value COMMENT the new value; will be clamped to {@code [0, 1]} + METHOD method_25356 getYImage ()I METHOD method_48204 getTextureV ()I diff --git a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping index 0a62d92266..34282bab7d 100644 --- a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping @@ -2,29 +2,14 @@ CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidg FIELD field_42145 tabNavWidth I FIELD field_42146 tabManager Lnet/minecraft/class_8088; FIELD field_42147 tabs Lcom/google/common/collect/ImmutableList; - FIELD field_42148 tabButtons Lcom/google/common/collect/ImmutableMap; - METHOD (IIILnet/minecraft/class_8088;Ljava/lang/Iterable;)V + FIELD field_42148 tabButtons Lcom/google/common/collect/ImmutableList; + METHOD (ILnet/minecraft/class_8088;Ljava/lang/Iterable;)V ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 tabManager - ARG 5 tabs METHOD method_48618 setWidth (I)V ARG 1 width - METHOD method_48619 (Lnet/minecraft/class_4185;)V - ARG 0 button - 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; ARG 0 tabManager ARG 1 width - METHOD method_48624 selectTab (Ljava/util/Optional;Lnet/minecraft/class_8087;)V - ARG 1 button - ARG 2 tab - METHOD method_48626 (Lnet/minecraft/class_4185;)V - ARG 0 button - METHOD method_48986 selectTab (Lnet/minecraft/class_8087;)V - ARG 1 tab METHOD method_48987 selectTab (I)V ARG 1 index METHOD method_48988 trySwitchTabsWithKey (I)Z @@ -33,8 +18,6 @@ CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidg METHOD method_48990 getTabForKey (I)I ARG 1 keyCode CLASS class_8090 Builder - FIELD field_42149 x I - FIELD field_42150 y I FIELD field_42151 width I FIELD field_42152 tabManager Lnet/minecraft/class_8088; FIELD field_42153 tabs Ljava/util/List; @@ -42,16 +25,5 @@ CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidg ARG 1 tabManager ARG 2 width METHOD method_48627 build ()Lnet/minecraft/class_8089; - METHOD method_48628 x (I)Lnet/minecraft/class_8089$class_8090; - ARG 1 x - METHOD method_48629 position (II)Lnet/minecraft/class_8089$class_8090; - ARG 1 x - ARG 2 y - METHOD method_48630 tab (Lnet/minecraft/class_8087;)Lnet/minecraft/class_8089$class_8090; - ARG 1 tab METHOD method_48631 tabs ([Lnet/minecraft/class_8087;)Lnet/minecraft/class_8089$class_8090; ARG 1 tabs - METHOD method_48632 y (I)Lnet/minecraft/class_8089$class_8090; - ARG 1 y - METHOD method_48633 width (I)Lnet/minecraft/class_8089$class_8090; - ARG 1 width diff --git a/mappings/net/minecraft/client/gui/widget/Widget.mapping b/mappings/net/minecraft/client/gui/widget/Widget.mapping index 3de8270847..73d746f42a 100644 --- a/mappings/net/minecraft/client/gui/widget/Widget.mapping +++ b/mappings/net/minecraft/client/gui/widget/Widget.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_8021 net/minecraft/client/gui/widget/Widget ARG 1 x METHOD method_46426 getX ()I METHOD method_46427 getY ()I + METHOD method_48202 getNavigationFocus ()Lnet/minecraft/class_8030; METHOD method_48206 forEachChild (Ljava/util/function/Consumer;)V ARG 1 consumer METHOD method_48229 setPosition (II)V diff --git a/mappings/net/minecraft/client/main/Main.mapping b/mappings/net/minecraft/client/main/Main.mapping index 6a8752528f..5693cf95b6 100644 --- a/mappings/net/minecraft/client/main/Main.mapping +++ b/mappings/net/minecraft/client/main/Main.mapping @@ -11,6 +11,3 @@ CLASS net/minecraft/client/main/Main ARG 0 i METHOD method_38752 toOptional (Ljava/lang/String;)Ljava/util/Optional; ARG 0 string - METHOD method_44604 main ([Ljava/lang/String;Z)V - ARG 0 args - ARG 1 optimizeDataFixer diff --git a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping index b9169194f3..81d69e08dd 100644 --- a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping +++ b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_4904 net/minecraft/client/realms/RealmsObjectSelection ARG 5 itemHeight METHOD method_25489 setSelected (I)V ARG 1 index - METHOD method_25490 itemClicked (IIDDI)V + METHOD method_25490 itemClicked (IIDDII)V ARG 1 cursorY ARG 2 selectionIndex ARG 3 mouseX diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index c2642cca0d..0f3bd2b1d3 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -77,8 +77,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_42859 PLAY_TEXT Lnet/minecraft/class_2561; FIELD field_42860 LEAVE_TEXT Lnet/minecraft/class_2561; FIELD field_42861 CONFIGURE_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;)V - ARG 1 lastScreen METHOD method_20834 onClosePopup ()V METHOD method_20835 popupX0 ()I METHOD method_20836 popupY0 ()I @@ -239,8 +237,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain CLASS class_4327 NewsButton METHOD method_25022 (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_45572 (Lnet/minecraft/class_4325;Z)V - ARG 1 confirmed CLASS class_4328 PendingInvitesButton METHOD method_37005 updatePendingText ()V CLASS class_4329 RealmSelectionList diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping index e524b4efba..f0571ca097 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping @@ -15,11 +15,3 @@ CLASS net/minecraft/class_4399 net/minecraft/client/realms/gui/screen/RealmsNoti ARG 3 mouseY METHOD method_25169 shouldShowNotifications ()Z METHOD method_25170 isTitleScreen ()Z - METHOD method_44624 createPeriodicRunnersManager (Lnet/minecraft/class_7578;)Lnet/minecraft/class_7581$class_7584; - ARG 1 periodicCheckers - METHOD method_44625 (Lnet/minecraft/class_7578;Lnet/minecraft/class_4876;)V - ARG 1 news - METHOD method_44626 (Ljava/lang/Boolean;)V - ARG 0 trialAvailable - METHOD method_44627 (Ljava/lang/Integer;)V - ARG 1 pendingInvitesCount diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 7cea3157e0..a455967b09 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer - FIELD field_21010 ENCHANTED_ITEM_GLINT Lnet/minecraft/class_2960; FIELD field_27770 builtinModelItemRenderer Lnet/minecraft/class_756; FIELD field_32935 COMPASS_WITH_GLINT_GUI_MODEL_MULTIPLIER F FIELD field_32936 COMPASS_WITH_GLINT_FIRST_PERSON_MODEL_MULTIPLIER F @@ -10,7 +9,6 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer FIELD field_42073 client Lnet/minecraft/class_310; FIELD field_4728 WITHOUT_MODELS Ljava/util/Set; FIELD field_4729 textureManager Lnet/minecraft/class_1060; - FIELD field_4730 zOffset F FIELD field_4732 models Lnet/minecraft/class_763; FIELD field_4733 colors Lnet/minecraft/class_325; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;Lnet/minecraft/class_756;)V @@ -67,25 +65,17 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 4 overlay ARG 5 matrices ARG 6 vertices - METHOD method_27951 renderInGuiWithOverrides (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;III)V + METHOD method_27951 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;III)V COMMENT Renders an item in a GUI with an attached entity. COMMENT COMMENT

The entity is used to calculate model overrides for the item. - ARG 1 entity - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 seed METHOD method_27952 getArmorGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 solid ARG 3 glint - METHOD method_27953 renderInGui (Lnet/minecraft/class_1799;II)V + METHOD method_27953 renderInGui (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V COMMENT Renders an item in a GUI without an attached entity. - ARG 1 stack - ARG 2 x - ARG 3 y METHOD method_29711 getDirectItemGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer @@ -99,64 +89,25 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 0 provider ARG 1 layer ARG 2 entry - METHOD method_32797 renderInGuiWithOverrides (Lnet/minecraft/class_1799;III)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 seed - METHOD method_36542 renderInGuiWithOverrides (Lnet/minecraft/class_1799;IIII)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 seed - ARG 5 depth - METHOD method_36543 innerRenderInGui (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;III)V - ARG 1 entity - ARG 2 world - ARG 3 stack - ARG 4 x - ARG 5 y - ARG 6 seed - METHOD method_4010 renderGuiItemIcon (Lnet/minecraft/class_1799;II)V - ARG 1 stack - ARG 2 x - ARG 3 y + METHOD method_32797 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;III)V + METHOD method_36542 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;IIII)V + METHOD method_36543 innerRenderInGui (Lnet/minecraft/class_4587;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;III)V + METHOD method_4010 renderGuiItemIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V METHOD method_4012 getModels ()Lnet/minecraft/class_763; METHOD method_4019 getModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; ARG 1 stack ARG 2 world ARG 3 entity ARG 4 seed - METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 model - METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V + METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V + METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count. - ARG 1 renderer - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 countLabel - COMMENT a label for the stack; if null, the stack count is drawn instead - METHOD method_4023 renderInGuiWithOverrides (Lnet/minecraft/class_1799;II)V + METHOD method_4023 renderInGuiWithOverrides (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V COMMENT Renders an item in a GUI with the player as the attached entity COMMENT for calculating model overrides. - ARG 1 stack - ARG 2 x - ARG 3 y - METHOD method_4025 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V + METHOD method_4025 renderGuiItemOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count. - ARG 1 renderer - ARG 2 stack - ARG 3 x - ARG 4 y - METHOD method_4026 innerRenderInGui (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;IIII)V - ARG 1 entity - ARG 2 world - ARG 3 stack - ARG 4 x + METHOD method_4026 innerRenderInGui (Lnet/minecraft/class_4587;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;IIII)V ARG 5 y ARG 6 seed ARG 7 depth diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping index a30c921203..aa5c7ac9bb 100644 --- a/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping +++ b/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping @@ -10,5 +10,3 @@ CLASS net/minecraft/class_7952 net/minecraft/client/texture/atlas/AtlasSourceMan METHOD method_47680 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7951; ARG 0 id ARG 1 codec - METHOD method_47682 (Ljava/util/List;)Ljava/util/List; - ARG 0 sources diff --git a/mappings/net/minecraft/client/toast/TutorialToast.mapping b/mappings/net/minecraft/client/toast/TutorialToast.mapping index d6d392d20f..6bfeb3234f 100644 --- a/mappings/net/minecraft/client/toast/TutorialToast.mapping +++ b/mappings/net/minecraft/client/toast/TutorialToast.mapping @@ -21,8 +21,5 @@ CLASS net/minecraft/class_372 net/minecraft/client/toast/TutorialToast METHOD (Ljava/lang/String;III)V ARG 3 textureSlotX ARG 4 textureSlotY - METHOD method_1994 drawIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;II)V + METHOD method_1994 drawIcon (Lnet/minecraft/class_4587;II)V ARG 1 matrices - ARG 2 helper - ARG 3 x - ARG 4 y diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index 304fce50c1..a3001418db 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/data/Main ARG 0 output METHOD method_46595 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2461; ARG 1 output - METHOD method_46596 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_7807; - ARG 2 output METHOD method_46597 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; ARG 0 output METHOD method_46598 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2463; diff --git a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping index 0604992133..f391b3f159 100644 --- a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping +++ b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_7228 net/minecraft/data/server/BiomeParametersProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture - METHOD method_42028 (Lnet/minecraft/class_7871;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;)Ljava/util/concurrent/CompletableFuture; - ARG 4 preset METHOD method_42030 write (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; ARG 0 path ARG 1 writer diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index 2c7f960b3e..58ea44b1cb 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406; ARG 0 range ARG 1 entity - METHOD method_49356 buildAdventuringTime (Ljava/util/function/Consumer;Lnet/minecraft/class_161;Lnet/minecraft/class_4766$class_5305;)V + METHOD method_49356 buildAdventuringTime (Ljava/util/function/Consumer;Lnet/minecraft/class_161;Lnet/minecraft/class_8197$class_5305;)V ARG 0 exporter ARG 1 parent ARG 2 preset diff --git a/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping index d4d85be935..7b2e6bdb2d 100644 --- a/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_7805 net/minecraft/data/server/tag/ItemTagProvider - FIELD field_40664 blockTags Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;)V + FIELD field_40664 blockTags Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture - ARG 3 blockTagProvider METHOD method_46218 copy (Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V ARG 1 blockTag ARG 2 itemTag diff --git a/mappings/net/minecraft/data/server/tag/TagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping index 4fae529c15..2e87bfa76d 100644 --- a/mappings/net/minecraft/data/server/tag/TagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping @@ -12,18 +12,12 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider ARG 1 tag METHOD method_10514 configure (Lnet/minecraft/class_7225$class_7874;)V ARG 1 lookup - METHOD method_27046 (Ljava/util/function/Predicate;Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; - ARG 3 entry METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495; ARG 1 tag METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; ARG 0 id METHOD method_46832 (Lnet/minecraft/class_7225$class_7226;Lnet/minecraft/class_2960;)Z ARG 2 id - METHOD method_46833 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; - ARG 2 lookup - METHOD method_46834 (Ljava/util/function/Predicate;Lnet/minecraft/class_3497;)Z - ARG 2 tagEntry CLASS class_5124 ProvidedTagBuilder FIELD field_23960 builder Lnet/minecraft/class_3495; METHOD (Lnet/minecraft/class_3495;)V diff --git a/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider.mapping b/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider.mapping index 5ebe8d4776..2378279dd4 100644 --- a/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_7806 net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider - METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture METHOD method_46836 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/datafixer/DataFixTypes.mapping b/mappings/net/minecraft/datafixer/DataFixTypes.mapping index 958dfd875b..e925b2cca3 100644 --- a/mappings/net/minecraft/datafixer/DataFixTypes.mapping +++ b/mappings/net/minecraft/datafixer/DataFixTypes.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_4284 net/minecraft/datafixer/DataFixTypes FIELD field_19222 typeReference Lcom/mojang/datafixers/DSL$TypeReference; METHOD (Ljava/lang/String;ILcom/mojang/datafixers/DSL$TypeReference;)V ARG 3 typeReference - METHOD method_20329 getTypeReference ()Lcom/mojang/datafixers/DSL$TypeReference; METHOD method_48128 update (Lcom/mojang/datafixers/DataFixer;Lcom/mojang/serialization/Dynamic;I)Lcom/mojang/serialization/Dynamic; COMMENT {@return {@code dynamic} updated from {@code oldVersion} to the current version} ARG 1 dataFixer diff --git a/mappings/net/minecraft/datafixer/DataFixerPhase.mapping b/mappings/net/minecraft/datafixer/DataFixerPhase.mapping deleted file mode 100644 index 077546bd11..0000000000 --- a/mappings/net/minecraft/datafixer/DataFixerPhase.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_7395 net/minecraft/datafixer/DataFixerPhase diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index d7a62b559d..68009fceff 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas FIELD field_15775 EMPTY_IDENTIFIER_NORMALIZE Ljava/util/function/BiFunction; FIELD field_15776 EMPTY Ljava/util/function/BiFunction; FIELD field_15777 FIXER Lcom/mojang/datafixers/DataFixer; - FIELD field_38845 LOGGER Lorg/slf4j/Logger; METHOD method_15449 (Ljava/lang/String;)Ljava/lang/String; ARG 0 id METHOD method_15450 getFixer ()Lcom/mojang/datafixers/DataFixer; @@ -12,7 +11,7 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas ARG 0 id METHOD method_15459 (Ljava/lang/String;)Ljava/lang/String; ARG 0 id - METHOD method_15471 create ()Lcom/mojang/datafixers/DataFixer; + METHOD method_15471 create (Ljava/util/Set;)Lcom/mojang/datafixers/DataFixer; METHOD method_30068 replacing (Ljava/lang/String;Ljava/lang/String;)Ljava/util/function/UnaryOperator; ARG 0 old ARG 1 current diff --git a/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping b/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping deleted file mode 100644 index c6856b6ec7..0000000000 --- a/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_1209 net/minecraft/datafixer/fix/SavedDataVillageCropFix - METHOD method_5151 fixVillageChildren (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; - ARG 0 villageChildren - METHOD method_5152 fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - METHOD method_5154 fixSmallPlotCropIds (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - METHOD method_5155 fixLargePlotCropIds (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - METHOD method_5156 fixCropId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; - ARG 1 cropId - METHOD method_5157 fixVillageChildren (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping deleted file mode 100644 index 024832207d..0000000000 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_1235 net/minecraft/datafixer/schema/Schema1451v7 - METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V - ARG 1 schema - ARG 2 entityTypes - ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 61ffacf25d..027c809425 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1045,7 +1045,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 5 z ARG 7 yaw ARG 8 pitch - METHOD method_5642 getPrimaryPassenger ()Lnet/minecraft/class_1297; + METHOD method_5642 getPrimaryPassenger ()Lnet/minecraft/class_1309; COMMENT {@return the passenger in control of this entity, or {@code null} if there is none} COMMENT COMMENT

Rideable entities should override this to return the entity. This is @@ -2262,6 +2262,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

To despawn this entity, call {@link #discard}. COMMENT COMMENT @see #discard + METHOD method_6034 canMoveVoluntarily ()Z METHOD method_7325 isSpectator ()Z COMMENT {@return whether the entity is a spectator} COMMENT diff --git a/mappings/net/minecraft/entity/ItemSteerable.mapping b/mappings/net/minecraft/entity/ItemSteerable.mapping index d83d0291aa..fd25447056 100644 --- a/mappings/net/minecraft/entity/ItemSteerable.mapping +++ b/mappings/net/minecraft/entity/ItemSteerable.mapping @@ -1,9 +1,2 @@ CLASS net/minecraft/class_4981 net/minecraft/entity/ItemSteerable - METHOD method_26313 travel (Lnet/minecraft/class_1308;Lnet/minecraft/class_4980;Lnet/minecraft/class_243;)Z - ARG 1 entity - ARG 2 saddledEntity - ARG 3 movementInput - METHOD method_26315 setMovementInput (Lnet/minecraft/class_243;)V - ARG 1 movementInput - METHOD method_26316 getSaddledSpeed ()F METHOD method_6577 consumeOnAStickItem ()Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index d78f6c905d..6afe83589b 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -85,9 +85,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6278 despawnCounter I FIELD field_6279 handSwingTicks I FIELD field_6280 activeStatusEffects Ljava/util/Map; - FIELD field_6281 airStrafingSpeed F - COMMENT Affects horizontal aerial velocity of entities (eg. when a player jumps, - COMMENT is falling, or is flying, while holding the horizontal movement keys) FIELD field_6282 jumping Z FIELD field_6283 bodyYaw F FIELD field_6284 serverYaw D @@ -423,7 +420,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6032 getHealth ()F METHOD method_6033 setHealth (F)V ARG 1 health - METHOD method_6034 canMoveVoluntarily ()Z METHOD method_6035 tickRiptide (Lnet/minecraft/class_238;Lnet/minecraft/class_238;)V ARG 1 a ARG 2 b diff --git a/mappings/net/minecraft/entity/SaddledComponent.mapping b/mappings/net/minecraft/entity/SaddledComponent.mapping index ea9dde33ad..3d95bf56f2 100644 --- a/mappings/net/minecraft/entity/SaddledComponent.mapping +++ b/mappings/net/minecraft/entity/SaddledComponent.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent FIELD field_23215 boosted Z FIELD field_23216 boostedTime I - FIELD field_23217 currentBoostTime I FIELD field_23218 dataTracker Lnet/minecraft/class_2945; FIELD field_23219 boostTime Lnet/minecraft/class_2940; FIELD field_23220 saddled Lnet/minecraft/class_2940; @@ -12,7 +11,6 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent ARG 3 saddled METHOD method_26307 boost ()V METHOD method_26308 boost (Lnet/minecraft/class_5819;)Z - ARG 1 random METHOD method_26309 writeNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_26310 setSaddled (Z)V diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index f9cd103a0d..3571244bd1 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity METHOD method_26920 createRavagerAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_39955 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_42168 canBecomePrimaryPassenger (Lnet/minecraft/class_1297;)Z - ARG 1 entity METHOD method_7068 knockBack (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7069 (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index bb224f2d10..17b1a85e36 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -50,15 +50,9 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 0 stack METHOD method_33338 areInventoriesDifferent (Lnet/minecraft/class_1263;)Z ARG 1 inventory - METHOD method_45343 jump (FFF)V + METHOD method_45343 jump (FLnet/minecraft/class_243;)V ARG 1 strength - ARG 2 sidewaysSpeed - ARG 3 forwardSpeed METHOD method_45349 shouldAmbientStand ()Z - METHOD method_45358 getHorsebackMovementSpeed (Lnet/minecraft/class_1309;)F - ARG 1 passenger - METHOD method_45359 ignoresMovementInput (Lnet/minecraft/class_1309;)Z - ARG 1 passenger METHOD method_45375 equipHorseArmor (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index fd30ad0422..6c2ef729b6 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -4,4 +4,3 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity FIELD field_6816 SADDLED Lnet/minecraft/class_2940; FIELD field_6817 BREEDING_INGREDIENT Lnet/minecraft/class_1856; METHOD method_26890 createPigAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_5956 canBeControlledByRider (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index 0b2612c163..39a4d1e1f3 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity FIELD field_23246 COLD Lnet/minecraft/class_2940; FIELD field_23247 SADDLED Lnet/minecraft/class_2940; FIELD field_30499 COLD_SADDLED_SPEED F - FIELD field_30500 COLD_SPEED F FIELD field_30501 DEFAULT_SADDLED_SPEED F METHOD method_26344 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type @@ -16,7 +15,6 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD method_26345 getSpeed ()F METHOD method_26347 updateFloating ()V METHOD method_26348 isCold ()Z METHOD method_26349 setCold (Z)V @@ -29,8 +27,6 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity ARG 2 difficulty ARG 3 rider ARG 4 entityData - METHOD method_42169 canEntityControl (Lnet/minecraft/class_1297;)Z - ARG 1 entity CLASS class_4988 Navigation METHOD (Lnet/minecraft/class_4985;Lnet/minecraft/class_1937;)V ARG 1 entity diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping index c2281d87b8..c0d02fb80b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping @@ -6,8 +6,7 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit FIELD field_12394 teleportId I FIELD field_12395 x D FIELD field_12396 flags Ljava/util/Set; - FIELD field_28805 shouldDismount Z - METHOD (DDDFFLjava/util/Set;IZ)V + METHOD (DDDFFLjava/util/Set;I)V ARG 1 x ARG 3 y ARG 5 z @@ -15,7 +14,6 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit ARG 8 pitch ARG 9 flags ARG 10 teleportId - ARG 11 shouldDismount METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11733 getFlags ()Ljava/util/Set; @@ -25,4 +23,3 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit METHOD method_11737 getTeleportId ()I METHOD method_11738 getZ ()D METHOD method_11739 getPitch ()F - METHOD method_33718 shouldDismount ()Z diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 5d6549d27f..7423da7488 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -53,7 +53,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 5 z ARG 7 yaw ARG 8 pitch - ARG 9 flags METHOD method_14363 requestTeleport (DDDFF)V ARG 1 x ARG 3 y @@ -119,20 +118,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 filtered METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V ARG 2 texts - METHOD method_33562 requestTeleportAndDismount (DDDFF)V - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 yaw - ARG 8 pitch - METHOD method_33563 requestTeleport (DDDFFLjava/util/Set;Z)V - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 yaw - ARG 8 pitch - ARG 9 flags - ARG 10 shouldDismount METHOD method_33796 setTextToBook (Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/class_1799;)V ARG 1 messages ARG 2 postProcessor diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 1724bcd13d..0b2d229879 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -308,8 +308,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_43383 getUpdatedChunkNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos METHOD method_46641 getStructurePlacementCalculator ()Lnet/minecraft/class_7869; - METHOD method_47537 sendChunkPacketToWatchingPlayers (Lnet/minecraft/class_2791;)V - ARG 1 chunk CLASS class_3208 EntityTracker COMMENT An entity tracker governs which players' clients can see an entity. Each COMMENT tracker corresponds to one entity in a server world and is mapped from the diff --git a/mappings/net/minecraft/util/StringIdentifiable.mapping b/mappings/net/minecraft/util/StringIdentifiable.mapping index a7503048ce..bb04dacf03 100644 --- a/mappings/net/minecraft/util/StringIdentifiable.mapping +++ b/mappings/net/minecraft/util/StringIdentifiable.mapping @@ -14,14 +14,6 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable ARG 0 enumValues METHOD method_28142 toKeyable ([Lnet/minecraft/class_3542;)Lcom/mojang/serialization/Keyable; ARG 0 values - METHOD method_39516 (Ljava/lang/Object;)Ljava/lang/String; - ARG 0 identifiable - METHOD method_42628 (Ljava/lang/Enum;)Ljava/lang/Enum; - ARG 0 enum_ - METHOD method_42629 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Enum; - ARG 1 id - METHOD method_42630 ([Ljava/lang/Enum;Ljava/lang/String;)Ljava/lang/Enum; - ARG 1 id CLASS 1 METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 9bffcab00e..be89e590f3 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util FIELD field_18034 NEXT_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_18035 MAIN_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD field_24477 IO_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; - FIELD field_24622 BOOTSTRAP_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD field_25140 NIL_UUID Ljava/util/UUID; COMMENT The "nil UUID" that represents lack of a UUID. FIELD field_33859 JAR_FILE_SYSTEM_PROVIDER Ljava/nio/file/spi/FileSystemProvider; @@ -83,10 +82,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 0 name METHOD method_28123 (Ljava/lang/String;Ljava/util/concurrent/ForkJoinPool;)Ljava/util/concurrent/ForkJoinWorkerThread; ARG 1 forkJoinPool - METHOD method_28124 getBootstrapExecutor ()Ljava/util/concurrent/ExecutorService; - COMMENT {@return the executor for asynchronous bootstrapping} - COMMENT - COMMENT

This is used by DataFixerUpper to build schemas. METHOD method_29187 getChoiceType (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type; ARG 0 typeReference ARG 1 id @@ -233,7 +228,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 random METHOD method_43368 (Ljava/util/List;Ljava/lang/Void;)Ljava/util/List; ARG 1 void_ - METHOD method_43369 (Ljava/util/List;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Throwable;)V + METHOD method_43369 (Ljava/util/concurrent/CompletableFuture;Ljava/util/List;Ljava/lang/Throwable;)V ARG 2 throwable METHOD method_43370 combine (Ljava/util/List;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; ARG 0 futures diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index 79caecc432..80c2fce35c 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -18,12 +18,8 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos FIELD field_10983 BIT_SHIFT_Z I FIELD field_18789 LOGGER Lorg/slf4j/Logger; FIELD field_25064 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_2374;)V - ARG 1 pos METHOD (Lnet/minecraft/class_2382;)V ARG 1 pos - METHOD (Lnet/minecraft/class_243;)V - ARG 1 pos METHOD method_10060 offset (JLnet/minecraft/class_2350;)J ARG 0 value ARG 2 direction diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index d9b0aad0ff..4b2f5e2709 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -18,14 +18,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i FIELD field_11175 x I FIELD field_11176 ZERO Lnet/minecraft/class_2382; FIELD field_25123 CODEC Lcom/mojang/serialization/Codec; - METHOD (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z - METHOD (III)V - ARG 1 x - ARG 2 y - ARG 3 z METHOD compareTo (Ljava/lang/Object;)I ARG 1 vec METHOD equals (Ljava/lang/Object;)Z @@ -112,14 +104,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 x ARG 2 y ARG 3 z - METHOD method_35849 add (DDD)Lnet/minecraft/class_2382; - COMMENT {@return another Vec3i whose coordinates have the parameter x, y, and z - COMMENT added to the coordinates of this vector} - COMMENT - COMMENT

This method always returns an immutable object. - ARG 1 x - ARG 3 y - ARG 5 z METHOD method_35850 offset (Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_2382; COMMENT {@return a vector which is offset by {@code distance} on {@code axis} axis} COMMENT diff --git a/mappings/net/minecraft/world/biome/SpawnSettings.mapping b/mappings/net/minecraft/world/biome/SpawnSettings.mapping index 3f8bb71dca..7824153a0b 100644 --- a/mappings/net/minecraft/world/biome/SpawnSettings.mapping +++ b/mappings/net/minecraft/world/biome/SpawnSettings.mapping @@ -38,18 +38,18 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings COMMENT Embodies the density limit information of a type of entity in entity COMMENT spawning logic. The density field is generated for all entities spawned COMMENT than a specific type of entity. - FIELD field_24407 gravityLimit D - FIELD field_24408 mass D + FIELD comp_1307 gravityLimit D + FIELD comp_1308 mass D FIELD field_25820 CODEC Lcom/mojang/serialization/Codec; METHOD (DD)V ARG 1 gravityLimit ARG 3 mass - METHOD method_27837 getGravityLimit ()D + METHOD comp_1307 gravityLimit ()D COMMENT Represents the cap of gravity as in {@link COMMENT net.minecraft.util.math.GravityField#calculate(BlockPos, double)} for COMMENT entity spawning. If the cap is exceeded, the entity spawning attempt COMMENT will skip. - METHOD method_27838 getMass ()D + METHOD comp_1308 mass ()D COMMENT Represents the mass of each entity spawned. Will affect gravity COMMENT calculation. METHOD method_30359 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index c9cde62010..6c5b75bd5b 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource - FIELD field_20643 biomes Ljava/util/Set; + FIELD field_20643 biomes Ljava/util/function/Supplier; FIELD field_24713 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/List;)V - ARG 1 biomes - METHOD (Ljava/util/stream/Stream;)V - ARG 1 biomeStream METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Lnet/minecraft/class_5819;ZLnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index 92ded56458..0555bb54d6 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -2,74 +2,7 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_24718 CUSTOM_CODEC Lcom/mojang/serialization/MapCodec; COMMENT Used to parse a custom biome source, when a preset hasn't been provided. FIELD field_24719 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24721 instance Ljava/util/Optional; - FIELD field_34498 biomeEntries Lnet/minecraft/class_6544$class_6547; - METHOD (Lnet/minecraft/class_6544$class_6547;)V - ARG 1 entries - METHOD (Lnet/minecraft/class_6544$class_6547;Ljava/util/Optional;)V - ARG 1 biomeEntries - ARG 2 instance - METHOD method_28457 (Lnet/minecraft/class_4766;)Lcom/mojang/datafixers/util/Either; - ARG 0 biomeSource - METHOD method_28459 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_4766; - ARG 0 either - METHOD method_31085 getInstance ()Ljava/util/Optional; + FIELD field_34498 biomeEntries Lcom/mojang/datafixers/util/Either; METHOD method_38167 getBiomeAtPoint (Lnet/minecraft/class_6544$class_6553;)Lnet/minecraft/class_6880; ARG 1 point - METHOD method_38168 matchesInstance (Lnet/minecraft/class_4766$class_5305;)Z - ARG 1 instance - METHOD method_38170 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_38172 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance2 - METHOD method_38173 (Lnet/minecraft/class_4766;)Lnet/minecraft/class_6544$class_6547; - ARG 0 biomeSource - CLASS class_5305 Preset - FIELD field_24723 NETHER Lnet/minecraft/class_4766$class_5305; - FIELD field_24724 BY_IDENTIFIER Ljava/util/Map; - FIELD field_24725 id Lnet/minecraft/class_2960; - FIELD field_24726 biomeSourceFunction Lnet/minecraft/class_4766$class_5305$class_8165; - FIELD field_34499 OVERWORLD Lnet/minecraft/class_4766$class_5305; - FIELD field_42721 OVERWORLD_UPDATE_1_20 Lnet/minecraft/class_4766$class_5305; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_4766$class_5305$class_8165;)V - ARG 1 id - ARG 2 biomeSourceFunction - METHOD method_28469 getBiomeSource (Lnet/minecraft/class_7871;)Lnet/minecraft/class_4766; - ARG 1 biomeLookup - METHOD method_39531 getBiomeSource (Lnet/minecraft/class_4766$class_5502;Z)Lnet/minecraft/class_4766; - ARG 1 instance - ARG 2 useInstance - METHOD method_39532 getBiomeSource (Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_4766; - ARG 1 biomeLookup - ARG 2 useInstance - METHOD method_41415 streamPresets ()Ljava/util/stream/Stream; - METHOD method_41417 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; - ARG 0 entry - METHOD method_41418 stream ()Ljava/util/stream/Stream; - METHOD method_49190 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; - ARG 0 biomeKey - METHOD method_49191 (Lnet/minecraft/class_4766$class_5502;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880; - ARG 1 biomeKey - METHOD method_49192 (Lcom/google/common/collect/ImmutableList$Builder;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)V - ARG 2 pair - METHOD method_49193 getOverworldEntries (Ljava/util/function/Function;Lnet/minecraft/class_6554$class_8166;)Lnet/minecraft/class_6544$class_6547; - ARG 0 biomeEntryGetter - ARG 1 parametersType - CLASS class_8165 BiomeSourceFunction - METHOD apply (Ljava/util/function/Function;)Lnet/minecraft/class_6544$class_6547; - ARG 1 biomeEntryGetter - CLASS class_5502 Instance - FIELD comp_274 preset Lnet/minecraft/class_4766$class_5305; - FIELD comp_275 biomeRegistry Lnet/minecraft/class_7871; - FIELD field_26694 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_4766$class_5305;Lnet/minecraft/class_7871;)V - ARG 1 preset - METHOD comp_274 preset ()Lnet/minecraft/class_4766$class_5305; - METHOD comp_275 biomeRegistry ()Lnet/minecraft/class_7871; - METHOD method_31095 (Lnet/minecraft/class_4766$class_5305;)Lcom/mojang/serialization/DataResult; - ARG 0 preset - METHOD method_31096 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_31097 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 0 id - METHOD method_31101 getBiomeSource ()Lnet/minecraft/class_4766; + METHOD method_38168 matchesInstance (Lnet/minecraft/class_5321;)Z diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping index 2d357f8089..0452be9df1 100644 --- a/mappings/net/minecraft/world/gen/WorldPresets.mapping +++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping @@ -17,8 +17,6 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets ARG 0 dynamicRegistryManager METHOD method_45547 (Lnet/minecraft/class_5363;)Ljava/util/Optional; ARG 0 overworld - METHOD method_49256 bootstrapOneTwenty (Lnet/minecraft/class_7891;)V - ARG 0 presetRegisterable CLASS class_7146 Registrar FIELD field_37730 biomeLookup Lnet/minecraft/class_7871; FIELD field_37731 structureSetLookup Lnet/minecraft/class_7871; @@ -43,4 +41,3 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets ARG 2 dimensionOptions METHOD method_49257 bootstrap (Lnet/minecraft/class_1966;)V ARG 1 biomeSource - METHOD method_49258 bootstrapOneTwenty ()V