From 659b0da1ddf00613787861b36ec82afd844474f7 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 22 Apr 2020 16:59:47 +0100 Subject: [PATCH] 20w17a --- build.gradle | 2 +- .../realmsclient/RealmsMainScreen.mapping | 87 +++--------- .../realmsclient/gui/LongRunningTask.mapping | 2 - .../gui/RealmsWorldSlotButton.mapping | 27 +--- .../screens/RealmsAcceptRejectButton.mapping | 18 +-- .../screens/RealmsBackupInfoScreen.mapping | 6 +- .../gui/screens/RealmsBackupScreen.mapping | 24 +--- .../screens/RealmsBrokenWorldScreen.mapping | 15 +- .../RealmsConfigureWorldScreen.mapping | 38 +---- .../gui/screens/RealmsConfirmScreen.mapping | 9 +- .../RealmsDownloadLatestWorldScreen.mapping | 13 +- .../screens/RealmsGenericErrorScreen.mapping | 16 +-- .../RealmsLongConfirmationScreen.mapping | 11 +- .../RealmsLongRunningMcoTaskScreen.mapping | 4 +- .../screens/RealmsNotificationsScreen.mapping | 4 +- .../RealmsPendingInvitesScreen.mapping | 12 +- .../gui/screens/RealmsPlayerScreen.mapping | 30 +--- .../RealmsResetNormalWorldScreen.mapping | 4 - .../screens/RealmsResetWorldScreen.mapping | 13 +- .../RealmsSelectFileToUploadScreen.mapping | 5 +- .../RealmsSelectWorldTemplateScreen.mapping | 35 ++--- .../screens/RealmsSlotOptionsScreen.mapping | 22 +-- .../gui/screens/RealmsUploadScreen.mapping | 11 +- mappings/net/minecraft/Bootstrap.mapping | 3 +- .../net/minecraft/SharedConstants.mapping | 2 - mappings/net/minecraft/block/Block.mapping | 2 +- .../entity/AbstractFurnaceBlockEntity.mapping | 5 +- .../block/entity/SignBlockEntity.mapping | 5 +- mappings/net/minecraft/class_5212.mapping | 6 + mappings/net/minecraft/class_5217.mapping | 40 ++++++ mappings/net/minecraft/class_5219.mapping | 25 ++++ mappings/net/minecraft/class_5221.mapping | 2 + mappings/net/minecraft/class_5225.mapping | 6 + mappings/net/minecraft/class_5250.mapping | 3 + .../minecraft/client/MinecraftClient.mapping | 8 +- .../net/minecraft/client/font/Font.mapping | 3 +- .../minecraft/client/font/FontManager.mapping | 8 +- .../minecraft/client/font/FontStorage.mapping | 14 +- .../client/font/TextRenderer.mapping | 64 ++------- .../minecraft/client/font/TextureFont.mapping | 5 +- .../client/font/TrueTypeFont.mapping | 2 +- .../client/font/UnicodeTextureFont.mapping | 3 +- .../net/minecraft/client/gui/Drawable.mapping | 4 +- .../client/gui/DrawableHelper.mapping | 111 ++------------- .../client/gui/hud/BossBarHud.mapping | 7 +- .../minecraft/client/gui/hud/ChatHud.mapping | 3 +- .../minecraft/client/gui/hud/DebugHud.mapping | 8 +- .../client/gui/hud/InGameHud.mapping | 41 +++--- .../client/gui/hud/PlayerListHud.mapping | 12 +- .../client/gui/hud/SpectatorHud.mapping | 17 +-- .../client/gui/hud/SubtitlesHud.mapping | 9 +- .../spectator/SpectatorMenuCommand.mapping | 4 +- .../gui/screen/BackupPromptScreen.mapping | 4 - .../gui/screen/CommandSuggestor.mapping | 8 +- .../gui/screen/ConfirmChatLinkScreen.mapping | 4 +- .../client/gui/screen/ConfirmScreen.mapping | 8 +- .../screen/CustomizeFlatLevelScreen.mapping | 10 +- .../gui/screen/FatalErrorScreen.mapping | 5 +- .../gui/screen/LevelLoadingScreen.mapping | 6 +- .../client/gui/screen/NoticeScreen.mapping | 5 +- .../client/gui/screen/PresetsScreen.mapping | 12 +- .../client/gui/screen/ProgressScreen.mapping | 4 +- .../client/gui/screen/Screen.mapping | 25 +--- .../client/gui/screen/SettingsScreen.mapping | 2 +- .../client/gui/screen/SplashScreen.mapping | 7 +- .../client/gui/screen/StatsScreen.mapping | 22 +-- .../screen/advancement/AdvancementTab.mapping | 17 +-- .../advancement/AdvancementTabType.mapping | 7 +- .../advancement/AdvancementWidget.mapping | 21 +-- .../advancement/AdvancementsScreen.mapping | 15 +- .../ingame/AbstractInventoryScreen.mapping | 17 +-- .../gui/screen/ingame/BeaconScreen.mapping | 2 +- .../gui/screen/ingame/BookEditScreen.mapping | 60 +------- .../ingame/CartographyTableScreen.mapping | 6 +- .../ingame/CreativeInventoryScreen.mapping | 8 +- .../screen/ingame/EnchantingPhrases.mapping | 2 +- .../gui/screen/ingame/ForgingScreen.mapping | 4 +- .../gui/screen/ingame/HandledScreen.mapping | 15 +- .../screen/ingame/JigsawBlockScreen.mapping | 2 +- .../gui/screen/ingame/MerchantScreen.mapping | 2 +- .../gui/screen/ingame/SignEditScreen.mapping | 2 - .../screen/ingame/StonecutterScreen.mapping | 7 +- .../multiplayer/MultiplayerScreen.mapping | 5 +- .../MultiplayerServerListWidget.mapping | 5 +- .../MultiplayerWarningScreen.mapping | 1 - .../screen/options/ControlsListWidget.mapping | 8 +- .../screen/options/SkinOptionsScreen.mapping | 2 +- .../AbstractFurnaceRecipeBookScreen.mapping | 2 +- .../RecipeAlternativesWidget.mapping | 8 +- .../recipebook/RecipeBookGhostSlots.mapping | 7 +- .../recipebook/RecipeBookResults.mapping | 9 +- .../recipebook/RecipeBookWidget.mapping | 16 +-- .../ResourcePackListWidget.mapping | 2 - .../screen/world/CreateWorldScreen.mapping | 8 +- .../screen/world/OptimizeWorldScreen.mapping | 2 +- .../screen/world/SelectWorldScreen.mapping | 5 +- .../gui/screen/world/WorldListWidget.mapping | 1 - .../gui/widget/AbstractButtonWidget.mapping | 25 ++-- .../gui/widget/ButtonListWidget.mapping | 2 - .../client/gui/widget/ButtonWidget.mapping | 3 +- .../client/gui/widget/CheckboxWidget.mapping | 3 +- .../client/gui/widget/EntryListWidget.mapping | 22 +-- .../client/gui/widget/ListWidget.mapping | 11 +- .../gui/widget/OptionButtonWidget.mapping | 3 +- .../client/gui/widget/SliderWidget.mapping | 3 +- .../client/gui/widget/TextFieldWidget.mapping | 7 +- .../gui/widget/TexturedButtonWidget.mapping | 3 +- .../client/network/ServerInfo.mapping | 8 +- .../client/options/BooleanOption.mapping | 2 +- .../client/options/CyclingOption.mapping | 2 +- .../client/options/DoubleOption.mapping | 2 +- .../client/options/KeyBinding.mapping | 2 +- .../client/options/NarratorOption.mapping | 3 +- .../minecraft/client/options/Option.mapping | 2 +- .../client/render/WorldRenderer.mapping | 2 - .../chunk/ChunkOcclusionDataBuilder.mapping | 2 - .../render/debug/BeeDebugRenderer.mapping | 43 +----- .../render/entity/EntityRenderer.mapping | 3 +- .../client/sound/MusicTracker.mapping | 19 +-- .../minecraft/client/sound/MusicType.mapping | 1 + .../net/minecraft/client/toast/Toast.mapping | 4 +- .../client/toast/ToastManager.mapping | 4 +- .../client/toast/TutorialToast.mapping | 8 +- .../minecraft/client/util/InputUtil.mapping | 4 - .../client/util/SelectionManager.mapping | 12 +- .../net/minecraft/client/util/Texts.mapping | 6 +- .../client/world/ClientWorld.mapping | 2 +- .../minecraft/command/EntitySelector.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 4 +- .../net/minecraft/entity/EntityType.mapping | 2 +- .../entity/boss/CommandBossBar.mapping | 2 +- .../entity/passive/RabbitEntity.mapping | 5 - .../entity/player/PlayerEntity.mapping | 2 +- .../minecraft/item/BannerPatternItem.mapping | 2 +- .../net/minecraft/item/CompassItem.mapping | 7 +- .../minecraft/item/FireworkChargeItem.mapping | 2 +- mappings/net/minecraft/item/ItemStack.mapping | 7 +- .../net/minecraft/item/MusicDiscItem.mapping | 2 +- .../net/minecraft/realms/RealmsLabel.mapping | 7 +- .../minecraft/scoreboard/AbstractTeam.mapping | 2 +- .../scoreboard/ScoreboardObjective.mapping | 3 +- .../net/minecraft/scoreboard/Team.mapping | 4 +- .../minecraft/server/MinecraftServer.mapping | 41 +----- .../minecraft/server/PlayerManager.mapping | 5 +- .../dedicated/DedicatedPlayerManager.mapping | 2 - .../MinecraftDedicatedServer.mapping | 1 - .../integrated/IntegratedServer.mapping | 5 +- .../server/world/SecondaryServerWorld.mapping | 3 +- .../server/world/ServerChunkManager.mapping | 4 +- .../server/world/ServerWorld.mapping | 7 +- .../world/ThreadedAnvilChunkStorage.mapping | 3 +- .../structure/StructureManager.mapping | 3 +- .../net/minecraft/text/HoverEvent.mapping | 24 +--- mappings/net/minecraft/text/NbtText.mapping | 2 +- .../net/minecraft/text/ParsableText.mapping | 2 +- mappings/net/minecraft/text/ScoreText.mapping | 5 - mappings/net/minecraft/text/Style.mapping | 22 +-- mappings/net/minecraft/text/Text.mapping | 29 +--- mappings/net/minecraft/text/Texts.mapping | 8 +- .../minecraft/text/TranslatableText.mapping | 1 - .../net/minecraft/util/Formatting.mapping | 3 - .../minecraft/util/math/MathHelper.mapping | 1 - .../net/minecraft/world/ChunkRegion.mapping | 2 +- .../net/minecraft/world/GameRules.mapping | 7 +- mappings/net/minecraft/world/IWorld.mapping | 2 +- .../minecraft/world/PlayerSaveHandler.mapping | 5 - mappings/net/minecraft/world/World.mapping | 4 +- .../minecraft/world/WorldSaveHandler.mapping | 19 +-- .../net/minecraft/world/biome/Biome.mapping | 2 - .../world/biome/BiomeEffects.mapping | 2 +- .../world/biome/DefaultBiomeFeatures.mapping | 46 +++--- .../source/MultiNoiseBiomeSource.mapping | 8 +- .../MultiNoiseBiomeSourceConfig.mapping | 5 +- .../world/border/WorldBorder.mapping | 4 +- .../gen/feature/AbstractTreeFeature.mapping | 35 ----- .../gen/feature/BranchedTreeFeature.mapping | 7 - .../feature/BranchedTreeFeatureConfig.mapping | 31 ---- .../gen/feature/DarkOakTreeFeature.mapping | 5 - .../feature/JungleGroundBushFeature.mapping | 1 - .../gen/feature/LargeOakTreeFeature.mapping | 50 ------- .../gen/feature/MegaJungleTreeFeature.mapping | 7 - .../gen/feature/MegaPineTreeFeature.mapping | 10 -- .../world/gen/feature/MegaTreeFeature.mapping | 35 ----- .../gen/feature/MegaTreeFeatureConfig.mapping | 22 --- .../world/gen/feature/OakTreeFeature.mapping | 1 - .../gen/feature/TreeFeatureConfig.mapping | 6 +- .../world/gen/foliage/FoliagePlacer.mapping | 36 +---- .../world/gen/trunk/TrunkPlacer.mapping | 10 +- .../world/level/LevelGeneratorType.mapping | 4 +- .../minecraft/world/level/LevelInfo.mapping | 8 -- .../world/level/LevelProperties.mapping | 134 ------------------ .../level/UnmodifiableLevelProperties.mapping | 4 +- .../level/storage/AnvilLevelStorage.mapping | 3 +- .../world/level/storage/LevelStorage.mapping | 12 +- .../world/level/storage/LevelSummary.mapping | 5 +- .../world/updater/WorldUpdater.mapping | 6 - 196 files changed, 503 insertions(+), 1692 deletions(-) create mode 100644 mappings/net/minecraft/class_5212.mapping create mode 100644 mappings/net/minecraft/class_5217.mapping create mode 100644 mappings/net/minecraft/class_5219.mapping create mode 100644 mappings/net/minecraft/class_5221.mapping create mode 100644 mappings/net/minecraft/class_5225.mapping create mode 100644 mappings/net/minecraft/class_5250.mapping create mode 100644 mappings/net/minecraft/client/sound/MusicType.mapping delete mode 100644 mappings/net/minecraft/world/PlayerSaveHandler.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/MegaTreeFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping diff --git a/build.gradle b/build.gradle index 625f86a8c6..6853bb58dc 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w16a" +def minecraft_version = "20w17a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping b/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping index 1a3937cf83..c9d4af3a76 100644 --- a/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping +++ b/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen FIELD field_19465 keyCombos Ljava/util/List; FIELD field_19466 clicks I FIELD field_19467 connectLock Ljava/util/concurrent/locks/ReentrantLock; - FIELD field_19468 expiredHover Z FIELD field_19469 showPopupButton Lnet/minecraft/class_4185; FIELD field_19470 pendingInvitesButton Lnet/minecraft/class_4185; FIELD field_19471 newsButton Lnet/minecraft/class_4185; @@ -32,7 +31,7 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen FIELD field_19487 renewButton Lnet/minecraft/class_4185; FIELD field_19488 configureButton Lnet/minecraft/class_4185; FIELD field_19489 leaveButton Lnet/minecraft/class_4185; - FIELD field_19490 toolTip Ljava/lang/String; + FIELD field_19490 toolTip Ljava/util/List; FIELD field_19491 realmsServers Ljava/util/List; FIELD field_19492 numberOfPendingInvites I FIELD field_19493 animTick I @@ -64,85 +63,40 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen METHOD method_20834 onClosePopup ()V METHOD method_20835 popupX0 ()I METHOD method_20836 popupY0 ()I - METHOD method_20837 renderLocal ()V - METHOD method_20838 renderStage ()V + METHOD method_20837 renderLocal (Lnet/minecraft/class_4587;)V + METHOD method_20838 renderStage (Lnet/minecraft/class_4587;)V METHOD method_20842 shouldShowMessageInList ()Z METHOD method_20844 isOutsidePopup (DD)Z ARG 1 xm ARG 3 ym - METHOD method_20845 drawRealmsLogo (II)V - ARG 1 x - ARG 2 y - METHOD method_20846 drawExpired (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym - METHOD method_20848 renderMoreInfo (IIIIZ)V - ARG 1 xm - ARG 2 ym - ARG 3 x - ARG 4 y - ARG 5 hoveredOrFocused - METHOD method_20849 drawInvitationPendingIcon (IIIIZZ)V - ARG 1 xm - ARG 2 ym - ARG 3 x - ARG 4 y - ARG 5 selectedOrHovered - ARG 6 active - METHOD method_20850 renderNews (IIZIIZZ)V - ARG 1 xm - ARG 2 ym - ARG 3 unread - ARG 4 x - ARG 5 y - ARG 6 selectedOrHovered - ARG 7 active + METHOD method_20845 drawRealmsLogo (Lnet/minecraft/class_4587;II)V + METHOD method_20846 drawExpired (Lnet/minecraft/class_4587;IIII)V + METHOD method_20848 renderMoreInfo (Lnet/minecraft/class_4587;IIIIZ)V + METHOD method_20849 drawInvitationPendingIcon (Lnet/minecraft/class_4587;IIIIZZ)V + METHOD method_20850 renderNews (Lnet/minecraft/class_4587;IIZIIZZ)V METHOD method_20851 findServer (J)Lnet/minecraft/class_4877; ARG 1 id METHOD method_20852 updateButtonStates (Lnet/minecraft/class_4877;)V ARG 1 server METHOD method_20853 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V - METHOD method_20867 renderMousehoverTooltip (Ljava/lang/String;II)V - ARG 1 msg - ARG 2 x - ARG 3 y + METHOD method_20867 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V METHOD method_20870 shouldShowPopup ()Z METHOD method_20871 inPendingInvitationArea (DD)Z ARG 1 xm ARG 3 ym - METHOD method_20872 drawPopup (II)V - ARG 1 xm - ARG 2 ym - METHOD method_20873 drawOpen (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_20872 drawPopup (Lnet/minecraft/class_4587;II)V + METHOD method_20873 drawOpen (Lnet/minecraft/class_4587;IIII)V METHOD method_20874 shouldPlayButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server METHOD method_20882 addButtons ()V - METHOD method_20883 drawClose (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_20883 drawClose (Lnet/minecraft/class_4587;IIII)V METHOD method_20884 shouldRenewButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server - METHOD method_20891 drawLeave (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_20891 drawLeave (Lnet/minecraft/class_4587;IIII)V METHOD method_20892 shouldConfigureButtonBeVisible (Lnet/minecraft/class_4877;)Z ARG 1 server METHOD method_20897 removeSelection ()V - METHOD method_20898 drawConfigure (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_20898 drawConfigure (Lnet/minecraft/class_4587;IIII)V METHOD method_20899 shouldLeaveButtonBeVisible (Lnet/minecraft/class_4877;)Z ARG 1 server METHOD method_20902 newScreen ()Lnet/minecraft/class_4325; @@ -174,18 +128,9 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen FIELD field_19518 mServerData Lnet/minecraft/class_4877; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V ARG 2 serverData - METHOD method_20946 renderMcoServerItem (Lnet/minecraft/class_4877;IIII)V + METHOD method_20946 renderMcoServerItem (Lnet/minecraft/class_4877;Lnet/minecraft/class_4587;IIII)V ARG 1 serverData - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY CLASS class_4331 RealmSelectionListTrialEntry - METHOD method_20947 renderTrialItem (IIIII)V - ARG 1 i - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY + METHOD method_20947 renderTrialItem (Lnet/minecraft/class_4587;IIIII)V CLASS class_4332 ShowPopupButton CLASS class_4866 Entry diff --git a/mappings/com/mojang/realmsclient/gui/LongRunningTask.mapping b/mappings/com/mojang/realmsclient/gui/LongRunningTask.mapping index 9f656173ab..7f50dc4248 100644 --- a/mappings/com/mojang/realmsclient/gui/LongRunningTask.mapping +++ b/mappings/com/mojang/realmsclient/gui/LongRunningTask.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_4358 com/mojang/realmsclient/gui/LongRunningTask METHOD method_21065 aborted ()Z METHOD method_21066 setScreen (Lnet/minecraft/class_4398;)V ARG 1 longRunningMcoTaskScreen - METHOD method_21067 error (Ljava/lang/String;)V - ARG 1 errorMessage METHOD method_21068 tick ()V METHOD method_21069 setTitle (Ljava/lang/String;)V ARG 1 title diff --git a/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping b/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping index c83442bd9c..210147feaf 100644 --- a/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping +++ b/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping @@ -18,27 +18,7 @@ CLASS net/minecraft/class_4367 com/mojang/realmsclient/gui/RealmsWorldSlotButton ARG 6 toolTipSetter ARG 7 id ARG 8 action - METHOD method_21107 drawSlotFrame (IIIIZLjava/lang/String;IJLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Ljava/lang/String;)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym - ARG 5 currentlyActiveSlot - ARG 6 text - ARG 7 i - ARG 8 imageId - ARG 10 image - ARG 11 empty - ARG 12 minigame - ARG 13 action - ARG 14 actionPrompt - METHOD method_25098 setMessage (Lnet/minecraft/class_4877;Ljava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Ljava/lang/String;)V - ARG 1 server - ARG 2 slotName - ARG 3 isEmpty - ARG 4 isMinigame - ARG 5 action - ARG 6 promptMessage + METHOD method_21107 drawSlotFrame (Lnet/minecraft/class_4587;IIIIZLjava/lang/String;IJLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Lnet/minecraft/class_2561;)V METHOD method_25099 getState ()Lnet/minecraft/class_4367$class_4370; CLASS class_4368 Action FIELD field_19678 NOTHING Lnet/minecraft/class_4367$class_4368; @@ -54,8 +34,8 @@ CLASS net/minecraft/class_4367 com/mojang/realmsclient/gui/RealmsWorldSlotButton FIELD field_19686 empty Z FIELD field_19687 minigame Z FIELD field_19688 action Lnet/minecraft/class_4367$class_4368; - FIELD field_19689 actionPrompt Ljava/lang/String; - METHOD (ZLjava/lang/String;JLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Ljava/lang/String;)V + FIELD field_19689 actionPrompt Lnet/minecraft/class_2561; + METHOD (ZLjava/lang/String;JLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Lnet/minecraft/class_2561;)V ARG 1 isCurrentlyActiveSlot ARG 2 slotName ARG 3 imageId @@ -63,4 +43,3 @@ CLASS net/minecraft/class_4367 com/mojang/realmsclient/gui/RealmsWorldSlotButton ARG 6 empty ARG 7 minigame ARG 8 action - ARG 9 actionPrompt diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping index 1d3fe7eb46..f40fa7f169 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping @@ -11,22 +11,10 @@ CLASS net/minecraft/class_4371 com/mojang/realmsclient/gui/screens/RealmsAcceptR METHOD method_21109 getRight ()I METHOD method_21110 handleClick (I)V ARG 1 index - METHOD method_21111 render (IIII)V - ARG 1 offsetX - ARG 2 offsetY - ARG 3 mouseX - ARG 4 mouseY - METHOD method_21112 render (IIZ)V - ARG 1 x + METHOD method_21111 render (Lnet/minecraft/class_4587;IIII)V + METHOD method_21112 render (Lnet/minecraft/class_4587;IIZ)V ARG 2 y - ARG 3 hovered - METHOD method_21113 render (Ljava/util/List;Lnet/minecraft/class_4904;IIII)V - ARG 0 buttons - ARG 1 selectionList - ARG 2 offsetX - ARG 3 offsetY - ARG 4 mouseX - ARG 5 mouseY + METHOD method_21113 render (Lnet/minecraft/class_4587;Ljava/util/List;Lnet/minecraft/class_4904;IIII)V METHOD method_21114 handleClick (Lnet/minecraft/class_4904;Lnet/minecraft/class_4280$class_4281;Ljava/util/List;IDD)V ARG 0 selectionList ARG 2 buttons diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping index 507ad49788..cb087a0ff6 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping @@ -5,11 +5,11 @@ CLASS net/minecraft/class_4379 com/mojang/realmsclient/gui/screens/RealmsBackupI FIELD field_19738 backupInfoList Lnet/minecraft/class_4379$class_4380; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4867;)V ARG 2 backup - METHOD method_21140 gameDifficultyMetadata (Ljava/lang/String;)Ljava/lang/String; + METHOD method_21140 gameDifficultyMetadata (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 value - METHOD method_21141 checkForSpecificMetadata (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + METHOD method_21141 checkForSpecificMetadata (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 key ARG 2 value - METHOD method_21143 gameModeMetadata (Ljava/lang/String;)Ljava/lang/String; + METHOD method_21143 gameModeMetadata (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 value CLASS class_4380 BackupInfoList diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping index a761c8b90b..daf60a9523 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping @@ -20,10 +20,7 @@ CLASS net/minecraft/class_4381 com/mojang/realmsclient/gui/screens/RealmsBackupS METHOD method_21147 addToChangeList (Lnet/minecraft/class_4867;Ljava/lang/String;)V ARG 1 backup ARG 2 key - METHOD method_21153 renderMousehoverTooltip (Ljava/lang/String;II)V - ARG 1 msg - ARG 2 x - ARG 3 y + METHOD method_21153 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V METHOD method_21154 generateChangeList ()V METHOD method_21155 restoreClicked (I)V ARG 1 selectedBackup @@ -42,21 +39,8 @@ CLASS net/minecraft/class_4381 com/mojang/realmsclient/gui/screens/RealmsBackupS FIELD field_19761 mBackup Lnet/minecraft/class_4867; METHOD (Lnet/minecraft/class_4381;Lnet/minecraft/class_4867;)V ARG 2 backup - METHOD method_21174 drawRestore (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym - METHOD method_21175 renderBackupItem (Lnet/minecraft/class_4867;IIII)V - ARG 1 backup - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY + METHOD method_21174 drawRestore (Lnet/minecraft/class_4587;IIII)V + METHOD method_21175 renderBackupItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4867;IIII)V METHOD method_21176 getMediumDatePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 1 lastModifiedDate - METHOD method_21177 drawInfo (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_21177 drawInfo (Lnet/minecraft/class_4587;IIII)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.mapping index bf482031de..9642085544 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.mapping @@ -3,32 +3,23 @@ CLASS net/minecraft/class_4384 com/mojang/realmsclient/gui/screens/RealmsBrokenW FIELD field_19764 lastScreen Lnet/minecraft/class_437; FIELD field_19765 mainScreen Lnet/minecraft/class_4325; FIELD field_19767 serverId J - FIELD field_19768 title Ljava/lang/String; - FIELD field_19769 message Ljava/lang/String; + FIELD field_19769 message [Lnet/minecraft/class_2561; FIELD field_19770 left_x I FIELD field_19771 right_x I FIELD field_19778 slotsThatHasBeenDownloaded Ljava/util/List; FIELD field_19779 animTick I - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4325;J)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4325;JZ)V ARG 2 mainScreen ARG 3 serverId METHOD method_21178 addButtons ()V METHOD method_21179 getFramePositionX (I)I ARG 1 i - METHOD method_21180 drawSlotFrame (IIIIZLjava/lang/String;IJLjava/lang/String;Z)V - ARG 1 x + METHOD method_21180 drawSlotFrame (Lnet/minecraft/class_4587;IIIIZLjava/lang/String;IJLjava/lang/String;Z)V ARG 2 y ARG 3 xm ARG 4 ym - ARG 5 active - ARG 7 i - ARG 8 imageId - ARG 10 image - ARG 11 empty METHOD method_21181 fetchServerData (J)V ARG 1 worldId - METHOD method_21185 setTitle (Ljava/lang/String;)V - ARG 1 title METHOD method_21187 downloadWorld (I)V ARG 1 slotId METHOD method_21194 backButtonClicked ()V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping index 650c15ff5c..b15b2f5096 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen FIELD field_19790 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_19791 toolTip Ljava/lang/String; + FIELD field_19791 toolTip Lnet/minecraft/class_2561; FIELD field_19792 lastScreen Lnet/minecraft/class_4325; FIELD field_19794 serverId J FIELD field_19795 left_x I @@ -29,17 +29,8 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu METHOD method_21200 buttonCenter (II)I ARG 1 i ARG 2 total - METHOD method_21201 drawServerStatus (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym - METHOD method_21202 drawExpiring (IIIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym - ARG 5 daysLeft + METHOD method_21201 drawServerStatus (Lnet/minecraft/class_4587;IIII)V + METHOD method_21202 drawExpiring (Lnet/minecraft/class_4587;IIIII)V METHOD method_21203 switchToFullSlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -49,10 +40,7 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu ARG 1 serverData METHOD method_21208 saveSlotSettings (Lnet/minecraft/class_4883;)V ARG 1 options - METHOD method_21214 renderMousehoverTooltip (Ljava/lang/String;II)V - ARG 1 msg - ARG 2 x - ARG 3 y + METHOD method_21214 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V METHOD method_21215 saveSettings (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 desc @@ -64,11 +52,7 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu METHOD method_21219 getNewScreen ()Lnet/minecraft/class_4388; METHOD method_21220 buttonLeft (I)I ARG 1 i - METHOD method_21221 drawExpired (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_21221 drawExpired (Lnet/minecraft/class_4587;IIII)V METHOD method_21222 switchToEmptySlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -76,11 +60,7 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu ARG 1 button METHOD method_21228 frame (I)I ARG 1 ordinal - METHOD method_21229 drawOpen (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_21229 drawOpen (Lnet/minecraft/class_4587;IIII)V METHOD method_21231 backButtonClicked ()V METHOD method_21234 disableButtons ()V METHOD method_21236 switchToMinigame ()V @@ -89,8 +69,4 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu METHOD method_21242 hideMinigameButtons ()V METHOD method_25138 removeButton (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25143 drawClosed (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_25143 drawClosed (Lnet/minecraft/class_4587;IIII)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.mapping index 748bfbb142..7f52dd8ac4 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_4389 com/mojang/realmsclient/gui/screens/RealmsConfirmScreen - FIELD field_19821 title1 Ljava/lang/String; - FIELD field_19822 yesButton Ljava/lang/String; - FIELD field_19823 noButton Ljava/lang/String; - FIELD field_19825 title2 Ljava/lang/String; + FIELD field_19821 title1 Lnet/minecraft/class_2561; + FIELD field_19825 title2 Lnet/minecraft/class_2561; FIELD field_19826 delayTicker I - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Ljava/lang/String;)V - ARG 2 title1 - ARG 3 title2 diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.mapping index c3fa4ee12d..bf3d6f4906 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.mapping @@ -2,11 +2,11 @@ CLASS net/minecraft/class_4392 com/mojang/realmsclient/gui/screens/RealmsDownloa FIELD field_19844 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_19845 lastScreen Lnet/minecraft/class_437; FIELD field_19846 worldDownload Lnet/minecraft/class_4889; - FIELD field_19847 downloadTitle Ljava/lang/String; + FIELD field_19847 downloadTitle Lnet/minecraft/class_2561; FIELD field_19848 narrationRateLimiter Lcom/google/common/util/concurrent/RateLimiter; FIELD field_19850 worldName Ljava/lang/String; FIELD field_19851 downloadStatus Lnet/minecraft/class_4392$class_4393; - FIELD field_19853 status Ljava/lang/String; + FIELD field_19853 status Lnet/minecraft/class_2561; FIELD field_19854 progress Ljava/lang/String; FIELD field_19855 cancelled Z FIELD field_19856 showDots Z @@ -26,12 +26,11 @@ CLASS net/minecraft/class_4392 com/mojang/realmsclient/gui/screens/RealmsDownloa METHOD method_21259 getContentLength (Ljava/lang/String;)J ARG 1 downloadLink METHOD method_21265 checkDownloadSize ()V - METHOD method_21266 drawDownloadSpeed0 (J)V - ARG 1 bytesPersSecond + METHOD method_21266 drawDownloadSpeed0 (Lnet/minecraft/class_4587;J)V METHOD method_21269 backButtonClicked ()V - METHOD method_21272 drawDots ()V - METHOD method_21274 drawProgressBar ()V - METHOD method_21276 drawDownloadSpeed ()V + METHOD method_21272 drawDots (Lnet/minecraft/class_4587;)V + METHOD method_21274 drawProgressBar (Lnet/minecraft/class_4587;)V + METHOD method_21276 drawDownloadSpeed (Lnet/minecraft/class_4587;)V METHOD method_21278 downloadSave ()V METHOD method_21279 downloadCancelled ()V CLASS class_4393 DownloadStatus diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.mapping index b25f43714b..93a0508a41 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.mapping @@ -1,17 +1,9 @@ CLASS net/minecraft/class_4394 com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen - FIELD field_19875 line1 Ljava/lang/String; - FIELD field_19876 line2 Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_437;)V - ARG 1 title - ARG 2 message - METHOD (Ljava/lang/String;Lnet/minecraft/class_437;)V - ARG 1 message + FIELD field_19875 line1 Lnet/minecraft/class_2561; + FIELD field_19876 line2 Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4355;Lnet/minecraft/class_437;)V ARG 1 realmsServiceException METHOD method_21280 errorMessage (Lnet/minecraft/class_4355;)V ARG 1 realmsServiceException - METHOD method_21282 errorMessage (Ljava/lang/String;)V - ARG 1 message - METHOD method_21283 errorMessage (Ljava/lang/String;Ljava/lang/String;)V - ARG 1 title - ARG 2 message + METHOD method_21282 errorMessage (Lnet/minecraft/class_2561;)V + METHOD method_21283 errorMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.mapping index a51b1b0060..ef652ae55d 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.mapping @@ -1,15 +1,10 @@ CLASS net/minecraft/class_4396 com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen - FIELD field_19892 yesButton Ljava/lang/String; - FIELD field_19893 noButton Ljava/lang/String; FIELD field_19895 type Lnet/minecraft/class_4396$class_4397; - FIELD field_19896 line2 Ljava/lang/String; - FIELD field_19897 line3 Ljava/lang/String; - FIELD field_19898 okButton Ljava/lang/String; + FIELD field_19896 line2 Lnet/minecraft/class_2561; + FIELD field_19897 line3 Lnet/minecraft/class_2561; FIELD field_19899 yesNoQuestion Z - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_4396$class_4397;Ljava/lang/String;Ljava/lang/String;Z)V + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_4396$class_4397;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V ARG 2 type - ARG 3 line2 - ARG 4 line3 ARG 5 yesNoQuestion CLASS class_4397 Type FIELD field_19903 Warning Lnet/minecraft/class_4396$class_4397; diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping index b0f30ce251..12d1d4f7d2 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_4398 com/mojang/realmsclient/gui/screens/RealmsLongRun FIELD field_19912 parent Lnet/minecraft/class_437; FIELD field_19914 title Ljava/lang/String; FIELD field_19915 error Z - FIELD field_19916 errorMessage Ljava/lang/String; + FIELD field_19916 errorMessage Lnet/minecraft/class_2561; FIELD field_19917 aborted Z FIELD field_19918 animTicks I FIELD field_19919 task Lnet/minecraft/class_4358; @@ -12,8 +12,6 @@ CLASS net/minecraft/class_4398 com/mojang/realmsclient/gui/screens/RealmsLongRun METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4358;)V ARG 1 parent ARG 2 task - METHOD method_21290 setError (Ljava/lang/String;)V - ARG 1 error METHOD method_21291 aborted ()Z METHOD method_21292 setTitle (Ljava/lang/String;)V ARG 1 title diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.mapping index f26e2afcf3..61f3cc75e4 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.mapping @@ -6,6 +6,4 @@ CLASS net/minecraft/class_4399 com/mojang/realmsclient/gui/screens/RealmsNotific FIELD field_19927 validClient Z FIELD field_19928 hasUnreadNews Z METHOD method_21294 checkIfMcoEnabled ()V - METHOD method_21295 drawIcons (II)V - ARG 1 xm - ARG 2 ym + METHOD method_21295 drawIcons (Lnet/minecraft/class_4587;II)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping index 206c762149..04d9978b86 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping @@ -10,10 +10,7 @@ CLASS net/minecraft/class_4401 com/mojang/realmsclient/gui/screens/RealmsPending FIELD field_19943 rejectButton Lnet/minecraft/class_4185; METHOD method_21300 updateList (I)V ARG 1 slot - METHOD method_21306 renderMousehoverTooltip (Ljava/lang/String;II)V - ARG 1 msg - ARG 2 x - ARG 3 y + METHOD method_21306 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V METHOD method_21307 updateButtonStates ()V METHOD method_21308 reject (I)V ARG 1 slot @@ -31,11 +28,6 @@ CLASS net/minecraft/class_4401 com/mojang/realmsclient/gui/screens/RealmsPending FIELD field_19955 buttons Ljava/util/List; METHOD (Lnet/minecraft/class_4401;Lnet/minecraft/class_4871;)V ARG 2 pendingInvite - METHOD method_21324 renderPendingInvitationItem (Lnet/minecraft/class_4871;IIII)V - ARG 1 invite - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY + METHOD method_21324 renderPendingInvitationItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4871;IIII)V CLASS class_4404 AcceptButton CLASS class_4405 RejectButton diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping index dea80fe09d..bc404a9ebe 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping @@ -24,32 +24,17 @@ CLASS net/minecraft/class_4406 com/mojang/realmsclient/gui/screens/RealmsPlayerS METHOD method_21325 updateButtonStates ()V METHOD method_21326 shouldRemoveAndOpdeopButtonBeVisible (I)Z ARG 1 player - METHOD method_21327 drawRemoveIcon (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_21327 drawRemoveIcon (Lnet/minecraft/class_4587;IIII)V METHOD method_21328 updateOps (Lnet/minecraft/class_4870;)V ARG 1 ops - METHOD method_21332 renderMousehoverTooltip (Ljava/lang/String;II)V - ARG 1 msg - ARG 2 x - ARG 3 y + METHOD method_21332 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V METHOD method_21333 backButtonClicked ()V METHOD method_21334 op (I)V ARG 1 index - METHOD method_21335 drawOpped (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_21335 drawOpped (Lnet/minecraft/class_4587;IIII)V METHOD method_21339 deop (I)V ARG 1 index - METHOD method_21340 drawNormal (IIII)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym + METHOD method_21340 drawNormal (Lnet/minecraft/class_4587;IIII)V METHOD method_21344 uninvite (I)V ARG 1 index METHOD method_21347 deleteFromInvitedList (I)V @@ -63,9 +48,4 @@ CLASS net/minecraft/class_4406 com/mojang/realmsclient/gui/screens/RealmsPlayerS FIELD field_19979 mPlayerInfo Lnet/minecraft/class_4874; METHOD (Lnet/minecraft/class_4406;Lnet/minecraft/class_4874;)V ARG 2 playerInfo - METHOD method_21356 renderInvitedItem (Lnet/minecraft/class_4874;IIII)V - ARG 1 invited - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY + METHOD method_21356 renderInvitedItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4874;IIII)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.mapping index 09947bd73d..18b73806a4 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_4409 com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen - FIELD field_19981 levelTypes [Ljava/lang/String; FIELD field_19982 lastScreen Lnet/minecraft/class_4410; FIELD field_19983 titleLabel Lnet/minecraft/class_4903; FIELD field_19984 seedEdit Lnet/minecraft/class_342; FIELD field_19985 generateStructures Ljava/lang/Boolean; FIELD field_19986 levelTypeIndex Ljava/lang/Integer; - FIELD field_19993 buttonTitle Ljava/lang/String; - METHOD method_21361 levelTypeTitle ()Ljava/lang/String; - METHOD method_21363 generateStructuresTitle ()Ljava/lang/String; diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping index 173b90a670..3857d82dfb 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping @@ -5,14 +5,12 @@ CLASS net/minecraft/class_4410 com/mojang/realmsclient/gui/screens/RealmsResetWo FIELD field_20001 serverData Lnet/minecraft/class_4877; FIELD field_20003 titleLabel Lnet/minecraft/class_4903; FIELD field_20004 subtitleLabel Lnet/minecraft/class_4903; - FIELD field_20005 title Ljava/lang/String; - FIELD field_20006 subtitle Ljava/lang/String; - FIELD field_20007 buttonTitle Ljava/lang/String; + FIELD field_20005 title Lnet/minecraft/class_2561; + FIELD field_20006 subtitle Lnet/minecraft/class_2561; + FIELD field_20007 buttonTitle Lnet/minecraft/class_2561; FIELD field_20008 subtitleColor I FIELD field_20015 typeToReset Lnet/minecraft/class_4410$class_4412; - METHOD method_21370 drawFrame (IILjava/lang/String;Lnet/minecraft/class_2960;ZZ)V - ARG 2 y - ARG 3 text + METHOD method_21370 drawFrame (Lnet/minecraft/class_4587;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;ZZ)V METHOD method_21372 resetWorld (Lnet/minecraft/class_4410$class_4413;)V ARG 1 resetWorldInfo METHOD method_21376 setResetTitle (Ljava/lang/String;)V @@ -30,10 +28,9 @@ CLASS net/minecraft/class_4410 com/mojang/realmsclient/gui/screens/RealmsResetWo ARG 1 i CLASS class_4411 FrameButton FIELD field_20032 image Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_4410;IILjava/lang/String;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V + METHOD (Lnet/minecraft/class_4410;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V ARG 2 x ARG 3 y - ARG 4 text CLASS class_4412 ResetType FIELD field_20034 NONE Lnet/minecraft/class_4410$class_4412; FIELD field_20035 GENERATE Lnet/minecraft/class_4410$class_4412; diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.mapping index 5e78b57a05..dc6aadbdf7 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.mapping @@ -19,9 +19,6 @@ CLASS net/minecraft/class_4416 com/mojang/realmsclient/gui/screens/RealmsSelectF METHOD method_21396 loadLevelList ()V METHOD method_21401 upload ()V CLASS class_4417 WorldListEntry - METHOD method_21411 renderItem (Lnet/minecraft/class_34;III)V - ARG 2 i - ARG 3 x - ARG 4 y + METHOD method_21411 renderItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_34;III)V CLASS class_4418 WorldSelectionList METHOD method_21412 addEntry (Lnet/minecraft/class_34;)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping index 71ccc05a18..e078ea23fd 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectW FIELD field_20070 lastScreen Lnet/minecraft/class_4415; FIELD field_20071 templateList Lnet/minecraft/class_4419$class_4420; FIELD field_20072 selectedTemplate I - FIELD field_20073 title Ljava/lang/String; + FIELD field_20073 title Lnet/minecraft/class_2561; FIELD field_20074 selectButton Lnet/minecraft/class_4185; FIELD field_20075 trailerButton Lnet/minecraft/class_4185; FIELD field_20076 publisherButton Lnet/minecraft/class_4185; @@ -11,7 +11,7 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectW FIELD field_20078 currentLink Ljava/lang/String; FIELD field_20079 worldType Lnet/minecraft/class_4877$class_4321; FIELD field_20080 clicks I - FIELD field_20081 warning Ljava/lang/String; + FIELD field_20081 warning [Lnet/minecraft/class_2561; FIELD field_20082 warningURL Ljava/lang/String; FIELD field_20083 displayWarning Z FIELD field_20084 hoverWarning Z @@ -27,15 +27,10 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectW ARG 2 worldType ARG 3 list METHOD method_21415 setPagination (Lnet/minecraft/class_4891;)V - METHOD method_21423 setTitle (Ljava/lang/String;)V - ARG 1 title - METHOD method_21424 renderMousehoverTooltip (Ljava/lang/String;II)V - ARG 1 msg - ARG 2 x - ARG 3 y + METHOD method_21423 setTitle (Lnet/minecraft/class_2561;)V + METHOD method_21424 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/lang/String;II)V METHOD method_21425 updateButtonStates ()V - METHOD method_21429 setWarning (Ljava/lang/String;)V - ARG 1 warning + METHOD method_21429 setWarning ([Lnet/minecraft/class_2561;)V METHOD method_21430 shouldSelectButtonBeActive ()Z METHOD method_21432 shouldPublisherBeVisible ()Z METHOD method_21436 shouldTrailerBeVisible ()Z @@ -58,23 +53,9 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectW FIELD field_20094 mTemplate Lnet/minecraft/class_4890; METHOD (Lnet/minecraft/class_4419;Lnet/minecraft/class_4890;)V ARG 2 template - METHOD method_21451 drawImage (IIIILnet/minecraft/class_4890;)V - ARG 1 x + METHOD method_21451 drawImage (Lnet/minecraft/class_4587;IIIILnet/minecraft/class_4890;)V ARG 2 y ARG 3 xm ARG 4 ym - ARG 5 worldTemplate - METHOD method_21452 drawIcons (IIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 x - ARG 2 y - ARG 3 xm - ARG 4 ym - ARG 5 link - ARG 6 trailerLink - ARG 7 recommendedPlayers - METHOD method_21453 renderWorldTemplateItem (Lnet/minecraft/class_4890;IIII)V - ARG 1 worldTemplate - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY + METHOD method_21452 drawIcons (Lnet/minecraft/class_4587;IIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + METHOD method_21453 renderWorldTemplateItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4890;IIII)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping index f43c6ccacf..e24c198b14 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping @@ -25,24 +25,24 @@ CLASS net/minecraft/class_4423 com/mojang/realmsclient/gui/screens/RealmsSlotOpt FIELD field_20134 commandBlocksButton Lnet/minecraft/class_4185; FIELD field_20502 toastMessage Lnet/minecraft/class_4903; FIELD field_22722 gameModeButton Lnet/minecraft/class_4185; - FIELD field_22723 DIFFICULTIES [Ljava/lang/String; - FIELD field_22724 GAME_MODES [Ljava/lang/String; + FIELD field_22723 DIFFICULTIES [Lnet/minecraft/class_2561; + FIELD field_22724 GAME_MODES [Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4883;Lnet/minecraft/class_4877$class_4321;I)V ARG 1 parent ARG 2 options ARG 3 worldType ARG 4 activeSlot - METHOD method_21462 difficultyTitle ()Ljava/lang/String; - METHOD method_21466 gameModeTitle ()Ljava/lang/String; - METHOD method_21469 pvpTitle ()Ljava/lang/String; - METHOD method_21472 spawnAnimalsTitle ()Ljava/lang/String; - METHOD method_21475 spawnMonstersTitle ()Ljava/lang/String; - METHOD method_21478 spawnNPCsTitle ()Ljava/lang/String; - METHOD method_21480 commandBlocksTitle ()Ljava/lang/String; - METHOD method_21482 forceGameModeTitle ()Ljava/lang/String; + METHOD method_21462 difficultyTitle ()Lnet/minecraft/class_2561; + METHOD method_21466 gameModeTitle ()Lnet/minecraft/class_2561; + METHOD method_21469 pvpTitle ()Lnet/minecraft/class_2561; + METHOD method_21472 spawnAnimalsTitle ()Lnet/minecraft/class_2561; + METHOD method_21475 spawnMonstersTitle ()Lnet/minecraft/class_2561; + METHOD method_21478 spawnNPCsTitle ()Lnet/minecraft/class_2561; + METHOD method_21480 commandBlocksTitle ()Lnet/minecraft/class_2561; + METHOD method_21482 forceGameModeTitle ()Lnet/minecraft/class_2561; METHOD method_21484 getSlotName ()Ljava/lang/String; METHOD method_21486 saveSettings ()V - METHOD method_25258 getWorldConfigureMessage (Z)Ljava/lang/String; + METHOD method_25258 getWorldConfigureMessage (Z)Lnet/minecraft/class_2561; ARG 0 enabled CLASS class_4424 SettingsSlider FIELD field_22725 min D diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping index d6528fe97a..b99fb91d8a 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_4427 com/mojang/realmsclient/gui/screens/RealmsUploadS FIELD field_20178 slotId I FIELD field_20179 uploadStatus Lnet/minecraft/class_4351; FIELD field_20180 narrationRateLimiter Lcom/google/common/util/concurrent/RateLimiter; - FIELD field_20182 status Ljava/lang/String; + FIELD field_20182 status Lnet/minecraft/class_2561; FIELD field_20183 progress Ljava/lang/String; FIELD field_20184 cancelled Z FIELD field_20185 uploadFinished Z @@ -34,11 +34,10 @@ CLASS net/minecraft/class_4427 com/mojang/realmsclient/gui/screens/RealmsUploadS METHOD method_21524 tarGzipArchive (Ljava/io/File;)Ljava/io/File; ARG 1 pathToDirectoryFile METHOD method_21525 onBack ()V - METHOD method_21526 drawUploadSpeed0 (J)V - ARG 1 bytesPersSecond + METHOD method_21526 drawUploadSpeed0 (Lnet/minecraft/class_4587;J)V METHOD method_21528 onCancel ()V - METHOD method_21530 drawDots ()V - METHOD method_21532 drawProgressBar ()V - METHOD method_21534 drawUploadSpeed ()V + METHOD method_21530 drawDots (Lnet/minecraft/class_4587;)V + METHOD method_21532 drawProgressBar (Lnet/minecraft/class_4587;)V + METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_4587;)V METHOD method_21536 upload ()V METHOD method_21538 uploadCancelled ()V diff --git a/mappings/net/minecraft/Bootstrap.mapping b/mappings/net/minecraft/Bootstrap.mapping index 185b4f5ef7..87e61e6fa6 100644 --- a/mappings/net/minecraft/Bootstrap.mapping +++ b/mappings/net/minecraft/Bootstrap.mapping @@ -4,8 +4,7 @@ CLASS net/minecraft/class_2966 net/minecraft/Bootstrap FIELD field_13359 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_12847 println (Ljava/lang/String;)V ARG 0 str - METHOD method_12848 collectMissingTranslations (Lnet/minecraft/class_2378;Ljava/util/function/Function;Ljava/util/Set;)V - ARG 0 registry + METHOD method_12848 collectMissingTranslations (Ljava/lang/Iterable;Ljava/util/function/Function;Ljava/util/Set;)V ARG 1 keyExtractor ARG 2 translationKeys METHOD method_12851 initialize ()V diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index 67e4ecd417..9e120620a7 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants FIELD field_1126 INVALID_CHARS_LEVEL_NAME [C FIELD field_16742 gameVersion Lcom/mojang/bridge/game/GameVersion; METHOD method_16673 getGameVersion ()Lcom/mojang/bridge/game/GameVersion; - METHOD method_16885 stripSupplementaryChars (Ljava/lang/String;)Ljava/lang/String; - ARG 0 s METHOD method_643 isValidChar (C)Z ARG 0 chr METHOD method_644 stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 727ebe2f13..8a5c188c6f 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 5 stack METHOD method_9515 appendProperties (Lnet/minecraft/class_2689$class_2690;)V ARG 1 builder - METHOD method_9518 getName ()Lnet/minecraft/class_2561; + METHOD method_9518 getName ()Lnet/minecraft/class_5250; METHOD method_9520 getBlastResistance ()F METHOD method_9525 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 8efca95ca6..d7124e55a1 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -27,9 +27,6 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn METHOD method_11203 craftRecipe (Lnet/minecraft/class_1860;)V ARG 1 recipe METHOD method_17029 getCookTime ()I - METHOD method_17760 dropExperience (Lnet/minecraft/class_1657;IF)V - ARG 0 player - ARG 1 totalExperience - ARG 2 experienceFraction + METHOD method_17760 dropExperience (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;IF)V METHOD method_17763 dropExperience (Lnet/minecraft/class_1657;)V ARG 1 player diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index d42be533d1..f909ab82a8 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -1,15 +1,14 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity FIELD field_12046 editor Lnet/minecraft/class_1657; FIELD field_12048 editable Z - FIELD field_12049 textBeingEdited [Ljava/lang/String; + FIELD field_12049 textBeingEdited [Lnet/minecraft/class_2561; FIELD field_12050 text [Lnet/minecraft/class_2561; FIELD field_16419 textColor Lnet/minecraft/class_1767; METHOD method_11299 setTextOnRow (ILnet/minecraft/class_2561;)V ARG 1 row ARG 2 text - METHOD method_11300 getTextBeingEditedOnRow (ILjava/util/function/Function;)Ljava/lang/String; + METHOD method_11300 getTextBeingEditedOnRow (ILjava/util/function/UnaryOperator;)Lnet/minecraft/class_2561; ARG 1 row - ARG 2 function METHOD method_11301 onActivate (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_11302 getTextOnRow (I)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/class_5212.mapping b/mappings/net/minecraft/class_5212.mapping new file mode 100644 index 0000000000..152b0b77e5 --- /dev/null +++ b/mappings/net/minecraft/class_5212.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_5212 + CLASS class_5213 + FIELD field_24170 _width I + METHOD (Lnet/minecraft/class_2338;I)V + ARG 2 width + METHOD method_27397 getWidth ()I diff --git a/mappings/net/minecraft/class_5217.mapping b/mappings/net/minecraft/class_5217.mapping new file mode 100644 index 0000000000..281fa5e7a6 --- /dev/null +++ b/mappings/net/minecraft/class_5217.mapping @@ -0,0 +1,40 @@ +CLASS net/minecraft/class_5217 + METHOD method_143 getScheduledEvents ()Lnet/minecraft/class_236; + METHOD method_144 getSpawnY ()I + METHOD method_145 getThunderTime ()I + METHOD method_146 getGameRules ()Lnet/minecraft/class_1928; + METHOD method_147 setThundering (Z)V + METHOD method_150 getLevelName ()Ljava/lang/String; + METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V + METHOD method_152 isHardcore ()Z + METHOD method_153 getGeneratorType ()Lnet/minecraft/class_1942; + METHOD method_155 getClearWeatherTime ()I + METHOD method_156 isRaining ()Z + METHOD method_157 setRaining (Z)V + METHOD method_160 setWorldData (Lnet/minecraft/class_2487;)V + METHOD method_164 setRainTime (I)V + METHOD method_165 setTimeOfDay (J)V + METHOD method_166 getSpawnZ ()I + METHOD method_167 setClearWeatherTime (I)V + METHOD method_170 getWorldData ()Lnet/minecraft/class_2487; + METHOD method_173 setThunderTime (I)V + METHOD method_177 setTime (J)V + METHOD method_18038 getWanderingTraderSpawnDelay ()I + METHOD method_18039 getWanderingTraderSpawnChance ()I + METHOD method_18040 setWanderingTraderId (Ljava/util/UUID;)V + METHOD method_18041 setWanderingTraderSpawnDelay (I)V + METHOD method_18042 setWanderingTraderSpawnChance (I)V + METHOD method_184 getSeed ()J + METHOD method_187 setSpawnPos (Lnet/minecraft/class_2338;)V + METHOD method_188 getTime ()J + METHOD method_190 getRainTime ()I + METHOD method_193 setGameMode (Lnet/minecraft/class_1934;)V + METHOD method_194 areCommandsAllowed ()Z + METHOD method_197 isDifficultyLocked ()Z + METHOD method_203 isThundering ()Z + METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267; + METHOD method_210 getGameMode ()Lnet/minecraft/class_1934; + METHOD method_215 getSpawnX ()I + METHOD method_217 getTimeOfDay ()J + METHOD method_222 isInitialized ()Z + METHOD method_223 setInitialized (Z)V diff --git a/mappings/net/minecraft/class_5219.mapping b/mappings/net/minecraft/class_5219.mapping new file mode 100644 index 0000000000..7373669546 --- /dev/null +++ b/mappings/net/minecraft/class_5219.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_5219 + METHOD method_146 getGameRules ()Lnet/minecraft/class_1928; + METHOD method_150 getLevelName ()Ljava/lang/String; + METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V + METHOD method_152 isHardcore ()Z + METHOD method_163 cloneWorldTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_168 getVersion ()I + METHOD method_171 isVersionSnapshot ()Z + METHOD method_179 getEnabledDataPacks ()Ljava/util/Set; + METHOD method_180 getVersionId ()I + METHOD method_184 getSeed ()J + METHOD method_186 setDifficultyLocked (Z)V + METHOD method_191 getLastPlayed ()J + METHOD method_193 setGameMode (Lnet/minecraft/class_1934;)V + METHOD method_194 areCommandsAllowed ()Z + METHOD method_197 isDifficultyLocked ()Z + METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267; + METHOD method_208 setDifficulty (Lnet/minecraft/class_1267;)V + METHOD method_209 getDisabledDataPacks ()Ljava/util/Set; + METHOD method_210 getGameMode ()Lnet/minecraft/class_1934; + METHOD method_219 getVersionName ()Ljava/lang/String; + METHOD method_221 setCustomBossEvents (Lnet/minecraft/class_2487;)V + METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487; + METHOD method_228 getCustomBossEvents ()Lnet/minecraft/class_2487; + METHOD method_24285 addServerBrand (Ljava/lang/String;Z)V diff --git a/mappings/net/minecraft/class_5221.mapping b/mappings/net/minecraft/class_5221.mapping new file mode 100644 index 0000000000..3a6d51e0b5 --- /dev/null +++ b/mappings/net/minecraft/class_5221.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5221 + METHOD method_21067 error (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/class_5225.mapping b/mappings/net/minecraft/class_5225.mapping new file mode 100644 index 0000000000..2feefcbb98 --- /dev/null +++ b/mappings/net/minecraft/class_5225.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_5225 + CLASS class_5230 + FIELD field_24236 length I + METHOD (Lnet/minecraft/class_5225;F)V + ARG 1 x0 + METHOD method_27513 getMatchLength ()I diff --git a/mappings/net/minecraft/class_5250.mapping b/mappings/net/minecraft/class_5250.mapping new file mode 100644 index 0000000000..884e6e9cfc --- /dev/null +++ b/mappings/net/minecraft/class_5250.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5250 + METHOD method_10852 append (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + METHOD method_10862 setStyle (Lnet/minecraft/class_2583;)Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 762d546908..ee627c22d2 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -110,7 +110,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1488 getTickDelta ()F METHOD method_1489 getHeldItemRenderer ()Lnet/minecraft/class_759; METHOD method_1490 stop ()V - METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_3696;)V + METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_4587;Lnet/minecraft/class_3696;)V METHOD method_1493 isPaused ()Z METHOD method_1494 setCrashReport (Lnet/minecraft/class_128;)V METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; @@ -156,7 +156,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1541 getBlockRenderManager ()Lnet/minecraft/class_776; METHOD method_1542 isInSingleplayer ()Z METHOD method_1543 getDataFixer ()Lcom/mojang/datafixers/DataFixer; - METHOD method_1544 getMusicType ()Lnet/minecraft/class_1142$class_1143; + METHOD method_1544 getMusicType ()Lnet/minecraft/class_5195; METHOD method_1546 initializeSearchableContainers ()V METHOD method_1547 getVersionType ()Ljava/lang/String; METHOD method_1548 getSession ()Lnet/minecraft/class_320; @@ -166,16 +166,14 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1554 getBakedModelManager ()Lnet/minecraft/class_1092; METHOD method_1555 hasReducedDebugInfo ()Z METHOD method_1558 getCurrentServerEntry ()Lnet/minecraft/class_642; - METHOD method_1559 startIntegratedServer (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_1940;)V + METHOD method_1559 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_1940;)V ARG 1 name - ARG 2 displayName METHOD method_1560 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_1561 getEntityRenderManager ()Lnet/minecraft/class_898; METHOD method_1562 getNetworkHandler ()Lnet/minecraft/class_634; METHOD method_1563 getCurrentAction ()Ljava/lang/String; METHOD method_1565 printCrashReport (Lnet/minecraft/class_128;)V METHOD method_1566 getToastManager ()Lnet/minecraft/class_374; - METHOD method_1568 getFontManager ()Lnet/minecraft/class_378; METHOD method_1569 isWindowFocused ()Z METHOD method_1570 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_1571 getCreativeHotbarStorage ()Lnet/minecraft/class_302; diff --git a/mappings/net/minecraft/client/font/Font.mapping b/mappings/net/minecraft/client/font/Font.mapping index 39b960dc1d..fd964a73dc 100644 --- a/mappings/net/minecraft/client/font/Font.mapping +++ b/mappings/net/minecraft/client/font/Font.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_390 net/minecraft/client/font/Font - METHOD method_2040 getGlyph (C)Lnet/minecraft/class_383; - ARG 1 character + METHOD method_2040 getGlyph (I)Lnet/minecraft/class_383; diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index aca54f64b7..9e7871c127 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -1,14 +1,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager FIELD field_18215 resourceReloadListener Lnet/minecraft/class_3302; - FIELD field_2258 forceUnicodeFont Z FIELD field_2259 textRenderers Ljava/util/Map; FIELD field_2260 textureManager Lnet/minecraft/class_1060; FIELD field_2261 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_1060;Z)V + METHOD (Lnet/minecraft/class_1060;)V ARG 1 manager METHOD method_18627 getResourceReloadListener ()Lnet/minecraft/class_3302; - METHOD method_2018 setForceUnicodeFont (ZLjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V - ARG 1 forceUnicodeFont - ARG 2 prepareExecutor - ARG 3 applyExecutor - METHOD method_2019 getTextRenderer (Lnet/minecraft/class_2960;)Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index adce73523f..b68ca6be56 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -7,25 +7,21 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage FIELD field_2250 EMPTY_GLYPH_RENDERER Lnet/minecraft/class_384; FIELD field_2251 SPACE Lnet/minecraft/class_379; FIELD field_2252 RANDOM Ljava/util/Random; - FIELD field_2253 glyphRendererCache Lit/unimi/dsi/fastutil/chars/Char2ObjectMap; + FIELD field_2253 glyphRendererCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_2254 glyphAtlases Ljava/util/List; - FIELD field_2255 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382; - FIELD field_2257 glyphCache Lit/unimi/dsi/fastutil/chars/Char2ObjectMap; + FIELD field_2257 glyphCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V ARG 1 textureManager ARG 2 id METHOD method_2004 setFonts (Ljava/util/List;)V ARG 1 fonts - METHOD method_2008 getRenderableGlyph (C)Lnet/minecraft/class_383; - ARG 1 character + METHOD method_2008 getRenderableGlyph (I)Lnet/minecraft/class_383; METHOD method_2010 closeGlyphAtlases ()V - METHOD method_2011 getGlyph (C)Lnet/minecraft/class_379; - ARG 1 character + METHOD method_2011 getGlyph (I)Lnet/minecraft/class_379; METHOD method_2012 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 c METHOD method_2013 getObfuscatedGlyphRenderer (Lnet/minecraft/class_379;)Lnet/minecraft/class_382; ARG 1 glyph - METHOD method_2014 getGlyphRenderer (C)Lnet/minecraft/class_382; - ARG 1 character + METHOD method_2014 getGlyphRenderer (I)Lnet/minecraft/class_382; METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382; diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index c041ac5a2b..1492a7b2a5 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -1,17 +1,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer - FIELD field_1997 fontStorage Lnet/minecraft/class_377; - FIELD field_1998 textureManager Lnet/minecraft/class_1060; + FIELD field_1997 fontStorage Ljava/util/function/Function; FIELD field_1999 rightToLeft Z FIELD field_2000 fontHeight I FIELD field_2001 random Ljava/util/Random; - METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_377;)V - ARG 1 textureManager - ARG 2 fontStorage - METHOD method_16196 findWordEdge (Ljava/lang/String;IIZ)I - ARG 1 text - ARG 2 direction - ARG 3 position - ARG 4 skipWhitespaceToRightOfWord METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V ARG 1 glyphRenderer ARG 2 bold @@ -26,12 +17,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 11 blue ARG 12 alpha ARG 13 light - METHOD method_1711 trimToWidth (Ljava/lang/String;IZ)Ljava/lang/String; - ARG 1 text - ARG 2 width - ARG 3 rightToLeft - METHOD method_1712 drawTrimmed (Ljava/lang/String;IIII)V - ARG 1 text + METHOD method_1712 drawTrimmed (Lnet/minecraft/class_2561;IIII)V ARG 2 x ARG 3 y ARG 4 maxWidth @@ -39,36 +25,14 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_1713 getStringBoundedHeight (Ljava/lang/String;I)I ARG 1 text ARG 2 maxWidth - METHOD method_1714 trimToWidth (Ljava/lang/String;I)Ljava/lang/String; - ARG 1 text + METHOD method_1714 trimToWidth (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_5250; ARG 2 width - METHOD method_1715 setFonts (Ljava/util/List;)V - ARG 1 fonts - METHOD method_1716 getCharacterCountForWidth (Ljava/lang/String;I)I - ARG 1 text - ARG 2 offset - METHOD method_1717 drawWrapped (Ljava/lang/String;IIII)V - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 maxWidth - ARG 5 color - METHOD method_1718 trimEndNewlines (Ljava/lang/String;)Ljava/lang/String; - ARG 1 text METHOD method_1719 setRightToLeft (Z)V ARG 1 rightToLeft - METHOD method_1720 drawWithShadow (Ljava/lang/String;FFI)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color + METHOD method_1720 drawWithShadow (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String; ARG 1 text - METHOD method_1722 wrapStringToWidth (Ljava/lang/String;I)Ljava/lang/String; - ARG 1 text - ARG 2 width - METHOD method_1723 drawInternal (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I - ARG 1 text + METHOD method_1723 drawInternal (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I ARG 2 x ARG 3 y ARG 4 color @@ -89,28 +53,18 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 8 seeThrough ARG 9 underlineColor ARG 10 light - METHOD method_1725 getCharWidth (C)F - ARG 1 character METHOD method_1726 isRightToLeft ()Z METHOD method_1727 getStringWidth (Ljava/lang/String;)I - ARG 1 text - METHOD method_1728 wrapStringToWidthAsList (Ljava/lang/String;I)Ljava/util/List; - ARG 1 text + METHOD method_1728 wrapStringToWidthAsList (Lnet/minecraft/class_2561;I)Ljava/util/List; ARG 2 width - METHOD method_1729 draw (Ljava/lang/String;FFI)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color - METHOD method_22941 draw (Ljava/lang/String;FFILnet/minecraft/class_1159;Z)I - ARG 1 text + METHOD method_1729 draw (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I + METHOD method_22941 draw (Lnet/minecraft/class_2561;FFILnet/minecraft/class_1159;Z)I ARG 2 x ARG 3 y ARG 4 color ARG 5 matrix ARG 6 shadow - METHOD method_22942 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I - ARG 1 text + METHOD method_22942 draw (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I ARG 2 x ARG 3 y ARG 4 color diff --git a/mappings/net/minecraft/client/font/TextureFont.mapping b/mappings/net/minecraft/client/font/TextureFont.mapping index 1629851611..9de354f03d 100644 --- a/mappings/net/minecraft/client/font/TextureFont.mapping +++ b/mappings/net/minecraft/client/font/TextureFont.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/TextureFont - FIELD field_2284 glyphs Lit/unimi/dsi/fastutil/chars/Char2ObjectMap; + FIELD field_2284 glyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_2285 image Lnet/minecraft/class_1011; FIELD field_2286 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_1011;Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;)V + METHOD (Lnet/minecraft/class_1011;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;)V ARG 1 image - ARG 2 glyphs CLASS class_387 Loader FIELD field_2287 ascent I FIELD field_2288 height I diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index 477f3b52d0..e5e9bac5af 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_2318 shiftY F - FIELD field_2319 excludedCharacters Lit/unimi/dsi/fastutil/chars/CharSet; + FIELD field_2319 excludedCharacters Lit/unimi/dsi/fastutil/ints/IntSet; FIELD field_2320 shiftX F FIELD field_2321 oversample F FIELD field_2323 info Lorg/lwjgl/stb/STBTTFontinfo; diff --git a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping index 6c79b5e913..32268d3c1b 100644 --- a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping +++ b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping @@ -8,8 +8,7 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont ARG 1 resourceManager ARG 2 sizes ARG 3 template - METHOD method_2041 getImageId (C)Lnet/minecraft/class_2960; - ARG 1 character + METHOD method_2041 getImageId (I)Lnet/minecraft/class_2960; METHOD method_2042 getGlyphImage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1011; ARG 1 glyphId METHOD method_2043 getStart (B)I diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping index b97b9950dd..eb1afa4634 100644 --- a/mappings/net/minecraft/client/gui/Drawable.mapping +++ b/mappings/net/minecraft/client/gui/Drawable.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_4068 net/minecraft/client/gui/Drawable - METHOD method_25394 render (IIF)V - ARG 1 mouseX + METHOD method_25394 render (Lnet/minecraft/class_4587;IIF)V ARG 2 mouseY - ARG 3 delta diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index fda8ef6591..2057514e45 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -7,83 +7,18 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper COMMENT The texture of icons used in the stats screen. FIELD field_22737 GUI_ICONS_TEXTURE Lnet/minecraft/class_2960; COMMENT The texture of various icons and widgets used for rendering ingame indicators. - METHOD method_25290 drawTexture (IIFFIIII)V - ARG 0 x - ARG 1 y - ARG 2 u - ARG 3 v - ARG 4 width - ARG 5 height - ARG 6 textureWidth - ARG 7 textureHeight - METHOD method_25291 drawTexture (IIIFFIIII)V - ARG 0 x - ARG 1 y - ARG 2 z - ARG 3 u - ARG 4 v - ARG 5 width - ARG 6 height - ARG 7 textureHeight - ARG 8 textureWidth - METHOD method_25292 drawHorizontalLine (IIII)V - ARG 1 x1 - ARG 2 x2 - ARG 3 y - ARG 4 color - METHOD method_25293 drawTexture (IIIIFFIIII)V - ARG 0 x - ARG 1 y - ARG 2 width - ARG 3 height - ARG 4 u - ARG 5 v - ARG 6 uWidth - ARG 7 vHeight - ARG 8 textureWidth - ARG 9 textureHeight - METHOD method_25294 fill (IIIII)V - ARG 0 x1 - ARG 1 y1 - ARG 2 x2 - ARG 3 y2 - ARG 4 color - METHOD method_25295 drawTexturedQuad (IIIIIFFFF)V - ARG 0 xStart - ARG 1 xEnd - ARG 2 yStart - ARG 3 yEnd - ARG 4 z - ARG 5 uStart - ARG 6 uEnd - ARG 7 vStart - ARG 8 vEnd - METHOD method_25296 fillGradient (IIIIII)V - ARG 1 xStart - ARG 2 yStart - ARG 3 xEnd + METHOD method_25290 drawTexture (Lnet/minecraft/class_4587;IIFFIIII)V + METHOD method_25291 drawTexture (Lnet/minecraft/class_4587;IIIFFIIII)V + METHOD method_25292 drawHorizontalLine (Lnet/minecraft/class_4587;IIII)V + METHOD method_25293 drawTexture (Lnet/minecraft/class_4587;IIIIFFIIII)V + METHOD method_25294 fill (Lnet/minecraft/class_4587;IIIII)V + METHOD method_25295 drawTexturedQuad (Lnet/minecraft/class_1159;IIIIIFFFF)V + METHOD method_25296 fillGradient (Lnet/minecraft/class_4587;IIIIII)V ARG 4 yEnd ARG 5 colorStart ARG 6 colorEnd - METHOD method_25297 drawTexture (IIIIIIIFFII)V - ARG 0 xStart - ARG 1 xEnd - ARG 2 yStart - ARG 3 yEnd - ARG 4 z - ARG 5 uWidth - ARG 6 vHeight - ARG 7 u - ARG 8 v - ARG 9 textureWidth - ARG 10 textureHeight - METHOD method_25298 drawSprite (IIIIILnet/minecraft/class_1058;)V - ARG 0 x - ARG 1 y - ARG 2 z - ARG 3 width - ARG 4 height - ARG 5 sprite + METHOD method_25297 drawTexture (Lnet/minecraft/class_4587;IIIIIIIFFII)V + METHOD method_25298 drawSprite (Lnet/minecraft/class_4587;IIIIILnet/minecraft/class_1058;)V METHOD method_25299 fill (Lnet/minecraft/class_1159;IIIII)V ARG 0 matrix ARG 1 x1 @@ -91,30 +26,10 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 3 x2 ARG 4 y2 ARG 5 color - METHOD method_25300 drawCenteredString (Lnet/minecraft/class_327;Ljava/lang/String;III)V - ARG 1 textRenderer - ARG 2 str - ARG 3 centerX - ARG 4 y - ARG 5 color - METHOD method_25301 drawVerticalLine (IIII)V - ARG 1 x - ARG 2 y1 - ARG 3 y2 - ARG 4 color - METHOD method_25302 drawTexture (IIIIII)V - ARG 1 x - ARG 2 y - ARG 3 u - ARG 4 v - ARG 5 width - ARG 6 height - METHOD method_25303 drawString (Lnet/minecraft/class_327;Ljava/lang/String;III)V - ARG 1 textRenderer - ARG 2 str - ARG 3 x - ARG 4 y - ARG 5 color + METHOD method_25300 drawCenteredString (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V + METHOD method_25301 drawVerticalLine (Lnet/minecraft/class_4587;IIII)V + METHOD method_25302 drawTexture (Lnet/minecraft/class_4587;IIIIII)V + METHOD method_25303 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V METHOD method_25304 setZOffset (I)V ARG 1 zOffset METHOD method_25305 getZOffset ()I diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 282db814cf..c7d5bc0602 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -6,12 +6,9 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud ARG 1 client METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet - METHOD method_1796 render ()V + METHOD method_1796 render (Lnet/minecraft/class_4587;)V METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z - METHOD method_1799 renderBossBar (IILnet/minecraft/class_1259;)V - ARG 1 x - ARG 2 y - ARG 3 bossBar + METHOD method_1799 renderBossBar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1259;)V METHOD method_1800 shouldThickenFog ()Z METHOD method_1801 clear ()V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 74871105b8..0183ebea50 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -13,8 +13,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud METHOD method_1804 addMessage (Lnet/minecraft/class_2561;I)V ARG 1 message ARG 2 messageId - METHOD method_1805 render (I)V - ARG 1 ticks + METHOD method_1805 render (Lnet/minecraft/class_4587;I)V METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1807 removeMessage (I)V diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index ae59796aa3..2323023cf5 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2085 pos Lnet/minecraft/class_1923; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_15870 drawMetricsData (Lnet/minecraft/class_3517;IIZ)V + METHOD method_15870 drawMetricsData (Lnet/minecraft/class_4587;Lnet/minecraft/class_3517;IIZ)V METHOD method_1833 getMetricsLineColor (IIII)I ARG 1 value ARG 2 greenValue @@ -29,7 +29,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 3 dt METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry - METHOD method_1846 render ()V - METHOD method_1847 renderLeftText ()V - METHOD method_1848 renderRightText ()V + METHOD method_1846 render (Lnet/minecraft/class_4587;)V + METHOD method_1847 renderLeftText (Lnet/minecraft/class_4587;)V + METHOD method_1848 renderRightText (Lnet/minecraft/class_4587;)V METHOD method_20603 getServerWorldDebugString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 9d02cfd4ad..c594c0e0ab 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -4,9 +4,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2013 vignetteDarkness F FIELD field_2014 lastHealthValue I FIELD field_2015 playerListHud Lnet/minecraft/class_355; - FIELD field_2016 title Ljava/lang/String; + FIELD field_2016 title Lnet/minecraft/class_2561; FIELD field_2017 titleRemainTicks I - FIELD field_2018 overlayMessage Ljava/lang/String; + FIELD field_2018 overlayMessage Lnet/minecraft/class_2561; FIELD field_2019 PUMPKIN_BLUR Lnet/minecraft/class_2960; FIELD field_2020 VIGNETTE_TEX Lnet/minecraft/class_2960; FIELD field_2021 chatHud Lnet/minecraft/class_338; @@ -27,7 +27,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2036 titleFadeOutTicks I FIELD field_2037 titleFadeInTicks I FIELD field_2038 overlayTinted Z - FIELD field_2039 subtitle Ljava/lang/String; + FIELD field_2039 subtitle Lnet/minecraft/class_2561; FIELD field_2040 heldItemTooltipFade I FIELD field_2041 overlayRemaining I FIELD field_2042 ticks I @@ -35,17 +35,17 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 client METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_1732 setRecordPlayingOverlay (Ljava/lang/String;)V + METHOD method_1732 setRecordPlayingOverlay (Lnet/minecraft/class_2561;)V METHOD method_1733 getHeartRows (I)I ARG 1 heartCount METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309; METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_1297;)V - METHOD method_1736 renderCrosshair ()V + METHOD method_1736 renderCrosshair (Lnet/minecraft/class_4587;)V METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; METHOD method_1740 getBossBarHud ()Lnet/minecraft/class_337; - METHOD method_1741 renderMountHealth ()V + METHOD method_1741 renderMountHealth (Lnet/minecraft/class_4587;)V METHOD method_1742 setDefaultTitleFade ()V METHOD method_1743 getChatHud ()Lnet/minecraft/class_338; METHOD method_1744 getHeartCount (Lnet/minecraft/class_1309;)I @@ -54,30 +54,23 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1746 renderPortalOverlay (F)V METHOD method_1747 clear ()V METHOD method_1748 tick ()V - METHOD method_1749 renderHeldItemTooltip ()V + METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_4587;)V METHOD method_1750 getPlayerListWidget ()Lnet/minecraft/class_355; - METHOD method_1752 renderMountJumpBar (I)V - METHOD method_1753 render (F)V - ARG 1 tickDelta + METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_4587;I)V + METHOD method_1753 render (Lnet/minecraft/class_4587;F)V METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z - METHOD method_1754 renderExperienceBar (I)V + METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V METHOD method_1755 addChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;)V METHOD method_1756 getFontRenderer ()Lnet/minecraft/class_327; - METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_266;)V + METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 tinted - METHOD method_1759 renderHotbar (F)V - METHOD method_1760 renderStatusBars ()V + METHOD method_1759 renderHotbar (FLnet/minecraft/class_4587;)V + METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V METHOD method_1761 renderPumpkinOverlay ()V METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V - METHOD method_1763 setTitles (Ljava/lang/String;Ljava/lang/String;III)V - METHOD method_1764 setOverlayMessage (Ljava/lang/String;Z)V - ARG 1 message - ARG 2 tinted - METHOD method_1765 renderStatusEffectOverlay ()V - METHOD method_1766 renderDemoTimer ()V - METHOD method_19346 drawTextBackground (Lnet/minecraft/class_327;II)V - ARG 1 textRenderer - ARG 2 y - ARG 3 width + METHOD method_1763 setTitles (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;III)V + METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_4587;)V + METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_4587;)V + METHOD method_19346 drawTextBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;II)V diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index d00b2ef202..2f722b1721 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -10,18 +10,12 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud ARG 1 client ARG 2 inGameHud METHOD method_1918 getPlayerName (Lnet/minecraft/class_640;)Lnet/minecraft/class_2561; - ARG 1 playerEntry - METHOD method_1919 render (ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V - ARG 1 width - ARG 2 scoreboard - ARG 3 playerListScoreboardObjective + METHOD method_1919 render (Lnet/minecraft/class_4587;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V METHOD method_1920 clear ()V METHOD method_1921 tick (Z)V ARG 1 visible - METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILnet/minecraft/class_640;)V - METHOD method_1923 renderLatencyIcon (IIILnet/minecraft/class_640;)V - ARG 3 y - ARG 4 playerEntry + METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILnet/minecraft/class_640;Lnet/minecraft/class_4587;)V + METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_640;)V METHOD method_1924 setFooter (Lnet/minecraft/class_2561;)V ARG 1 footer METHOD method_1925 setHeader (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index b94f06aa21..2bc493d6fa 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -6,23 +6,14 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud FIELD field_2201 client Lnet/minecraft/class_310; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_1975 renderSpectatorMenu (FIILnet/minecraft/class_539;)V - ARG 1 height - ARG 2 x - ARG 4 state + METHOD method_1975 renderSpectatorMenu (Lnet/minecraft/class_4587;FIILnet/minecraft/class_539;)V METHOD method_1976 cycleSlot (D)V ARG 1 offset METHOD method_1977 selectSlot (I)V ARG 1 slot - METHOD method_1978 render (F)V - ARG 1 tickDelta - METHOD method_1979 render ()V + METHOD method_1978 render (Lnet/minecraft/class_4587;F)V + METHOD method_1979 render (Lnet/minecraft/class_4587;)V METHOD method_1980 isOpen ()Z METHOD method_1981 getSpectatorMenuHeight ()F - METHOD method_1982 renderSpectatorCommand (IIFFLnet/minecraft/class_537;)V - ARG 1 slot - ARG 2 x - ARG 3 y - ARG 4 alpha - ARG 5 command + METHOD method_1982 renderSpectatorCommand (Lnet/minecraft/class_4587;IIFFLnet/minecraft/class_537;)V METHOD method_1983 useSelectedCommand ()V diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index a534682db4..453ce60c5a 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -4,16 +4,15 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud FIELD field_2184 enabled Z METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_1957 render ()V + METHOD method_1957 render (Lnet/minecraft/class_4587;)V CLASS class_360 SubtitleEntry FIELD field_2185 time J FIELD field_2186 pos Lnet/minecraft/class_243; - FIELD field_2188 text Ljava/lang/String; - METHOD (Lnet/minecraft/class_359;Ljava/lang/String;Lnet/minecraft/class_243;)V - ARG 2 text + FIELD field_2188 text Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_359;Lnet/minecraft/class_2561;Lnet/minecraft/class_243;)V ARG 3 pos METHOD method_1958 reset (Lnet/minecraft/class_243;)V ARG 1 pos METHOD method_1959 getPosition ()Lnet/minecraft/class_243; - METHOD method_1960 getText ()Ljava/lang/String; + METHOD method_1960 getText ()Lnet/minecraft/class_2561; METHOD method_1961 getTime ()J diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping index c44fda1763..6ae0600d9b 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping @@ -3,6 +3,4 @@ CLASS net/minecraft/class_537 net/minecraft/client/gui/hud/spectator/SpectatorMe METHOD method_16893 isEnabled ()Z METHOD method_2783 use (Lnet/minecraft/class_531;)V ARG 1 menu - METHOD method_2784 renderIcon (FI)V - ARG 1 brightness - ARG 2 alpha + METHOD method_2784 renderIcon (Lnet/minecraft/class_4587;FI)V diff --git a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping b/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping index e2c5210ee6..9e44ea4bc2 100644 --- a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_405 net/minecraft/client/gui/screen/BackupPromptScreen FIELD field_18971 callback Lnet/minecraft/class_405$class_406; FIELD field_19232 showEraseCacheCheckbox Z - FIELD field_19233 eraseCacheText Ljava/lang/String; FIELD field_19234 eraseCacheCheckbox Lnet/minecraft/class_4286; - FIELD field_2359 skipText Ljava/lang/String; FIELD field_2360 parent Lnet/minecraft/class_437; - FIELD field_2361 confirmText Ljava/lang/String; - FIELD field_2362 cancelText Ljava/lang/String; FIELD field_2364 subtitle Lnet/minecraft/class_2561; FIELD field_2365 wrappedText Ljava/util/List; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_405$class_406;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V diff --git a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping index 6d93cb133a..88a523663c 100644 --- a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping @@ -37,9 +37,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor ARG 1 mouseX ARG 3 mouseY ARG 5 button - METHOD method_23923 render (II)V - ARG 1 mouseX - ARG 2 mouseY + METHOD method_23923 render (Lnet/minecraft/class_4587;II)V METHOD method_23924 keyPressed (III)Z ARG 1 keyCode ARG 2 scanCode @@ -85,9 +83,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor ARG 1 x ARG 2 y ARG 3 button - METHOD method_2373 render (II)V - ARG 1 mouseX - ARG 2 mouseY + METHOD method_2373 render (Lnet/minecraft/class_4587;II)V METHOD method_2374 select (I)V ARG 1 index METHOD method_2375 complete ()V diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping index 3b760df15b..a65bb99295 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmChatLinkScreen FIELD field_2370 drawWarning Z FIELD field_2371 link Ljava/lang/String; - FIELD field_2372 warning Ljava/lang/String; - FIELD field_2373 copy Ljava/lang/String; + FIELD field_2372 warning Lnet/minecraft/class_2561; + FIELD field_2373 copy Lnet/minecraft/class_2561; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Z)V ARG 1 callback ARG 2 link diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping index 825b31392f..904434e054 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping @@ -1,18 +1,16 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen - FIELD field_2399 noTranslated Ljava/lang/String; + FIELD field_2399 noTranslated Lnet/minecraft/class_2561; FIELD field_2400 buttonEnableTimer I FIELD field_2401 message Lnet/minecraft/class_2561; - FIELD field_2402 yesTranslated Ljava/lang/String; + FIELD field_2402 yesTranslated Lnet/minecraft/class_2561; FIELD field_2403 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_2404 messageSplit Ljava/util/List; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 callback ARG 2 title ARG 3 message - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;Ljava/lang/String;)V + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 callback ARG 2 title ARG 3 message - ARG 4 yesTranslated - ARG 5 noTranslated METHOD method_2125 disableButtons (I)V diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping index 6b80749801..c67feba40a 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevelScreen - FIELD field_2418 tileText Ljava/lang/String; + FIELD field_2418 tileText Lnet/minecraft/class_2561; FIELD field_2419 config Lnet/minecraft/class_3232; FIELD field_2421 widgetButtonRemoveLayer Lnet/minecraft/class_4185; FIELD field_2422 parent Lnet/minecraft/class_525; FIELD field_2424 layers Lnet/minecraft/class_413$class_4192; - FIELD field_2425 heightText Ljava/lang/String; + FIELD field_2425 heightText Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_525;Lnet/minecraft/class_4952;)V ARG 1 parent METHOD method_2138 getConfigString ()Ljava/lang/String; @@ -12,9 +12,3 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel ARG 1 config CLASS class_4192 SuperflatLayersListWidget CLASS class_4193 SuperflatLayerItem - METHOD method_19373 (II)V - ARG 1 x - ARG 2 y - METHOD method_19375 (IILnet/minecraft/class_1799;)V - ARG 1 x - ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping index 01685b8aa9..afb1e3964c 100644 --- a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_421 net/minecraft/client/gui/screen/FatalErrorScreen - FIELD field_2467 message Ljava/lang/String; - METHOD (Lnet/minecraft/class_2561;Ljava/lang/String;)V + FIELD field_2467 message Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 title - ARG 2 message diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping index eefc3c76a5..dffbdeac75 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping @@ -5,8 +5,4 @@ CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/LevelLoadingScree ARG 1 progressProvider METHOD method_17537 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map - METHOD method_17538 drawChunkMap (Lnet/minecraft/class_3953;IIII)V - ARG 0 progressProvider - ARG 1 centerX - ARG 2 centerY - ARG 3 chunkSize + METHOD method_17538 drawChunkMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_3953;IIII)V diff --git a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping index cf169c4c59..e6339142e9 100644 --- a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping @@ -2,13 +2,12 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen FIELD field_2345 actionHandler Ljava/lang/Runnable; FIELD field_2346 notice Lnet/minecraft/class_2561; FIELD field_2348 noticeLines Ljava/util/List; - FIELD field_2349 buttonString Ljava/lang/String; + FIELD field_2349 buttonString Lnet/minecraft/class_2561; METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 actionHandler ARG 2 title ARG 3 notice - METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;)V + METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 actionHandler ARG 2 title ARG 3 notice - ARG 4 buttonString diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index 5548d9edb8..6337606a2b 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -1,17 +1,16 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen FIELD field_2518 presets Ljava/util/List; FIELD field_2519 parent Lnet/minecraft/class_413; - FIELD field_2520 shareText Ljava/lang/String; + FIELD field_2520 shareText Lnet/minecraft/class_2561; FIELD field_2521 listWidget Lnet/minecraft/class_430$class_4196; FIELD field_2523 customPresetField Lnet/minecraft/class_342; - FIELD field_2524 listText Ljava/lang/String; + FIELD field_2524 listText Lnet/minecraft/class_2561; FIELD field_2525 selectPresetButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_413;)V ARG 1 parent METHOD method_20102 updateSelectButton (Z)V ARG 1 hasSelected - METHOD method_2195 addPreset (Ljava/lang/String;Lnet/minecraft/class_1935;Lnet/minecraft/class_1959;Ljava/util/List;[Lnet/minecraft/class_3229;)V - ARG 0 name + METHOD method_2195 addPreset (Lnet/minecraft/class_2561;Lnet/minecraft/class_1935;Lnet/minecraft/class_1959;Ljava/util/List;[Lnet/minecraft/class_3229;)V ARG 1 icon ARG 2 biome ARG 3 structures @@ -19,10 +18,9 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen CLASS class_431 SuperflatPreset FIELD field_2526 config Ljava/lang/String; FIELD field_2527 icon Lnet/minecraft/class_1792; - FIELD field_2528 name Ljava/lang/String; - METHOD (Lnet/minecraft/class_1792;Ljava/lang/String;Ljava/lang/String;)V + FIELD field_2528 name Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2561;Ljava/lang/String;)V ARG 1 icon - ARG 2 name ARG 3 config CLASS class_4196 SuperflatPresetsListWidget CLASS class_432 SuperflatPresetEntry diff --git a/mappings/net/minecraft/client/gui/screen/ProgressScreen.mapping b/mappings/net/minecraft/client/gui/screen/ProgressScreen.mapping index 7d54ae9183..38bcb2f32b 100644 --- a/mappings/net/minecraft/client/gui/screen/ProgressScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ProgressScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_435 net/minecraft/client/gui/screen/ProgressScreen - FIELD field_2541 title Ljava/lang/String; + FIELD field_2541 title Lnet/minecraft/class_2561; FIELD field_2542 progress I FIELD field_2543 done Z - FIELD field_2544 task Ljava/lang/String; + FIELD field_2544 task Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index b4d56c1eb7..d73a009f04 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -15,10 +15,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 title METHOD method_25408 getTooltipFromItem (Lnet/minecraft/class_1799;)Ljava/util/List; ARG 1 stack - METHOD method_25409 renderTooltip (Lnet/minecraft/class_1799;II)V - ARG 1 stack - ARG 2 x - ARG 3 y + METHOD method_25409 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V METHOD method_25410 resize (Lnet/minecraft/class_310;II)V ARG 1 client ARG 2 width @@ -38,26 +35,17 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 2 override METHOD method_25416 openLink (Ljava/net/URI;)V ARG 1 link - METHOD method_25417 renderTooltip (Ljava/util/List;II)V - ARG 1 text - ARG 2 x - ARG 3 y - METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_2561;II)V - ARG 1 text - ARG 2 x - ARG 3 y + METHOD method_25417 renderTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V + METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V METHOD method_25419 onClose ()V - METHOD method_25420 renderBackground ()V + METHOD method_25420 renderBackground (Lnet/minecraft/class_4587;)V METHOD method_25421 isPauseScreen ()Z METHOD method_25422 shouldCloseOnEsc ()Z METHOD method_25423 init (Lnet/minecraft/class_310;II)V ARG 1 client ARG 2 width ARG 3 height - METHOD method_25424 renderTooltip (Ljava/lang/String;II)V - ARG 1 text - ARG 2 x - ARG 3 y + METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V METHOD method_25425 sendMessage (Ljava/lang/String;Z)V ARG 1 message ARG 2 toHud @@ -71,8 +59,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 text METHOD method_25431 tick ()V METHOD method_25432 removed ()V - METHOD method_25433 renderBackground (I)V - ARG 1 alpha + METHOD method_25433 renderBackground (Lnet/minecraft/class_4587;I)V METHOD method_25434 renderDirtBackground (I)V ARG 1 alpha METHOD method_25435 getNarrationMessage ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/screen/SettingsScreen.mapping b/mappings/net/minecraft/client/gui/screen/SettingsScreen.mapping index ceb8852820..c6c5ee4520 100644 --- a/mappings/net/minecraft/client/gui/screen/SettingsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/SettingsScreen.mapping @@ -10,5 +10,5 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/SettingsScreen ARG 2 gameOptions METHOD method_20374 lockDifficulty (Z)V ARG 1 difficultyLocked - METHOD method_2189 getDifficultyButtonText (Lnet/minecraft/class_1267;)Ljava/lang/String; + METHOD method_2189 getDifficultyButtonText (Lnet/minecraft/class_1267;)Lnet/minecraft/class_2561; ARG 1 difficulty diff --git a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping index 71b2ac178a..6166530229 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping @@ -12,12 +12,7 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashScreen ARG 2 monitor ARG 3 exceptionHandler ARG 4 reloading - METHOD method_18103 renderProgressBar (IIIIF)V - ARG 1 minX - ARG 2 minY - ARG 3 maxX - ARG 4 maxY - ARG 5 progress + METHOD method_18103 renderProgressBar (Lnet/minecraft/class_4587;IIIIF)V METHOD method_18819 init (Lnet/minecraft/class_310;)V ARG 0 client CLASS class_4070 LogoTexture diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 81d94ca2da..4455df1ae2 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -14,17 +14,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen METHOD method_19399 getSelectedStatList ()Lnet/minecraft/class_4280; METHOD method_2267 createButtons ()V METHOD method_2270 createLists ()V - METHOD method_2282 renderIcon (IIII)V - ARG 1 x - ARG 2 y - ARG 3 u - ARG 4 v + METHOD method_2282 renderIcon (Lnet/minecraft/class_4587;IIII)V METHOD method_2285 getColumnX (I)I ARG 1 index - METHOD method_2289 renderStatItem (IILnet/minecraft/class_1792;)V - ARG 1 x - ARG 2 y - ARG 3 item + METHOD method_2289 renderStatItem (Lnet/minecraft/class_4587;IILnet/minecraft/class_1792;)V CLASS class_4198 GeneralStatsListWidget CLASS class_4197 Entry FIELD field_18749 stat Lnet/minecraft/class_3445; @@ -42,10 +35,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 2 client METHOD method_19406 getText (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2561; ARG 1 item - METHOD method_19407 render (Lnet/minecraft/class_2561;II)V - ARG 1 text - ARG 2 x - ARG 3 y + METHOD method_19407 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V METHOD method_19408 selectStatType (Lnet/minecraft/class_3448;)V ARG 1 statType METHOD method_19409 getHeaderIndex (Lnet/minecraft/class_3448;)I @@ -54,11 +44,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 1 headerColumn CLASS class_450 ItemComparator CLASS class_4199 Entry - METHOD method_19405 render (Lnet/minecraft/class_3445;IIZ)V - ARG 1 stat - ARG 2 x - ARG 3 y - ARG 4 light + METHOD method_19405 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_3445;IIZ)V CLASS class_4202 EntityStatsListWidget CLASS class_4201 Entry FIELD field_18762 entityType Lnet/minecraft/class_1299; diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping index 0cd91a1743..c96ca41c3e 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2683 initialized Z FIELD field_2684 type Lnet/minecraft/class_453; FIELD field_2685 widgets Ljava/util/Map; - FIELD field_2686 title Ljava/lang/String; + FIELD field_2686 title Lnet/minecraft/class_2561; FIELD field_2687 screen Lnet/minecraft/class_457; FIELD field_2688 alpha F FIELD field_2689 originY D @@ -27,21 +27,14 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2307 getRoot ()Lnet/minecraft/class_161; METHOD method_2308 getWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement - METHOD method_2309 getTitle ()Ljava/lang/String; - METHOD method_2310 render ()V - METHOD method_2311 drawBackground (IIZ)V - ARG 1 x - ARG 2 y - ARG 3 selected + METHOD method_2309 getTitle ()Lnet/minecraft/class_2561; + METHOD method_2310 render (Lnet/minecraft/class_4587;)V + METHOD method_2311 drawBackground (Lnet/minecraft/class_4587;IIZ)V METHOD method_2312 getScreen ()Lnet/minecraft/class_457; METHOD method_2313 move (DD)V ARG 1 offsetX ARG 3 offsetY - METHOD method_2314 drawWidgetTooltip (IIII)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 x - ARG 4 y + METHOD method_2314 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index f15aaa20e9..fec5b68c77 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -10,12 +10,7 @@ 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_332;IIZI)V - ARG 1 drawable - ARG 2 x - ARG 3 y - ARG 4 selected - ARG 5 index + METHOD method_2301 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;IIZI)V METHOD method_2302 getTabX (I)I ARG 1 index METHOD method_2303 isClickOnTab (IIIDD)Z diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index abdfdb2f30..188e52ed8f 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -5,12 +5,11 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2705 description Ljava/util/List; FIELD field_2706 parent Lnet/minecraft/class_456; FIELD field_2707 children Ljava/util/List; - FIELD field_2708 BACKSLASH_S_PATTERN Ljava/util/regex/Pattern; FIELD field_2709 WIDGETS_TEX Lnet/minecraft/class_2960; FIELD field_2710 yPos I FIELD field_2711 xPos I FIELD field_2712 display Lnet/minecraft/class_185; - FIELD field_2713 title Ljava/lang/String; + FIELD field_2713 title Lnet/minecraft/class_2561; FIELD field_2714 progress Lnet/minecraft/class_167; FIELD field_2715 width I METHOD (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_161;Lnet/minecraft/class_185;)V @@ -20,13 +19,8 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc ARG 4 display METHOD method_2322 addChild (Lnet/minecraft/class_456;)V ARG 1 widget - METHOD method_2323 renderLines (IIZ)V - ARG 1 x - ARG 2 y - ARG 3 firstPass - METHOD method_2325 renderWidgets (II)V - ARG 1 x - ARG 2 y + METHOD method_2323 renderLines (Lnet/minecraft/class_4587;IIZ)V + METHOD method_2325 renderWidgets (Lnet/minecraft/class_4587;II)V METHOD method_2326 getY ()I METHOD method_2327 getX ()I METHOD method_2328 getParent (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; @@ -36,14 +30,9 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc ARG 2 originY ARG 3 mouseX ARG 4 mouseY - METHOD method_2330 wrapDescription (Ljava/lang/String;I)Ljava/util/List; - ARG 1 description + METHOD method_2330 wrapDescription (Lnet/minecraft/class_2561;I)Ljava/util/List; ARG 2 width - METHOD method_2331 drawTooltip (IIFII)V - ARG 1 originX - ARG 2 originY - ARG 3 alpha - ARG 4 x + METHOD method_2331 drawTooltip (Lnet/minecraft/class_4587;IIFII)V ARG 5 y METHOD method_2332 addToTree ()V METHOD method_2333 setProgress (Lnet/minecraft/class_167;)V diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index be5ba12a61..1fe71478f3 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -7,20 +7,11 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2721 advancementHandler Lnet/minecraft/class_632; METHOD (Lnet/minecraft/class_632;)V ARG 1 advancementHandler - METHOD method_2334 drawWidgets (II)V - ARG 1 x - ARG 2 y + METHOD method_2334 drawWidgets (Lnet/minecraft/class_4587;II)V METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement METHOD method_2336 getTab (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; ARG 1 advancement - METHOD method_2337 drawAdvancementTree (IIII)V - ARG 1 mouseX + METHOD method_2337 drawAdvancementTree (Lnet/minecraft/class_4587;IIII)V ARG 2 mouseY - ARG 3 x - ARG 4 y - METHOD method_2338 drawWidgetTooltip (IIII)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 x - ARG 4 y + METHOD method_2338 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index 12d2a16af1..c3d1fa378f 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,16 +1,7 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen FIELD field_2900 drawStatusEffects Z - METHOD method_18642 drawStatusEffectBackgrounds (IILjava/lang/Iterable;)V - ARG 1 x - ARG 2 yIncrement - ARG 3 effects - METHOD method_18643 drawStatusEffectSprites (IILjava/lang/Iterable;)V - ARG 1 x - ARG 2 yIncrement - ARG 3 effects - METHOD method_18644 drawStatusEffectDescriptions (IILjava/lang/Iterable;)V - ARG 1 x - ARG 2 yIncrement - ARG 3 effects + METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + METHOD method_18644 drawStatusEffectDescriptions (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V METHOD method_2476 applyStatusEffectOffset ()V - METHOD method_2477 drawStatusEffects ()V + METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_4587;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 7b65fe340a..18e88d24d9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD (II)V ARG 1 x ARG 2 y - METHOD method_18641 renderExtra ()V + METHOD method_18641 renderExtra (Lnet/minecraft/class_4587;)V METHOD method_2401 setDisabled (Z)V ARG 1 disabled METHOD method_2402 isDisabled ()Z diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index 0ddf7493d8..b901f19556 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -3,11 +3,9 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr FIELD field_2826 player Lnet/minecraft/class_1657; FIELD field_2827 lastClickIndex I FIELD field_2828 signing Z - FIELD field_2829 highlightTo I FIELD field_2830 lastClickTime J FIELD field_2831 signButton Lnet/minecraft/class_4185; FIELD field_2832 hand Lnet/minecraft/class_1268; - FIELD field_2833 cursorIndex I FIELD field_2835 itemStack Lnet/minecraft/class_1799; FIELD field_2837 dirty Z FIELD field_2839 previousPageButton Lnet/minecraft/class_474; @@ -19,73 +17,22 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr FIELD field_2848 doneButton Lnet/minecraft/class_4185; FIELD field_2849 cancelButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)V - ARG 1 playerEntity ARG 2 itemStack ARG 3 hand - METHOD method_16345 stripFromatting (Ljava/lang/String;)Ljava/lang/String; - ARG 1 string METHOD method_17046 countPages ()I METHOD method_17047 removeEmptyPages ()V - METHOD method_2404 getCharacterCountInFrontOfCursor (Ljava/lang/String;Lnet/minecraft/class_473$class_475;)I - ARG 1 content - ARG 2 cursorPosition METHOD method_2407 finalizeBook (Z)V ARG 1 signBook - METHOD method_2408 applyRightArrowKey (Ljava/lang/String;)V - ARG 1 content - METHOD method_2409 drawHighlightRect (Lnet/minecraft/class_473$class_475;Lnet/minecraft/class_473$class_475;)V - ARG 1 position1 - ARG 2 position2 - METHOD method_2410 removeHighlightedText ()V - METHOD method_2411 keyPressedEditMode (III)Z - ARG 1 keyCode - ARG 2 scanCode - ARG 3 modifiers - METHOD method_2412 getCharWidthInString (Ljava/lang/String;I)I - ARG 1 string - ARG 2 index METHOD method_2413 updateButtons ()V - METHOD method_2414 moveCursorToBottom (Ljava/lang/String;)V - ARG 1 content - METHOD method_2415 translateRelativePositionToGlPosition (Lnet/minecraft/class_473$class_475;)V - ARG 1 position - METHOD method_2416 getCursorPositionForIndex (Ljava/lang/String;I)Lnet/minecraft/class_473$class_475; - ARG 1 content - ARG 2 index - METHOD method_2417 getCharacterCountForWidth (Ljava/lang/String;I)I - ARG 1 text - ARG 2 width - METHOD method_2421 moveCursorToTop (Ljava/lang/String;)V - ARG 1 content + METHOD method_2414 moveCursorToBottom ()V + METHOD method_2421 moveCursorToTop ()V METHOD method_2424 getStringWidth (Ljava/lang/String;)I ARG 1 text - METHOD method_2425 getCharacterCountForStringWidth (Ljava/lang/String;I)I - ARG 1 string - ARG 2 width METHOD method_2427 getCurrentPageContent ()Ljava/lang/String; - METHOD method_2428 applyBackspaceKey (Ljava/lang/String;)V - ARG 1 content - METHOD method_2429 localizePosition (Lnet/minecraft/class_473$class_475;)V - ARG 1 position - METHOD method_2430 applyUpArrowKey (Ljava/lang/String;)V - ARG 1 content - METHOD method_2431 writeString (Ljava/lang/String;)V - ARG 1 string - METHOD method_2434 applyDeleteKey (Ljava/lang/String;)V - ARG 1 content - METHOD method_2435 applyDownArrowKey (Ljava/lang/String;)V - ARG 1 content METHOD method_2436 appendNewPage ()V METHOD method_2437 openPreviousPage ()V METHOD method_2439 setPageContent (Ljava/lang/String;)V ARG 1 newContent - METHOD method_2440 applyLeftArrowKey (Ljava/lang/String;)V - ARG 1 content - METHOD method_2441 drawHighlight (Ljava/lang/String;)V - ARG 1 content - METHOD method_2442 getHighlightedText ()Ljava/lang/String; - METHOD method_2443 translateGlPositionToRelativePosition (Lnet/minecraft/class_473$class_475;)V - ARG 1 position METHOD method_2444 openNextPage ()V METHOD method_2446 keyPressedSignMode (III)Z ARG 1 keyCode @@ -94,6 +41,3 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr CLASS class_475 Position FIELD field_2853 y I FIELD field_2854 x I - METHOD (Lnet/minecraft/class_473;II)V - ARG 2 x - ARG 3 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index c200b48600..4b4bcba15b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -9,8 +9,4 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph ARG 2 x ARG 3 y ARG 4 size - METHOD method_17567 drawMap (Lnet/minecraft/class_22;ZZZZ)V - ARG 1 mapState - ARG 2 isMap - ARG 3 isPaper - ARG 4 isGlassPane + METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_22;ZZZZ)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 6f1e2b4195..af7dcafe00 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -30,15 +30,11 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv METHOD method_2467 isClickInScrollbar (DD)Z ARG 1 mouseX ARG 3 mouseY - METHOD method_2468 renderTabIcon (Lnet/minecraft/class_1761;)V - ARG 1 group + METHOD method_2468 renderTabIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;)V METHOD method_2469 getSelectedTab ()I METHOD method_2470 isCreativeInventorySlot (Lnet/minecraft/class_1735;)Z ARG 1 slot - METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_1761;II)Z - ARG 1 group - ARG 2 mouseX - ARG 3 mouseY + METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;II)Z CLASS class_482 LockableSlot CLASS class_483 CreativeScreenHandler FIELD field_2897 itemList Lnet/minecraft/class_2371; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping index edc23ceadd..8787ad51e2 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_487 net/minecraft/client/gui/screen/ingame/EnchantingP FIELD field_2916 phrases [Ljava/lang/String; FIELD field_2917 INSTANCE Lnet/minecraft/class_487; FIELD field_2918 random Ljava/util/Random; - METHOD method_2479 generatePhrase (Lnet/minecraft/class_327;I)Ljava/lang/String; + METHOD method_2479 generatePhrase (Lnet/minecraft/class_327;I)Lnet/minecraft/class_5250; ARG 1 fontRenderer ARG 2 width METHOD method_2480 setSeed (J)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping index 1635c5b198..5c897f086c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScr ARG 2 playerInventory ARG 3 title ARG 4 texture - METHOD method_25444 renderForeground (IIF)V - ARG 1 mouseX + METHOD method_25444 renderForeground (Lnet/minecraft/class_4587;IIF)V ARG 2 mouseY - ARG 3 delta METHOD method_25445 setup ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping index 7099cfb20a..f0ead6258b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping @@ -40,9 +40,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 5 pointX ARG 7 pointY METHOD method_2379 calculateOffset ()V - METHOD method_2380 drawMouseoverTooltip (II)V - ARG 1 mouseX - ARG 2 mouseY + METHOD method_2380 drawMouseoverTooltip (Lnet/minecraft/class_4587;II)V METHOD method_2381 isClickOutsideBounds (DDIII)Z ARG 1 mouseX ARG 3 mouseY @@ -63,8 +61,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre METHOD method_2384 handleHotbarKeyPressed (II)Z ARG 1 keyCode ARG 2 scanCode - METHOD method_2385 drawSlot (Lnet/minecraft/class_1735;)V - ARG 1 slot + METHOD method_2385 drawSlot (Lnet/minecraft/class_4587;Lnet/minecraft/class_1735;)V METHOD method_2386 getSlotAt (DD)Lnet/minecraft/class_1735; ARG 1 xPosition ARG 3 yPosition @@ -72,10 +69,6 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 1 slot ARG 2 pointX ARG 4 pointY - METHOD method_2388 drawForeground (II)V - ARG 1 mouseX - ARG 2 mouseY - METHOD method_2389 drawBackground (FII)V - ARG 1 delta - ARG 2 mouseX + METHOD method_2388 drawForeground (Lnet/minecraft/class_4587;II)V + METHOD method_2389 drawBackground (Lnet/minecraft/class_4587;FII)V ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping index 7bbdccde8d..5f61524497 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping @@ -14,5 +14,5 @@ CLASS net/minecraft/class_3742 net/minecraft/client/gui/screen/ingame/JigsawBloc METHOD method_16348 updateServer ()V METHOD method_16349 onCancel ()V METHOD method_20118 updateDoneButtonState ()V - METHOD method_26413 getLocalizedJointName ()Ljava/lang/String; + METHOD method_26413 getLocalizedJointName ()Lnet/minecraft/class_2561; METHOD method_27272 generate ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index b14b0da23c..6051e768df 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_19413 drawLevelInfo (IILnet/minecraft/class_1914;)V + METHOD method_19413 drawLevelInfo (Lnet/minecraft/class_4587;IILnet/minecraft/class_1914;)V METHOD method_20220 canScroll (I)Z ARG 1 listSize METHOD method_2496 syncRecipeIndex ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping index 5084aa2923..676d17e2b0 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping @@ -3,6 +3,4 @@ CLASS net/minecraft/class_498 net/minecraft/client/gui/screen/ingame/SignEditScr FIELD field_3030 ticksSinceOpened I FIELD field_3031 sign Lnet/minecraft/class_2625; FIELD field_3032 selectionManager Lnet/minecraft/class_3728; - METHOD (Lnet/minecraft/class_2625;)V - ARG 1 sign METHOD method_2526 finishEditing ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index 8783b177b3..2f5f6acf26 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -12,12 +12,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte ARG 1 x ARG 2 y ARG 3 scrollOffset - METHOD method_17952 renderRecipeBackground (IIIII)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 x - ARG 4 y - ARG 5 scrollOffset + METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_4587;IIIII)V METHOD method_17953 getMaxScroll ()I METHOD method_17954 shouldScroll ()Z METHOD method_17955 onInventoryChange ()V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index 3f35e7524e..d2c4b5d642 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip FIELD field_3037 serverListPinger Lnet/minecraft/class_644; FIELD field_3040 serverList Lnet/minecraft/class_641; FIELD field_3041 buttonEdit Lnet/minecraft/class_4185; - FIELD field_3042 tooltipText Ljava/lang/String; + FIELD field_3042 tooltipText Ljava/util/List; FIELD field_3043 serverListWidget Lnet/minecraft/class_4267; FIELD field_3044 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_3045 lanServerDetector Lnet/minecraft/class_1134$class_1135; @@ -23,8 +23,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip ARG 1 confirmedAction METHOD method_20380 directConnect (Z)V ARG 1 confirmedAction - METHOD method_2528 setTooltip (Ljava/lang/String;)V - ARG 1 text + METHOD method_2528 setTooltip (Ljava/util/List;)V METHOD method_2529 getServerList ()Lnet/minecraft/class_641; METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index e8ae8762b9..d29c7440f7 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -44,10 +44,7 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 2 screen ARG 3 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; - METHOD method_20134 draw (IILnet/minecraft/class_2960;)V - ARG 1 x - ARG 2 y - ARG 3 textureId + METHOD method_20134 draw (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V METHOD method_20137 updateIcon ()V METHOD method_22110 swapEntries (II)V ARG 1 i diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping index 12a7296083..ae4c7e58fb 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_4749 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_21844 message Lnet/minecraft/class_2561; FIELD field_21845 checkMessage Lnet/minecraft/class_2561; FIELD field_21846 proceedText Lnet/minecraft/class_2561; - FIELD field_21847 backText Lnet/minecraft/class_2561; FIELD field_21848 checkbox Lnet/minecraft/class_4286; FIELD field_21849 lines Ljava/util/List; METHOD (Lnet/minecraft/class_437;)V diff --git a/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping b/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping index 4e33209708..3915054877 100644 --- a/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping @@ -5,15 +5,11 @@ CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/options/ControlsLi ARG 1 gui ARG 2 client CLASS class_460 CategoryEntry - FIELD field_2736 name Ljava/lang/String; + FIELD field_2736 name Lnet/minecraft/class_2561; FIELD field_2737 nameWidth I - METHOD (Lnet/minecraft/class_459;Ljava/lang/String;)V - ARG 2 translationKey CLASS class_461 Entry CLASS class_462 KeyBindingEntry FIELD field_2739 editButton Lnet/minecraft/class_4185; FIELD field_2740 binding Lnet/minecraft/class_304; - FIELD field_2741 bindingName Ljava/lang/String; + 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;)V - ARG 2 binding diff --git a/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping index a505cc0c45..0e80691003 100644 --- a/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/options/SkinOption METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions - METHOD method_2248 getPlayerModelPartDisplayString (Lnet/minecraft/class_1664;)Ljava/lang/String; + METHOD method_2248 getPlayerModelPartDisplayString (Lnet/minecraft/class_1664;)Lnet/minecraft/class_2561; ARG 1 part diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping index c243185763..34581354db 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping @@ -10,6 +10,6 @@ CLASS net/minecraft/class_517 net/minecraft/client/gui/screen/recipebook/Abstrac METHOD method_17062 isGuiOpen ()Z METHOD method_17063 setGuiOpen (Z)V ARG 1 opened - METHOD method_17064 getToggleCraftableButtonText ()Ljava/lang/String; + METHOD method_17064 getToggleCraftableButtonText ()Lnet/minecraft/class_2561; METHOD method_17065 getAllowedFuels ()Ljava/util/Set; METHOD method_2658 getItem ()Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index 1126077a73..33e7bdb354 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -22,13 +22,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 5 areaCenterX ARG 6 areaCenterY ARG 7 delta - METHOD method_2618 renderGrid (IIIIII)V - ARG 1 columns - ARG 2 rows - ARG 3 squareSize - ARG 4 borderSize - ARG 5 u - ARG 6 v + METHOD method_2618 renderGrid (Lnet/minecraft/class_4587;IIIIII)V CLASS class_509 AlternativeButtonWidget FIELD field_3114 recipe Lnet/minecraft/class_1860; FIELD field_3115 isCraftable Z diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping index a891e1d006..413d763c59 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping @@ -5,12 +5,7 @@ CLASS net/minecraft/class_505 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2565 setRecipe (Lnet/minecraft/class_1860;)V ARG 1 recipe METHOD method_2566 getRecipe ()Lnet/minecraft/class_1860; - METHOD method_2567 draw (Lnet/minecraft/class_310;IIZF)V - ARG 1 client - ARG 2 x - ARG 3 y - ARG 4 isBig - ARG 5 lastFrameDuration + METHOD method_2567 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;IIZF)V METHOD method_2569 addSlot (Lnet/minecraft/class_1856;II)V ARG 1 ingredient ARG 2 x diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping index 5fb8977a51..dadd15ec66 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2626 hideShowPageButtons ()V METHOD method_2627 setResults (Ljava/util/List;Z)V ARG 2 resetCurrentPage - METHOD method_2628 drawTooltip (II)V + METHOD method_2628 drawTooltip (Lnet/minecraft/class_4587;II)V METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V METHOD method_2630 setGui (Lnet/minecraft/class_507;)V METHOD method_2631 getLastClickedRecipe ()Lnet/minecraft/class_1860; @@ -29,12 +29,7 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 8 areaWidth ARG 9 areaHeight METHOD method_2633 getRecipeBook ()Lnet/minecraft/class_3439; - METHOD method_2634 draw (IIIIF)V - ARG 1 left - ARG 2 top - ARG 3 mouseX - ARG 4 mouseY - ARG 5 delta + METHOD method_2634 draw (Lnet/minecraft/class_4587;IIIIF)V METHOD method_2635 getLastClickedResults ()Lnet/minecraft/class_516; METHOD method_2636 initialize (Lnet/minecraft/class_310;II)V ARG 2 parentLeft diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index 7e014c758b..95678ba4c1 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -19,11 +19,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2576 triggerPirateSpeakEasterEgg (Ljava/lang/String;)V METHOD method_2579 reset (Z)V ARG 1 isNarrow - METHOD method_2581 drawGhostSlots (IIZF)V - ARG 1 left - ARG 2 top - ARG 3 isBig - ARG 4 lastFrameDuration + METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_4587;IIZF)V METHOD method_2585 setBookButtonTexture ()V METHOD method_2586 refreshSearchResults ()V METHOD method_2587 refreshInputs ()V @@ -48,15 +44,11 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 4 isNarrow ARG 5 craftingScreenHandler METHOD method_2598 isClickOutsideBounds (DDIIIII)Z - METHOD method_2599 getCraftableButtonText ()Ljava/lang/String; + METHOD method_2599 getCraftableButtonText ()Lnet/minecraft/class_2561; METHOD method_2600 slotClicked (Lnet/minecraft/class_1735;)V ARG 1 slot - METHOD method_2601 drawTooltip (IIII)V - ARG 1 left - ARG 2 top - ARG 3 mouseX - ARG 4 mouseY - METHOD method_2602 drawGhostSlotTooltip (IIII)V + METHOD method_2601 drawTooltip (Lnet/minecraft/class_4587;IIII)V + METHOD method_2602 drawGhostSlotTooltip (Lnet/minecraft/class_4587;IIII)V METHOD method_2603 refreshResults (Z)V ARG 1 resetCurrentPage METHOD method_2604 isWide ()Z diff --git a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping index 29504fb048..2fc36632b4 100644 --- a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping @@ -24,8 +24,6 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/resourcepack/Resou METHOD method_20145 enable (Lnet/minecraft/class_523;)V ARG 1 list METHOD method_20147 getCompatibility ()Lnet/minecraft/class_3281; - METHOD method_20148 getDescription ()Ljava/lang/String; - METHOD method_20149 getDisplayName ()Ljava/lang/String; METHOD method_20150 getPack ()Lnet/minecraft/class_1075; METHOD method_20151 isMoveable ()Z METHOD method_20152 isSelectable ()Z diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index a7e4fd9a10..be5b51761e 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -15,12 +15,12 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3191 bonusChest Z FIELD field_3192 cheatsEnabled Z FIELD field_3193 moreOptionsButton Lnet/minecraft/class_4185; - FIELD field_3194 firstGameModeDescriptionLine Ljava/lang/String; + FIELD field_3194 firstGameModeDescriptionLine Lnet/minecraft/class_2561; FIELD field_3195 levelName Ljava/lang/String; FIELD field_3196 saveDirectoryName Ljava/lang/String; FIELD field_3197 generateBonusChestButton Lnet/minecraft/class_4185; FIELD field_3198 customizeTypeButton Lnet/minecraft/class_4185; - FIELD field_3199 secondGameModeDescriptionLine Ljava/lang/String; + FIELD field_3199 secondGameModeDescriptionLine Lnet/minecraft/class_2561; FIELD field_3201 currentMode Lnet/minecraft/class_525$class_4539; FIELD field_3202 moreOptionsOpen Z FIELD field_3203 generateStructuresButton Lnet/minecraft/class_4185; @@ -29,7 +29,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V - ARG 1 mode METHOD method_25993 getLevelGeneratorType ()Lnet/minecraft/class_1942; METHOD method_2710 setMoreOptionsOpen (Z)V ARG 1 moreOptionsOpen @@ -38,8 +37,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_2723 isGeneratorTypeValid ()Z METHOD method_2727 updateSaveFolderName ()V METHOD method_2736 createLevel ()V - METHOD method_2737 recreateLevel (Lnet/minecraft/class_31;)V - ARG 1 levelProperties + METHOD method_2737 recreateLevel (Lnet/minecraft/class_5219;)V CLASS class_4539 Mode FIELD field_20628 translationSuffix Ljava/lang/String; FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index 184f5e2e04..86016ab88c 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl FIELD field_3232 DIMENSION_COLORS Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_3234 updater Lnet/minecraft/class_1257; - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_31;Z)V + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5219;Z)V ARG 1 callback diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index d70bd6f33c..b8521d96f3 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -5,11 +5,10 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS FIELD field_3219 deleteButton Lnet/minecraft/class_4185; FIELD field_3220 searchBox Lnet/minecraft/class_342; FIELD field_3221 parent Lnet/minecraft/class_437; - FIELD field_3222 tooltipText Ljava/lang/String; + FIELD field_3222 tooltipText Ljava/util/List; FIELD field_3224 selectButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_19940 worldSelected (Z)V ARG 1 active - METHOD method_2739 setTooltip (Ljava/lang/String;)V - ARG 1 value + METHOD method_2739 setTooltip (Ljava/util/List;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 982e4ea84c..ef87cf9340 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 8 searchFilter ARG 9 list METHOD method_2750 filter (Ljava/util/function/Supplier;Z)V - ARG 1 filter ARG 2 load METHOD method_2752 getParent ()Lnet/minecraft/class_526; CLASS class_4272 Entry diff --git a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping index fedd0b3c52..c7430afe42 100644 --- a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidget - FIELD field_22754 message Ljava/lang/String; + FIELD field_22754 message Lnet/minecraft/class_2561; FIELD field_22755 wasHovered Z FIELD field_22756 focused Z FIELD field_22757 WIDGETS_LOCATION Lnet/minecraft/class_2960; @@ -12,12 +12,11 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg FIELD field_22764 visible Z FIELD field_22765 alpha F FIELD field_22766 nextNarration J - METHOD (IIIILjava/lang/String;)V + METHOD (IIIILnet/minecraft/class_2561;)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height - ARG 5 message METHOD method_25348 onClick (DD)V ARG 1 mouseX ARG 3 mouseY @@ -30,17 +29,12 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg ARG 1 value METHOD method_25351 isValidClickButton (I)Z ARG 1 button - METHOD method_25352 renderToolTip (II)V - ARG 1 mouseX - ARG 2 mouseY - METHOD method_25353 renderBg (Lnet/minecraft/class_310;II)V - ARG 1 client - ARG 2 mouseX + METHOD method_25352 renderToolTip (Lnet/minecraft/class_4587;II)V + METHOD method_25353 renderBg (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;II)V ARG 3 mouseY METHOD method_25354 playDownSound (Lnet/minecraft/class_1144;)V ARG 1 soundManager - METHOD method_25355 setMessage (Ljava/lang/String;)V - ARG 1 value + METHOD method_25355 setMessage (Lnet/minecraft/class_2561;)V METHOD method_25356 getYImage (Z)I ARG 1 isHovered METHOD method_25357 onRelease (DD)V @@ -48,11 +42,8 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg ARG 3 mouseY METHOD method_25358 setWidth (I)V ARG 1 value - METHOD method_25359 renderButton (IIF)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 delta - METHOD method_25360 getNarrationMessage ()Ljava/lang/String; + METHOD method_25359 renderButton (Lnet/minecraft/class_4587;IIF)V + METHOD method_25360 getNarrationMessage ()Lnet/minecraft/class_5250; METHOD method_25361 clicked (DD)Z ARG 1 mouseX ARG 3 mouseY @@ -65,5 +56,5 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg METHOD method_25366 narrate ()V METHOD method_25367 isHovered ()Z METHOD method_25368 getWidth ()I - METHOD method_25369 getMessage ()Ljava/lang/String; + METHOD method_25369 getMessage ()Lnet/minecraft/class_2561; METHOD method_25370 isFocused ()Z diff --git a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping index 9e756fe1fd..2cb2c13e94 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget FIELD field_18214 buttons Ljava/util/List; METHOD (Ljava/util/List;)V ARG 1 buttons - METHOD method_18622 (IIIFLnet/minecraft/class_339;)V - ARG 4 button METHOD method_20409 create (Lnet/minecraft/class_315;ILnet/minecraft/class_316;)Lnet/minecraft/class_353$class_354; ARG 0 options ARG 1 width diff --git a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping index e9e6721dda..51ae8ac401 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_4185 net/minecraft/client/gui/widget/ButtonWidget FIELD field_22767 onPress Lnet/minecraft/class_4185$class_4241; - METHOD (IIIILjava/lang/String;Lnet/minecraft/class_4185$class_4241;)V + METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height - ARG 5 message ARG 6 onPress CLASS class_4241 PressAction METHOD onPress (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping index 55105ee46c..917e228a4f 100644 --- a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_4286 net/minecraft/client/gui/widget/CheckboxWidget FIELD field_19230 checked Z FIELD field_19231 TEXTURE Lnet/minecraft/class_2960; - METHOD (IIIILjava/lang/String;Z)V + METHOD (IIIILnet/minecraft/class_2561;Z)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height - ARG 5 message ARG 6 checked METHOD method_20372 isChecked ()Z diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 02be348e76..792a32f632 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -33,16 +33,9 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25310 clickedHeader (II)V ARG 1 x ARG 2 y - METHOD method_25311 renderList (IIIIF)V - ARG 1 x + METHOD method_25311 renderList (Lnet/minecraft/class_4587;IIIIF)V + METHOD method_25312 renderHeader (Lnet/minecraft/class_4587;IILnet/minecraft/class_289;)V ARG 2 y - ARG 3 mouseX - ARG 4 mouseY - ARG 5 delta - METHOD method_25312 renderHeader (IILnet/minecraft/class_289;)V - ARG 1 x - ARG 2 y - ARG 3 tessellator METHOD method_25313 setSelected (Lnet/minecraft/class_350$class_351;)V ARG 1 entry METHOD method_25314 replaceEntries (Ljava/util/Collection;)V @@ -58,9 +51,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 5 button METHOD method_25319 getRowBottom (I)I ARG 1 index - METHOD method_25320 renderDecorations (II)V - ARG 1 mouseX - ARG 2 mouseY + METHOD method_25320 renderDecorations (Lnet/minecraft/class_4587;II)V METHOD method_25321 addEntry (Lnet/minecraft/class_350$class_351;)I ARG 1 entry METHOD method_25322 getRowWidth ()I @@ -71,7 +62,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 4 bottom METHOD method_25324 centerScrollOn (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_25325 renderBackground ()V + METHOD method_25325 renderBackground (Lnet/minecraft/class_4587;)V METHOD method_25326 getEntry (I)Lnet/minecraft/class_350$class_351; ARG 1 index METHOD method_25327 renderHoleBackground (IIII)V @@ -102,16 +93,13 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25342 getRowLeft ()I CLASS class_351 Entry FIELD field_22752 list Lnet/minecraft/class_350; - METHOD method_25343 render (IIIIIIIZF)V - ARG 1 index + METHOD method_25343 render (Lnet/minecraft/class_4587;IIIIIIIZF)V ARG 2 y ARG 3 x ARG 4 width ARG 5 height ARG 6 mouseX ARG 7 mouseY - ARG 8 hovering - ARG 9 delta CLASS class_352 Entries FIELD field_2146 entries Ljava/util/List; METHOD add (ILjava/lang/Object;)V diff --git a/mappings/net/minecraft/client/gui/widget/ListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ListWidget.mapping index e7a417cfb6..c03115a1cd 100644 --- a/mappings/net/minecraft/client/gui/widget/ListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ListWidget.mapping @@ -39,20 +39,13 @@ CLASS net/minecraft/class_358 net/minecraft/client/gui/widget/ListWidget ARG 2 x ARG 3 y ARG 4 delta - METHOD method_25377 renderList (IIIIF)V - ARG 1 x - ARG 2 y - ARG 3 mouseX - ARG 4 mouseY - ARG 5 delta - METHOD method_25378 renderItem (IIIIIIF)V - ARG 1 index + METHOD method_25377 renderList (Lnet/minecraft/class_4587;IIIIF)V + METHOD method_25378 renderItem (Lnet/minecraft/class_4587;IIIIIIF)V ARG 2 x ARG 3 y ARG 4 itemHeight ARG 5 mouseX ARG 6 mouseY - ARG 7 delta METHOD method_25379 renderHeader (IILnet/minecraft/class_289;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping index 5c25488ba7..b38df2ccf6 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_349 net/minecraft/client/gui/widget/OptionButtonWidget FIELD field_18970 option Lnet/minecraft/class_316; - METHOD (IIIILnet/minecraft/class_316;Ljava/lang/String;Lnet/minecraft/class_4185$class_4241;)V + METHOD (IIIILnet/minecraft/class_316;Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 option - ARG 6 text ARG 7 pressAction diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index 04c046d673..2ba98be7e5 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget FIELD field_22753 value D - METHOD (IIIILjava/lang/String;D)V + METHOD (IIIILnet/minecraft/class_2561;D)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height - ARG 5 message ARG 6 value METHOD method_25344 applyValue ()V METHOD method_25345 setValueFromMouse (D)V diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index 6dbab2a57a..377125de48 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -16,21 +16,19 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget FIELD field_2106 suggestion Ljava/lang/String; FIELD field_2107 focusedTicks I FIELD field_2108 maxLength I - METHOD (Lnet/minecraft/class_327;IIIILjava/lang/String;)V + METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;)V ARG 1 textRenderer ARG 2 x ARG 3 y ARG 4 width ARG 5 height - ARG 6 message - METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_342;Ljava/lang/String;)V + METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_342;Lnet/minecraft/class_2561;)V ARG 1 textRenderer ARG 2 x ARG 3 y ARG 4 width ARG 5 height ARG 6 copyFrom - ARG 7 message METHOD method_16872 setX (I)V ARG 1 x METHOD method_16873 erase (I)V @@ -63,7 +61,6 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1865 tick ()V METHOD method_1866 getSelectedText ()Ljava/lang/String; METHOD method_1867 write (Ljava/lang/String;)V - ARG 1 text METHOD method_1868 setEditableColor (I)V ARG 1 color METHOD method_1869 getWordSkipPosition (II)I diff --git a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping index 5662c3dc69..0835664113 100644 --- a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidg ARG 9 textureWidth ARG 10 textureHeight ARG 11 pressAction - METHOD (IIIIIIILnet/minecraft/class_2960;IILnet/minecraft/class_4185$class_4241;Ljava/lang/String;)V + METHOD (IIIIIIILnet/minecraft/class_2960;IILnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_2561;)V ARG 1 x ARG 2 y ARG 3 width @@ -29,7 +29,6 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidg ARG 9 textureWidth ARG 10 textureHeight ARG 11 pressAction - ARG 12 text METHOD (IIIIIIILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 5d7ccbb20c..41bc7d470b 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -1,15 +1,15 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_3752 name Ljava/lang/String; - FIELD field_3753 playerCountLabel Ljava/lang/String; + FIELD field_3753 playerCountLabel Lnet/minecraft/class_2561; FIELD field_3754 online Z FIELD field_3755 resourcePackState Lnet/minecraft/class_642$class_643; FIELD field_3756 protocolVersion I - FIELD field_3757 label Ljava/lang/String; + FIELD field_3757 label Lnet/minecraft/class_2561; FIELD field_3758 ping J FIELD field_3759 icon Ljava/lang/String; - FIELD field_3760 version Ljava/lang/String; + FIELD field_3760 version Lnet/minecraft/class_2561; FIELD field_3761 address Ljava/lang/String; - FIELD field_3762 playerListSummary Ljava/lang/String; + FIELD field_3762 playerListSummary Ljava/util/List; FIELD field_3763 local Z METHOD (Ljava/lang/String;Ljava/lang/String;Z)V ARG 1 name diff --git a/mappings/net/minecraft/client/options/BooleanOption.mapping b/mappings/net/minecraft/client/options/BooleanOption.mapping index 8f1c9bc8d6..e4af1b19cb 100644 --- a/mappings/net/minecraft/client/options/BooleanOption.mapping +++ b/mappings/net/minecraft/client/options/BooleanOption.mapping @@ -15,5 +15,5 @@ CLASS net/minecraft/class_4062 net/minecraft/client/options/BooleanOption ARG 2 value METHOD method_18494 get (Lnet/minecraft/class_315;)Z ARG 1 options - METHOD method_18495 getDisplayString (Lnet/minecraft/class_315;)Ljava/lang/String; + METHOD method_18495 getDisplayString (Lnet/minecraft/class_315;)Lnet/minecraft/class_2561; ARG 1 options diff --git a/mappings/net/minecraft/client/options/CyclingOption.mapping b/mappings/net/minecraft/client/options/CyclingOption.mapping index f0347b0bb7..8926e5b875 100644 --- a/mappings/net/minecraft/client/options/CyclingOption.mapping +++ b/mappings/net/minecraft/client/options/CyclingOption.mapping @@ -8,5 +8,5 @@ CLASS net/minecraft/class_4064 net/minecraft/client/options/CyclingOption METHOD method_18500 cycle (Lnet/minecraft/class_315;I)V ARG 1 options ARG 2 amount - METHOD method_18501 getMessage (Lnet/minecraft/class_315;)Ljava/lang/String; + METHOD method_18501 getMessage (Lnet/minecraft/class_315;)Lnet/minecraft/class_2561; ARG 1 options diff --git a/mappings/net/minecraft/client/options/DoubleOption.mapping b/mappings/net/minecraft/client/options/DoubleOption.mapping index 104c6f6014..8b6e92ca0e 100644 --- a/mappings/net/minecraft/client/options/DoubleOption.mapping +++ b/mappings/net/minecraft/client/options/DoubleOption.mapping @@ -28,5 +28,5 @@ CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption METHOD method_18617 getMax ()D METHOD method_18618 adjust (D)D ARG 1 value - METHOD method_18619 getDisplayString (Lnet/minecraft/class_315;)Ljava/lang/String; + METHOD method_18619 getDisplayString (Lnet/minecraft/class_315;)Lnet/minecraft/class_2561; ARG 1 options diff --git a/mappings/net/minecraft/client/options/KeyBinding.mapping b/mappings/net/minecraft/client/options/KeyBinding.mapping index 422c5cdc4c..fa09b13685 100644 --- a/mappings/net/minecraft/client/options/KeyBinding.mapping +++ b/mappings/net/minecraft/client/options/KeyBinding.mapping @@ -44,6 +44,6 @@ CLASS net/minecraft/class_304 net/minecraft/client/options/KeyBinding METHOD method_1435 equals (Lnet/minecraft/class_304;)Z METHOD method_1436 wasPressed ()Z METHOD method_1437 unpressAll ()V - METHOD method_16007 getLocalizedName ()Ljava/lang/String; + METHOD method_16007 getLocalizedName ()Lnet/minecraft/class_2561; METHOD method_23481 setPressed (Z)V ARG 1 pressed diff --git a/mappings/net/minecraft/client/options/NarratorOption.mapping b/mappings/net/minecraft/client/options/NarratorOption.mapping index 887d3d3edb..b3207b3952 100644 --- a/mappings/net/minecraft/client/options/NarratorOption.mapping +++ b/mappings/net/minecraft/client/options/NarratorOption.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_4065 net/minecraft/client/options/NarratorOption FIELD field_18180 VALUES [Lnet/minecraft/class_4065; FIELD field_18181 id I - FIELD field_18182 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 translationKey METHOD method_18509 getId ()I METHOD method_18510 byId (I)Lnet/minecraft/class_4065; ARG 0 id - METHOD method_18511 getTranslationKey ()Ljava/lang/String; + METHOD method_18511 getTranslationKey ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/options/Option.mapping b/mappings/net/minecraft/client/options/Option.mapping index d4c0975703..439fa8acf2 100644 --- a/mappings/net/minecraft/client/options/Option.mapping +++ b/mappings/net/minecraft/client/options/Option.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option FIELD field_21331 SPRINT_TOGGLED Lnet/minecraft/class_4064; METHOD (Ljava/lang/String;)V ARG 1 key - METHOD method_18518 getDisplayPrefix ()Ljava/lang/String; + METHOD method_18518 getDisplayPrefix ()Lnet/minecraft/class_5250; METHOD method_18520 createButton (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339; ARG 1 options ARG 2 x diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 61c5b95c1d..81cc8eaba5 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -221,8 +221,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 buffer ARG 2 y ARG 3 bottom - METHOD method_3285 getOpenChunkFaces (Lnet/minecraft/class_2338;)Ljava/util/Set; - ARG 1 pos METHOD method_3288 spawnParticle (Lnet/minecraft/class_2394;ZZDDDDDD)Lnet/minecraft/class_703; ARG 1 parameters ARG 2 alwaysSpawn diff --git a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping index c3aaa69c78..1b7d0d5e0a 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping @@ -20,7 +20,5 @@ CLASS net/minecraft/class_852 net/minecraft/client/render/chunk/ChunkOcclusionDa ARG 2 openFaces METHOD method_3685 offset (ILnet/minecraft/class_2350;)I ARG 1 pos - METHOD method_3686 getOpenFaces (Lnet/minecraft/class_2338;)Ljava/util/Set; - ARG 1 pos METHOD method_3687 getOpenFaces (I)Ljava/util/Set; ARG 1 pos diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping index cda6d26ee2..d0031b74c5 100644 --- a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -5,10 +5,8 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere FIELD field_21535 targetedEntity Ljava/util/UUID; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_23805 addBee (Lnet/minecraft/class_4703$class_4704;)V - ARG 1 bee - METHOD method_23806 getPositionString (Lnet/minecraft/class_4703$class_4704;Lnet/minecraft/class_2338;)Ljava/lang/String; - ARG 1 bee + METHOD method_23805 addBee (Lnet/minecraft/class_4703$class_5243;)V + METHOD method_23806 getPositionString (Lnet/minecraft/class_4703$class_5243;Lnet/minecraft/class_2338;)Ljava/lang/String; ARG 2 pos METHOD method_23807 addHive (Lnet/minecraft/class_4703$class_4705;)V ARG 1 hive @@ -41,54 +39,27 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere ARG 2 line ARG 3 color METHOD method_23819 removeOutdatedHives ()V - METHOD method_23820 drawPath (Lnet/minecraft/class_4703$class_4704;)V - ARG 1 bee + METHOD method_23820 drawPath (Lnet/minecraft/class_4703$class_5243;)V METHOD method_23821 drawHiveInfo (Lnet/minecraft/class_4703$class_4705;Ljava/util/Collection;)V ARG 1 hive ARG 2 blacklistingBees 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_4704;)V - ARG 1 bee + METHOD method_23824 drawBee (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_23827 isTargeted (Lnet/minecraft/class_4703$class_4704;)Z - ARG 1 bee + METHOD method_23827 isTargeted (Lnet/minecraft/class_4703$class_5243;)Z METHOD method_23828 getCameraPos ()Lnet/minecraft/class_4184; - METHOD method_23829 isInRange (Lnet/minecraft/class_4703$class_4704;)Z - ARG 1 bee + METHOD method_23829 isInRange (Lnet/minecraft/class_4703$class_5243;)Z METHOD method_23830 getBeesByHive ()Ljava/util/Map; METHOD method_23832 updateTargetedEntity ()V METHOD method_23952 removeInvalidBees ()V - METHOD method_24081 addToMap (Ljava/util/Map;Lnet/minecraft/class_4703$class_4704;Lnet/minecraft/class_2338;)V + METHOD method_24081 addToMap (Ljava/util/Map;Lnet/minecraft/class_4703$class_5243;Lnet/minecraft/class_2338;)V ARG 0 map - ARG 1 arg ARG 2 pos METHOD method_24084 getBlacklistingBees ()Ljava/util/Map; - CLASS class_4704 Bee - FIELD field_21536 uuid Ljava/util/UUID; - FIELD field_21537 id I - FIELD field_21538 pos Lnet/minecraft/class_2374; - FIELD field_21539 path Lnet/minecraft/class_11; - FIELD field_21540 hivePos Lnet/minecraft/class_2338; - FIELD field_21541 flowerPos Lnet/minecraft/class_2338; - FIELD field_21733 travellingTicks I - FIELD field_21734 blacklistedHives Ljava/util/Set; - METHOD (Ljava/util/UUID;ILnet/minecraft/class_2374;Lnet/minecraft/class_11;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)V - ARG 1 uuid - ARG 2 id - ARG 3 pos - ARG 4 path - ARG 5 hivePos - ARG 6 flowerPos - ARG 7 travellingTicks - METHOD method_23833 getUuid ()Ljava/util/UUID; - METHOD method_23834 isHive (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_23835 getName ()Ljava/lang/String; - METHOD method_23836 hasFlower ()Z CLASS class_4705 Hive FIELD field_21543 pos Lnet/minecraft/class_2338; FIELD field_21545 beeCount I diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 995fa9e944..8a8342f666 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -18,9 +18,8 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer COMMENT COMMENT

Checks for a custom nametag on living entities, and for teams/team visibilities for players.

ARG 1 entity - METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Ljava/lang/String;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity - ARG 2 label ARG 3 matrices ARG 4 vertexConsumers ARG 5 light diff --git a/mappings/net/minecraft/client/sound/MusicTracker.mapping b/mappings/net/minecraft/client/sound/MusicTracker.mapping index 22976f9058..12b1c62744 100644 --- a/mappings/net/minecraft/client/sound/MusicTracker.mapping +++ b/mappings/net/minecraft/client/sound/MusicTracker.mapping @@ -6,23 +6,8 @@ CLASS net/minecraft/class_1142 net/minecraft/client/sound/MusicTracker METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_18669 tick ()V - METHOD method_4858 play (Lnet/minecraft/class_1142$class_1143;)V + METHOD method_4858 play (Lnet/minecraft/class_5195;)V ARG 1 type METHOD method_4859 stop ()V - METHOD method_4860 isPlayingType (Lnet/minecraft/class_1142$class_1143;)Z + METHOD method_4860 isPlayingType (Lnet/minecraft/class_5195;)Z ARG 1 type - CLASS class_1143 MusicType - FIELD field_5577 sound Lnet/minecraft/class_3414; - FIELD field_5584 maxDelay I - FIELD field_5587 minDelay I - METHOD (Ljava/lang/String;ILnet/minecraft/class_3414;II)V - ARG 3 soundEvent - ARG 4 minDelay - ARG 5 maxDelay - METHOD (Ljava/lang/String;ILnet/minecraft/class_3414;IIZ)V - ARG 3 soundEvent - ARG 4 minDelay - ARG 5 maxDelay - METHOD method_4861 getSound ()Lnet/minecraft/class_3414; - METHOD method_4862 getMaxDelay ()I - METHOD method_4863 getMinDelay ()I diff --git a/mappings/net/minecraft/client/sound/MusicType.mapping b/mappings/net/minecraft/client/sound/MusicType.mapping new file mode 100644 index 0000000000..790bcc5b81 --- /dev/null +++ b/mappings/net/minecraft/client/sound/MusicType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1143 net/minecraft/client/sound/MusicType diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping index 03b39ae9c8..bf2b4c7680 100644 --- a/mappings/net/minecraft/client/toast/Toast.mapping +++ b/mappings/net/minecraft/client/toast/Toast.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_368 net/minecraft/client/toast/Toast FIELD field_2207 TOASTS_TEX Lnet/minecraft/class_2960; - METHOD method_1986 draw (Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369; - ARG 1 manager - ARG 2 currentTime + METHOD method_1986 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369; METHOD method_1987 getType ()Ljava/lang/Object; CLASS class_369 Visibility FIELD field_2211 sound Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping index 9a687796cd..3645946450 100644 --- a/mappings/net/minecraft/client/toast/ToastManager.mapping +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1995 getGame ()Lnet/minecraft/class_310; - METHOD method_1996 draw ()V + METHOD method_1996 draw (Lnet/minecraft/class_4587;)V METHOD method_1997 getToast (Ljava/lang/Class;Ljava/lang/Object;)Lnet/minecraft/class_368; ARG 1 toastClass ARG 2 type @@ -17,7 +17,7 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager METHOD (Lnet/minecraft/class_374;Lnet/minecraft/class_368;)V ARG 1 instance METHOD method_2001 getInstance ()Lnet/minecraft/class_368; - METHOD method_2002 draw (II)Z + METHOD method_2002 draw (IILnet/minecraft/class_4587;)Z ARG 1 x ARG 2 y METHOD method_2003 getDissapearProgress (J)F diff --git a/mappings/net/minecraft/client/toast/TutorialToast.mapping b/mappings/net/minecraft/client/toast/TutorialToast.mapping index 7454e98d51..b5b580a34d 100644 --- a/mappings/net/minecraft/client/toast/TutorialToast.mapping +++ b/mappings/net/minecraft/client/toast/TutorialToast.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_372 net/minecraft/client/toast/TutorialToast FIELD field_2222 hasProgressBar Z FIELD field_2223 lastTime J - FIELD field_2224 title Ljava/lang/String; + FIELD field_2224 title Lnet/minecraft/class_2561; FIELD field_2225 type Lnet/minecraft/class_372$class_373; - FIELD field_2226 description Ljava/lang/String; + FIELD field_2226 description Lnet/minecraft/class_2561; FIELD field_2227 visibility Lnet/minecraft/class_368$class_369; FIELD field_2228 progress F FIELD field_2229 lastProgress F @@ -20,6 +20,4 @@ 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_332;II)V - ARG 2 x - ARG 3 y + METHOD method_1994 drawIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;II)V diff --git a/mappings/net/minecraft/client/util/InputUtil.mapping b/mappings/net/minecraft/client/util/InputUtil.mapping index 0be032ec77..7d0b6f63db 100644 --- a/mappings/net/minecraft/client/util/InputUtil.mapping +++ b/mappings/net/minecraft/client/util/InputUtil.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil FIELD field_20334 GLFW_RAW_MOUSE_MOTION I METHOD method_15981 fromName (Ljava/lang/String;)Lnet/minecraft/class_3675$class_306; ARG 0 s - METHOD method_15982 getScancodeName (I)Ljava/lang/String; METHOD method_15983 setMouseCallbacks (JLorg/lwjgl/glfw/GLFWCursorPosCallbackI;Lorg/lwjgl/glfw/GLFWMouseButtonCallbackI;Lorg/lwjgl/glfw/GLFWScrollCallbackI;)V ARG 0 handle METHOD method_15984 setCursorParameters (JIDD)V @@ -13,7 +12,6 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil ARG 0 handle METHOD method_15987 isKeyPressed (JI)Z ARG 0 handle - METHOD method_15988 getKeycodeName (I)Ljava/lang/String; METHOD method_21735 isRawMouseMotionSupported ()Z METHOD method_21736 setRawMouseMotionMode (JZ)V ARG 0 window @@ -32,7 +30,6 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil METHOD method_1442 getCategory ()Lnet/minecraft/class_3675$class_307; METHOD method_1444 getKeyCode ()I CLASS class_307 Type - FIELD field_1669 mouseButtons [Ljava/lang/String; FIELD field_1673 name Ljava/lang/String; FIELD field_1674 map Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_1446 mapKey (Lnet/minecraft/class_3675$class_307;Ljava/lang/String;I)V @@ -40,4 +37,3 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil ARG 1 name ARG 2 keyCode METHOD method_1447 createFromCode (I)Lnet/minecraft/class_3675$class_306; - METHOD method_15989 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping index 1da004bd3d..d42f9753f5 100644 --- a/mappings/net/minecraft/client/util/SelectionManager.mapping +++ b/mappings/net/minecraft/client/util/SelectionManager.mapping @@ -1,20 +1,12 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager FIELD field_16452 selectionEnd I FIELD field_16453 selectionStart I - FIELD field_16454 client Lnet/minecraft/class_310; - FIELD field_16455 maxLength I FIELD field_16456 stringGetter Ljava/util/function/Supplier; - FIELD field_16457 fontRenderer Lnet/minecraft/class_327; FIELD field_16458 stringSetter Ljava/util/function/Consumer; - METHOD (Lnet/minecraft/class_310;Ljava/util/function/Supplier;Ljava/util/function/Consumer;I)V - ARG 1 client - ARG 2 getter - ARG 3 setter - ARG 4 maxLength METHOD method_16197 insert (Ljava/lang/String;)V - METHOD method_16198 deleteSelectedText ()V + METHOD method_16198 deleteSelectedText (Ljava/lang/String;)Ljava/lang/String; METHOD method_16199 insert (C)Z - METHOD method_16200 getSelectedText ()Ljava/lang/String; + METHOD method_16200 getSelectedText (Ljava/lang/String;)Ljava/lang/String; METHOD method_16201 getSelectionStart ()I METHOD method_16202 handleSpecialKey (I)Z ARG 1 keyCode diff --git a/mappings/net/minecraft/client/util/Texts.mapping b/mappings/net/minecraft/client/util/Texts.mapping index 17068f72c5..9039b23cba 100644 --- a/mappings/net/minecraft/client/util/Texts.mapping +++ b/mappings/net/minecraft/client/util/Texts.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_341 net/minecraft/client/util/Texts - METHOD method_1849 getRenderChatMessage (Ljava/lang/String;Z)Ljava/lang/String; + METHOD method_1849 getRenderChatMessage (Ljava/lang/String;)Ljava/lang/String; ARG 0 string - ARG 1 forceColor - METHOD method_1850 wrapLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_327;ZZ)Ljava/util/List; + METHOD method_1850 wrapLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_327;)Ljava/util/List; ARG 0 text ARG 1 width ARG 2 textRenderer - ARG 4 forceColor diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 7dbd37e6fb..4fc8b8156b 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_3727 netHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; - METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_1940;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;)V + METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_5217;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;)V ARG 2 levelInfo ARG 4 chunkLoadDistance METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping index 51e9210695..44d48302a2 100644 --- a/mappings/net/minecraft/command/EntitySelector.mapping +++ b/mappings/net/minecraft/command/EntitySelector.mapping @@ -37,5 +37,5 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector METHOD method_9819 includesNonPlayers ()Z METHOD method_9820 isSenderOnly ()Z METHOD method_9821 isLocalWorldOnly ()Z - METHOD method_9822 getNames (Ljava/util/List;)Lnet/minecraft/class_2561; + METHOD method_9822 getNames (Ljava/util/List;)Lnet/minecraft/class_5250; METHOD method_9823 appendEntitiesFromWorld (Ljava/util/List;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Ljava/util/function/Predicate;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 64aaa0bb36..6a99f7b99f 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -313,7 +313,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 hand METHOD method_5665 setCustomName (Lnet/minecraft/class_2561;)V ARG 1 name - METHOD method_5666 attemptSprintingParticles ()V METHOD method_5667 getUuid ()Ljava/util/UUID; METHOD method_5668 getRootVehicle ()Lnet/minecraft/class_1297; COMMENT Gets the lowest entity this entity is riding. @@ -628,7 +627,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5854 getVehicle ()Lnet/minecraft/class_1297; METHOD method_5855 setAir (I)V ARG 1 air - METHOD method_5856 removeClickEvents (Lnet/minecraft/class_2561;)V + METHOD method_5856 removeClickEvents (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 textComponent METHOD method_5857 setBoundingBox (Lnet/minecraft/class_238;)V ARG 1 boundingBox @@ -662,7 +661,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 cursorDeltaX ARG 3 cursorDeltaY METHOD method_5873 startRiding (Lnet/minecraft/class_1297;Z)Z - ARG 1 entity ARG 2 force METHOD method_5874 onKilledOther (Lnet/minecraft/class_1309;)V ARG 1 other diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index b2469c5aba..23e3a76830 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_6094 category 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;ZZZZIILnet/minecraft/class_4048;)V + METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZIILnet/minecraft/class_4048;II)V ARG 1 factory ARG 2 category ARG 3 saveable diff --git a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping index 260de15249..e4208ee445 100644 --- a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_3002 net/minecraft/entity/boss/CommandBossBar ARG 1 maxValue METHOD method_12957 onPlayerConnect (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_12958 (Lnet/minecraft/class_2583;)V + METHOD method_12958 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_12959 getId ()Lnet/minecraft/class_2960; METHOD method_12960 getMaxValue ()I diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 16a94361cb..2d53ed273b 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -43,11 +43,6 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity FIELD field_6854 type I METHOD (I)V ARG 1 type - CLASS class_1467 RabbitJumpControl - FIELD field_6855 rabbit Lnet/minecraft/class_1463; - METHOD (Lnet/minecraft/class_1463;Lnet/minecraft/class_1463;)V - ARG 2 owner - METHOD method_6624 isActive ()Z CLASS class_1468 RabbitMoveControl FIELD field_6859 rabbit Lnet/minecraft/class_1463; METHOD (Lnet/minecraft/class_1463;)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index a788bec983..9448cd1ef6 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -142,7 +142,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7297 getSleepTimer ()I METHOD method_7298 addShoulderEntity (Lnet/minecraft/class_2487;)Z ARG 1 tag - METHOD method_7299 addTellClickEvent (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + METHOD method_7299 addTellClickEvent (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 component METHOD method_7302 getReducedDebugInfo ()Z METHOD method_7303 openStructureBlockScreen (Lnet/minecraft/class_2633;)V diff --git a/mappings/net/minecraft/item/BannerPatternItem.mapping b/mappings/net/minecraft/item/BannerPatternItem.mapping index 260a0a3ff7..21894b64cb 100644 --- a/mappings/net/minecraft/item/BannerPatternItem.mapping +++ b/mappings/net/minecraft/item/BannerPatternItem.mapping @@ -3,5 +3,5 @@ CLASS net/minecraft/class_1745 net/minecraft/item/BannerPatternItem METHOD (Lnet/minecraft/class_2582;Lnet/minecraft/class_1792$class_1793;)V ARG 1 pattern ARG 2 settings - METHOD method_7703 getDescription ()Lnet/minecraft/class_2561; + METHOD method_7703 getDescription ()Lnet/minecraft/class_5250; METHOD method_7704 getPattern ()Lnet/minecraft/class_2582; diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index de5314257e..22fbf1fa6e 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem METHOD method_26362 getAngleToPos (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)D ARG 0 pos ARG 1 entity - METHOD method_26363 hasLodestone (Lnet/minecraft/class_2487;)Z - ARG 0 tag METHOD method_26364 getLodestoneDimension (Lnet/minecraft/class_2487;)Ljava/util/Optional; ARG 0 tag METHOD method_26365 hasLodestone (Lnet/minecraft/class_1799;)Z @@ -22,7 +20,4 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem FIELD field_23980 value D FIELD field_23981 speed D FIELD field_23982 lastUpdateTime J - METHOD method_27188 get ()D - METHOD method_27190 update (Lnet/minecraft/class_1937;D)V - ARG 1 world - ARG 2 target + METHOD method_27190 update (JD)V diff --git a/mappings/net/minecraft/item/FireworkChargeItem.mapping b/mappings/net/minecraft/item/FireworkChargeItem.mapping index 1b5e78218e..8c1d6eb667 100644 --- a/mappings/net/minecraft/item/FireworkChargeItem.mapping +++ b/mappings/net/minecraft/item/FireworkChargeItem.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_1780 net/minecraft/item/FireworkChargeItem ARG 1 tooltip METHOD method_7810 getColorText (I)Lnet/minecraft/class_2561; ARG 0 color - METHOD method_7811 appendColors (Lnet/minecraft/class_2561;[I)Lnet/minecraft/class_2561; + METHOD method_7811 appendColors (Lnet/minecraft/class_5250;[I)Lnet/minecraft/class_2561; ARG 0 line ARG 1 colors diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 6ce60a9731..2a44901be4 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_8038 item Lnet/minecraft/class_1792; FIELD field_8039 lastDestroyPos Lnet/minecraft/class_2694; FIELD field_8040 tag Lnet/minecraft/class_2487; - FIELD field_8041 frame Lnet/minecraft/class_1533; METHOD (Lnet/minecraft/class_1935;)V ARG 1 item METHOD (Lnet/minecraft/class_1935;I)V @@ -92,8 +91,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7941 getSubTag (Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 1 key METHOD method_7942 hasEnchantments ()Z - METHOD method_7943 setFrame (Lnet/minecraft/class_1533;)V - ARG 1 frame METHOD method_7944 canPlaceOn (Lnet/minecraft/class_3505;Lnet/minecraft/class_2694;)Z ARG 1 manager ARG 2 pos @@ -118,7 +115,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7953 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag METHOD method_7954 toHoverableText ()Lnet/minecraft/class_2561; - METHOD method_7955 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + METHOD method_7955 (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 0 text METHOD method_7956 damage (ILnet/minecraft/class_1309;Ljava/util/function/Consumer;)V ARG 1 amount @@ -136,7 +133,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7963 isDamageable ()Z METHOD method_7964 getName ()Lnet/minecraft/class_2561; METHOD method_7965 getCooldown ()I - METHOD method_7966 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2583;)V + METHOD method_7966 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_7967 isUsedOnRelease ()Z METHOD method_7968 isEqual (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/item/MusicDiscItem.mapping b/mappings/net/minecraft/item/MusicDiscItem.mapping index d4b2799524..b71889bde3 100644 --- a/mappings/net/minecraft/item/MusicDiscItem.mapping +++ b/mappings/net/minecraft/item/MusicDiscItem.mapping @@ -8,6 +8,6 @@ CLASS net/minecraft/class_1813 net/minecraft/item/MusicDiscItem ARG 3 settings METHOD method_8009 getSound ()Lnet/minecraft/class_3414; METHOD method_8010 getComparatorOutput ()I - METHOD method_8011 getDescription ()Lnet/minecraft/class_2561; + METHOD method_8011 getDescription ()Lnet/minecraft/class_5250; METHOD method_8012 bySound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_1813; ARG 0 sound diff --git a/mappings/net/minecraft/realms/RealmsLabel.mapping b/mappings/net/minecraft/realms/RealmsLabel.mapping index f95a071683..b3f4cfb8a2 100644 --- a/mappings/net/minecraft/realms/RealmsLabel.mapping +++ b/mappings/net/minecraft/realms/RealmsLabel.mapping @@ -1,13 +1,12 @@ CLASS net/minecraft/class_4903 net/minecraft/realms/RealmsLabel - FIELD field_22819 text Ljava/lang/String; + FIELD field_22819 text Lnet/minecraft/class_2561; FIELD field_22820 x I FIELD field_22821 y I FIELD field_22822 color I - METHOD (Ljava/lang/String;III)V - ARG 1 text + METHOD (Lnet/minecraft/class_2561;III)V ARG 2 x ARG 3 y ARG 4 color METHOD method_25487 getText ()Ljava/lang/String; - METHOD method_25488 render (Lnet/minecraft/class_437;)V + METHOD method_25488 render (Lnet/minecraft/class_437;Lnet/minecraft/class_4587;)V ARG 1 screen diff --git a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping index a7e163ae3f..a237409772 100644 --- a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping +++ b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_270 net/minecraft/scoreboard/AbstractTeam METHOD method_1197 getName ()Ljava/lang/String; - METHOD method_1198 modifyText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + METHOD method_1198 modifyText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; METHOD method_1199 shouldShowFriendlyInvisibles ()Z METHOD method_1200 getDeathMessageVisibilityRule ()Lnet/minecraft/class_270$class_272; METHOD method_1201 getNameTagVisibilityRule ()Lnet/minecraft/class_270$class_272; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping index ec323c8947..b435774922 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_266 net/minecraft/scoreboard/ScoreboardObjective ARG 2 name ARG 3 criterion ARG 4 displayName - ARG 5 renderType METHOD method_1113 getName ()Ljava/lang/String; METHOD method_1114 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_1115 setRenderType (Lnet/minecraft/class_274$class_275;)V @@ -17,7 +16,7 @@ CLASS net/minecraft/class_266 net/minecraft/scoreboard/ScoreboardObjective METHOD method_1116 getCriterion ()Lnet/minecraft/class_274; METHOD method_1117 getScoreboard ()Lnet/minecraft/class_269; METHOD method_1118 getRenderType ()Lnet/minecraft/class_274$class_275; - METHOD method_1119 (Lnet/minecraft/class_2583;)V + METHOD method_1119 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_1120 toHoverableText ()Lnet/minecraft/class_2561; METHOD method_1121 setDisplayName (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/scoreboard/Team.mapping b/mappings/net/minecraft/scoreboard/Team.mapping index a6b2a2dd67..31776b2356 100644 --- a/mappings/net/minecraft/scoreboard/Team.mapping +++ b/mappings/net/minecraft/scoreboard/Team.mapping @@ -24,12 +24,12 @@ CLASS net/minecraft/class_268 net/minecraft/scoreboard/Team METHOD method_1140 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_1141 setColor (Lnet/minecraft/class_124;)V ARG 1 color - METHOD method_1142 modifyText (Lnet/minecraft/class_270;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + METHOD method_1142 modifyText (Lnet/minecraft/class_270;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; METHOD method_1143 setShowFriendlyInvisibles (Z)V ARG 1 showFriendlyInvisible METHOD method_1144 getPrefix ()Lnet/minecraft/class_2561; METHOD method_1145 setCollisionRule (Lnet/minecraft/class_270$class_271;)V METHOD method_1146 setFriendlyFlagsBitwise (I)V METHOD method_1147 getFriendlyFlagsBitwise ()I - METHOD method_1148 getFormattedName ()Lnet/minecraft/class_2561; + METHOD method_1148 getFormattedName ()Lnet/minecraft/class_5250; METHOD method_1149 setNameTagVisibilityRule (Lnet/minecraft/class_270$class_272;)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 10c00eb058..15409eb3f2 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_17439 worldGenerationProgressListenerFactory Lnet/minecraft/class_3950; FIELD field_17601 serverId Ljava/lang/String; FIELD field_17704 DEMO_LEVEL_INFO Lnet/minecraft/class_1940; - FIELD field_19237 eraseCache Z FIELD field_19249 waitingForNextTick Z FIELD field_20279 COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; @@ -37,13 +36,10 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4566 recipeManager Lnet/minecraft/class_1863; FIELD field_4567 advancementLoader Lnet/minecraft/class_2989; FIELD field_4568 serverGuiTickables Ljava/util/List; - FIELD field_4569 bonusChest Z FIELD field_4570 enforceWhitelist Z FIELD field_4571 timeReference J FIELD field_4572 ticks I FIELD field_4573 lastTickLengths [J - FIELD field_4574 displayName Ljava/lang/String; - FIELD field_4575 spawnAnimals Z FIELD field_4576 dataManager Lnet/minecraft/class_3296; FIELD field_4577 iconFilePresent Z FIELD field_4578 userName Ljava/lang/String; @@ -53,11 +49,9 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4583 tagManager Lnet/minecraft/class_3505; FIELD field_4584 resourcePackHash Ljava/lang/String; FIELD field_4585 serverIp Ljava/lang/String; - FIELD field_4586 forceWorldUpgrade Z FIELD field_4587 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_4588 USER_CACHE_FILE Ljava/io/File; FIELD field_4589 worlds Ljava/util/Map; - FIELD field_4590 spawnNpcs Z FIELD field_4591 commandFunctionManager Lnet/minecraft/class_2991; FIELD field_4592 tickTime F FIELD field_4593 metadata Lnet/minecraft/class_2926; @@ -65,7 +59,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4596 playerIdleTimeout I FIELD field_4597 profilerStartQueued Z FIELD field_4599 proxy Ljava/net/Proxy; - FIELD field_4601 loadingStage Lnet/minecraft/class_2561; FIELD field_4602 random Ljava/util/Random; FIELD field_4603 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_4604 pvpEnabled Z @@ -81,7 +74,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 serverId METHOD method_17976 initScoreboard (Lnet/minecraft/class_26;)V ARG 1 persistentStateManager - METHOD method_17977 setToDebugWorldProperties (Lnet/minecraft/class_31;)V + METHOD method_17977 setToDebugWorldProperties (Lnet/minecraft/class_5219;)V ARG 1 properties METHOD method_19465 sendDifficulty (Lnet/minecraft/class_3222;)V ARG 1 player @@ -89,8 +82,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 profile METHOD method_19467 setDifficultyLocked (Z)V ARG 1 locked - METHOD method_20383 setEraseCache (Z)V - ARG 1 eraseCache METHOD method_21613 dump (Ljava/nio/file/Path;)V ARG 1 path METHOD method_21614 dumpExampleCrash (Ljava/nio/file/Path;)V @@ -113,11 +104,9 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3717 start ()V METHOD method_3718 isFlightEnabled ()Z METHOD method_3719 getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; - METHOD method_3722 getDefaultDifficulty ()Lnet/minecraft/class_1267; METHOD method_3723 save (ZZZ)Z METHOD method_3724 isSinglePlayer ()Z METHOD method_3725 getIconFile ()Ljava/io/File; - METHOD method_3726 getServerName ()Ljava/lang/String; METHOD method_3727 hasGui ()Z METHOD method_3728 kickNonWhitelistedPlayers (Lnet/minecraft/class_2168;)V ARG 1 source @@ -128,7 +117,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 whitelistEnabled METHOD method_3732 shouldBroadcastRconToOps ()Z METHOD method_3734 getCommandManager ()Lnet/minecraft/class_2170; - METHOD method_3735 loadWorld (Ljava/lang/String;JLnet/minecraft/class_4952;)V + METHOD method_3735 loadWorld ()V METHOD method_3736 shouldSpawnNpcs ()Z METHOD method_3738 getWorlds ()Ljava/lang/Iterable; METHOD method_3739 getCommandSource ()Lnet/minecraft/class_2168; @@ -144,7 +133,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 shouldKeepTicking METHOD method_3749 getMaxWorldBorderRadius ()I METHOD method_3750 isStopped ()Z - METHOD method_3752 reloadDataPacks (Lnet/minecraft/class_31;)V + METHOD method_3752 reloadDataPacks ()V METHOD method_3754 isHardcore ()Z METHOD method_3756 getServerPort ()I METHOD method_3758 getFile (Ljava/lang/String;)Ljava/io/File; @@ -159,18 +148,12 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 preventProxyConnections METHOD method_3765 getServerMetadata ()Lnet/minecraft/class_2926; METHOD method_3767 getGameRules ()Lnet/minecraft/class_1928; - METHOD method_3768 setLoadingStage (Lnet/minecraft/class_2561;)V - ARG 1 loadingStage - METHOD method_3769 setSpawnNpcs (Z)V - ARG 1 spawnNpcs METHOD method_3771 hasIconFile ()Z METHOD method_3772 getRecipeManager ()Lnet/minecraft/class_1863; METHOD method_3773 getNetworkCompressionThreshold ()I METHOD method_3774 prepareStartRegion (Lnet/minecraft/class_3949;)V METHOD method_3775 shouldPreventProxyConnections ()Z METHOD method_3776 setDifficulty (Lnet/minecraft/class_1267;Z)V - METHOD method_3778 setBonusChest (Z)V - ARG 1 bonusChest METHOD method_3779 setServerPort (I)V ARG 1 serverPort METHOD method_3780 getTicks ()I @@ -181,26 +164,20 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 world ARG 2 pos ARG 3 player - METHOD method_3786 createWorlds (Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_1940;Lnet/minecraft/class_3949;)V - ARG 2 properties + METHOD method_3786 createWorlds (Lnet/minecraft/class_3949;)V METHOD method_3787 getNetworkIo ()Lnet/minecraft/class_3242; METHOD method_3788 getCurrentPlayerCount ()I METHOD method_3790 getDefaultGameMode ()Lnet/minecraft/class_1934; METHOD method_3791 setFavicon (Lnet/minecraft/class_2926;)V ARG 1 metadata - METHOD method_3792 shouldGenerateStructures ()Z METHOD method_3793 getUserCache ()Lnet/minecraft/class_3312; METHOD method_3794 setForceGameMode (Z)V ARG 1 forceGameMode METHOD method_3795 getSnooper ()Lnet/minecraft/class_1276; METHOD method_3796 shouldSpawnAnimals ()Z - METHOD method_3797 setForceWorldUpgrade (Z)V - ARG 1 forceWorldUpgrade METHOD method_3798 getOpPermissionLevel ()I METHOD method_3799 isDemo ()Z - METHOD method_3800 loadWorldDataPacks (Ljava/io/File;Lnet/minecraft/class_31;)V - ARG 1 worldDir - ARG 2 properties + METHOD method_3800 loadWorldDataPacks ()V METHOD method_3801 getTagManager ()Lnet/minecraft/class_3505; METHOD method_3802 getMaxPlayerCount ()I METHOD method_3803 setPlayerIdleTimeout (I)V @@ -215,8 +192,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3815 setPvpEnabled (Z)V ARG 1 pvpEnabled METHOD method_3816 isDedicated ()Z - METHOD method_3817 setUserName (Ljava/lang/String;)V - ARG 1 userName METHOD method_3818 getServerMotd ()Ljava/lang/String; METHOD method_3819 getServerIp ()Ljava/lang/String; METHOD method_3820 isLoading ()Z @@ -240,8 +215,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3838 setDefaultGameMode (Lnet/minecraft/class_1934;)V ARG 1 gameMode METHOD method_3839 isNetherAllowed ()Z - METHOD method_3840 setSpawnAnimals (Z)V - ARG 1 spawnAnimals METHOD method_3841 getSpawnProtectionRadius ()I METHOD method_3842 setServerIp (Ljava/lang/String;)V ARG 1 serverIp @@ -268,9 +241,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3858 getPlayerNames ()[Ljava/lang/String; METHOD method_3859 populateCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; METHOD method_3860 isRemote ()Z - METHOD method_3861 loadWorldResourcePack (Ljava/lang/String;Lnet/minecraft/class_29;)V - ARG 1 worldName - ARG 2 worldSaveHandler + METHOD method_3861 loadWorldResourcePack ()V METHOD method_3862 getPlayerIdleTimeout ()I METHOD method_3864 setOnlineMode (Z)V ARG 1 onlineMode diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index bbf6e72ebc..98cff67299 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -14,16 +14,15 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_14355 BANNED_PLAYERS_FILE Ljava/io/File; FIELD field_14356 DATE_FORMATTER Ljava/text/SimpleDateFormat; FIELD field_14357 latencyUpdateTimer I - FIELD field_14358 saveHandler Lnet/minecraft/class_35; + FIELD field_14358 saveHandler Lnet/minecraft/class_29; FIELD field_14359 viewDistance I FIELD field_14360 server Lnet/minecraft/server/MinecraftServer; FIELD field_14361 whitelist Lnet/minecraft/class_3337; FIELD field_14362 statisticsMap Ljava/util/Map; FIELD field_14363 gameMode Lnet/minecraft/class_1934; FIELD field_14364 BANNED_IPS_FILE Ljava/io/File; - METHOD (Lnet/minecraft/server/MinecraftServer;I)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_29;I)V ARG 1 server - ARG 2 maxPlayers METHOD method_14556 respawnPlayer (Lnet/minecraft/class_3222;Z)Lnet/minecraft/class_3222; ARG 1 player METHOD method_14557 setWhitelistEnabled (Z)V diff --git a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping index 67568af407..246e222fc2 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_3174 net/minecraft/server/dedicated/DedicatedPlayerManager FIELD field_13804 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_3176;)V - ARG 1 server METHOD method_13930 saveUserBanList ()V METHOD method_13931 loadIpBanList ()V METHOD method_13932 saveIpBanList ()V diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 49932d18c9..6eda4176c4 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicatedServer FIELD field_13810 SHA1_PATTERN Ljava/util/regex/Pattern; FIELD field_13811 rconCommandOutput Lnet/minecraft/class_3350; - FIELD field_13813 defaultGameMode Lnet/minecraft/class_1934; FIELD field_13814 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13815 commandQueue Ljava/util/List; FIELD field_13816 queryResponseHandler Lnet/minecraft/class_3364; diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 706708926d..92360835e3 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -4,11 +4,8 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer FIELD field_5520 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5521 localPlayerUuid Ljava/util/UUID; FIELD field_5522 lanPort I - FIELD field_5523 levelInfo Lnet/minecraft/class_1940; FIELD field_5524 paused Z - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Ljava/lang/String;Lnet/minecraft/class_1940;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5219;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 client - ARG 3 displayName - ARG 4 levelInfo METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V ARG 1 localPlayerUuid diff --git a/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping b/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping index 4fe99f43d0..d1d4c82355 100644 --- a/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping +++ b/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_3202 net/minecraft/server/world/SecondaryServerWorld - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V + METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V ARG 1 world ARG 2 server ARG 3 workerExecutor - ARG 4 worldSaveHandler ARG 5 dimensionType diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 173db3246f..a727a64fb0 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -15,9 +15,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager FIELD field_19335 chunkPosCache [J FIELD field_19336 chunkStatusCache [Lnet/minecraft/class_2806; FIELD field_19337 chunkCache [Lnet/minecraft/class_2791; - METHOD (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IZLnet/minecraft/class_3949;Ljava/util/function/Supplier;)V - ARG 1 world - ARG 2 worldDirectory + METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IZLnet/minecraft/class_3949;Ljava/util/function/Supplier;)V ARG 3 dataFixer ARG 4 structureManager ARG 5 workerExecutor diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 598b5544cf..ece886123c 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_13957 savingDisabled Z FIELD field_13959 server Lnet/minecraft/server/MinecraftServer; FIELD field_13960 entitiesByUuid Ljava/util/Map; - FIELD field_17709 worldSaveHandler Lnet/minecraft/class_29; FIELD field_17913 globalEntities Ljava/util/List; FIELD field_17915 entitiesById Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_18260 entitiesToLoad Ljava/util/Queue; @@ -20,7 +19,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_18264 inEntityTick Z FIELD field_18811 raidManager Lnet/minecraft/class_3767; FIELD field_23787 structureAccessor Lnet/minecraft/class_5138; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5217;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V ARG 1 server ARG 2 workerExecutor ARG 4 properties @@ -73,7 +72,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 11 deltaY ARG 13 deltaZ ARG 15 speed - METHOD method_17982 getSaveHandler ()Lnet/minecraft/class_29; METHOD method_17983 getPersistentStateManager ()Lnet/minecraft/class_26; METHOD method_17984 getForcedChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; METHOD method_17988 setChunkForced (IIZ)Z @@ -154,8 +152,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_23660 wakeSleepingPlayers ()V METHOD method_24500 locateBiome (Lnet/minecraft/class_1959;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; METHOD method_27056 getStructureAccessor ()Lnet/minecraft/class_5138; - METHOD method_8414 init (Lnet/minecraft/class_1940;)V - ARG 1 levelInfo + METHOD method_8414 init (Z)V METHOD method_8416 addLightning (Lnet/minecraft/class_1538;)V METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index e259a8071c..10f59953e3 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -24,8 +24,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_18243 watchDistance I FIELD field_18307 loadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_18808 pointOfInterestStorage Lnet/minecraft/class_4153; - METHOD (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Ljava/util/function/Supplier;IZ)V - ARG 1 world + METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Ljava/util/function/Supplier;IZ)V ARG 3 dataFixer ARG 5 workerExecutor ARG 6 mainThreadExecutor diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index dadd5a0244..22f3aeea8f 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -4,9 +4,8 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager FIELD field_15514 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_15515 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_15516 server Lnet/minecraft/server/MinecraftServer; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V ARG 1 server - ARG 2 worldDir ARG 3 dataFixer METHOD method_15085 getStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index 94492bbe22..59cf2062ad 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -1,23 +1,9 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent - FIELD field_11755 value Lnet/minecraft/class_2561; - FIELD field_11756 action Lnet/minecraft/class_2568$class_2569; - METHOD (Lnet/minecraft/class_2568$class_2569;Lnet/minecraft/class_2561;)V + FIELD field_11755 value Ljava/lang/Object; + FIELD field_11756 action Lnet/minecraft/class_2568$class_5247; + METHOD (Lnet/minecraft/class_2568$class_5247;Ljava/lang/Object;)V ARG 1 action - ARG 2 value METHOD equals (Ljava/lang/Object;)Z ARG 1 obj - METHOD method_10891 getValue ()Lnet/minecraft/class_2561; - METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_2569; - CLASS class_2569 Action - FIELD field_11758 BY_NAME Ljava/util/Map; - FIELD field_11759 userDefinable Z - FIELD field_11763 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;Z)V - ARG 3 name - ARG 4 userDefinable - METHOD method_10893 getName ()Ljava/lang/String; - METHOD method_10894 (Lnet/minecraft/class_2568$class_2569;)Lnet/minecraft/class_2568$class_2569; - ARG 0 a - METHOD method_10895 isUserDefinable ()Z - METHOD method_10896 byName (Ljava/lang/String;)Lnet/minecraft/class_2568$class_2569; - ARG 0 name + METHOD method_10891 getValue (Lnet/minecraft/class_2568$class_5247;)Ljava/lang/Object; + METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_5247; diff --git a/mappings/net/minecraft/text/NbtText.mapping b/mappings/net/minecraft/text/NbtText.mapping index 63febfc325..b6f405a5bd 100644 --- a/mappings/net/minecraft/text/NbtText.mapping +++ b/mappings/net/minecraft/text/NbtText.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText ARG 0 rawPath METHOD method_10920 getPath ()Ljava/lang/String; METHOD method_10921 shouldInterpret ()Z - METHOD method_15880 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + METHOD method_15880 (Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 0 a ARG 1 b CLASS class_2575 BlockNbtText diff --git a/mappings/net/minecraft/text/ParsableText.mapping b/mappings/net/minecraft/text/ParsableText.mapping index 4339ca97ae..61d7968536 100644 --- a/mappings/net/minecraft/text/ParsableText.mapping +++ b/mappings/net/minecraft/text/ParsableText.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2566 net/minecraft/text/ParsableText - METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_2561; + METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250; ARG 1 source ARG 2 sender ARG 3 depth diff --git a/mappings/net/minecraft/text/ScoreText.mapping b/mappings/net/minecraft/text/ScoreText.mapping index 067102500c..9ae4185500 100644 --- a/mappings/net/minecraft/text/ScoreText.mapping +++ b/mappings/net/minecraft/text/ScoreText.mapping @@ -2,13 +2,8 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreText FIELD field_11785 objective Ljava/lang/String; FIELD field_11786 selector Lnet/minecraft/class_2300; FIELD field_11787 name Ljava/lang/String; - FIELD field_11788 score Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 objective - METHOD method_10926 parse (Lnet/minecraft/class_2168;)V - ARG 1 source - METHOD method_10927 setScore (Ljava/lang/String;)V - ARG 1 score METHOD method_10928 getObjective ()Ljava/lang/String; METHOD method_10930 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index eb335d5623..57123869e3 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -2,50 +2,32 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style FIELD field_11851 underline Ljava/lang/Boolean; FIELD field_11852 italic Ljava/lang/Boolean; FIELD field_11853 clickEvent Lnet/minecraft/class_2558; - FIELD field_11854 ROOT Lnet/minecraft/class_2583; - FIELD field_11855 color Lnet/minecraft/class_124; + FIELD field_11855 color Lnet/minecraft/class_5251; FIELD field_11856 bold Ljava/lang/Boolean; FIELD field_11857 strikethrough Ljava/lang/Boolean; FIELD field_11858 hoverEvent Lnet/minecraft/class_2568; FIELD field_11859 insertion Ljava/lang/String; - FIELD field_11860 parent Lnet/minecraft/class_2583; FIELD field_11861 obfuscated Ljava/lang/Boolean; METHOD equals (Ljava/lang/Object;)Z ARG 1 obj - METHOD method_10948 setObfuscated (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; - ARG 1 obfuscated METHOD method_10949 setHoverEvent (Lnet/minecraft/class_2568;)Lnet/minecraft/class_2583; - ARG 1 clickEvent - METHOD method_10953 asString ()Ljava/lang/String; METHOD method_10955 getInsertion ()Ljava/lang/String; METHOD method_10958 setClickEvent (Lnet/minecraft/class_2558;)Lnet/minecraft/class_2583; - ARG 1 clickEvent - METHOD method_10959 setStrikethrough (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; - ARG 1 strikethrough - METHOD method_10960 copy ()Lnet/minecraft/class_2583; METHOD method_10965 isUnderlined ()Z METHOD method_10966 isItalic ()Z METHOD method_10967 isEmpty ()Z - METHOD method_10968 setUnderline (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; - ARG 1 underline METHOD method_10969 getHoverEvent ()Lnet/minecraft/class_2568; METHOD method_10970 getClickEvent ()Lnet/minecraft/class_2558; - METHOD method_10973 getColor ()Lnet/minecraft/class_124; + METHOD method_10973 getColor ()Lnet/minecraft/class_5251; METHOD method_10975 setInsertion (Ljava/lang/String;)Lnet/minecraft/class_2583; - ARG 1 insertion - METHOD method_10976 deepCopy ()Lnet/minecraft/class_2583; METHOD method_10977 setColor (Lnet/minecraft/class_124;)Lnet/minecraft/class_2583; ARG 1 color METHOD method_10978 setItalic (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; - ARG 1 italic METHOD method_10982 setBold (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; ARG 1 bold METHOD method_10984 isBold ()Z - METHOD method_10985 setParent (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; - ARG 1 parent METHOD method_10986 isStrikethrough ()Z METHOD method_10987 isObfuscated ()Z - METHOD method_10989 getParent ()Lnet/minecraft/class_2583; CLASS class_2584 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index ec30d280f4..9d26e94a0c 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -1,29 +1,8 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text - METHOD method_10850 copy ()Lnet/minecraft/class_2561; METHOD method_10851 asString ()Ljava/lang/String; - METHOD method_10852 append (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 1 text - METHOD method_10853 deepCopy ()Lnet/minecraft/class_2561; - METHOD method_10854 formatted (Lnet/minecraft/class_124;)Lnet/minecraft/class_2561; - ARG 1 formatting METHOD method_10855 getSiblings ()Ljava/util/List; - METHOD method_10856 formatted ([Lnet/minecraft/class_124;)Lnet/minecraft/class_2561; - ARG 1 formatting - METHOD method_10857 copyWithoutChildren (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 0 text METHOD method_10858 asTruncatedString (I)Ljava/lang/String; ARG 1 length - METHOD method_10859 styled (Ljava/util/function/Consumer;)Lnet/minecraft/class_2561; - ARG 1 transformer - METHOD method_10860 streamCopied ()Ljava/util/stream/Stream; - METHOD method_10861 (Ljava/lang/StringBuilder;Lnet/minecraft/class_2561;)V - ARG 1 text - METHOD method_10862 setStyle (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2561; - ARG 1 style - METHOD method_10863 asFormattedString ()Ljava/lang/String; - METHOD method_10864 append (Ljava/lang/String;)Lnet/minecraft/class_2561; - ARG 1 text - METHOD method_10865 stream ()Ljava/util/stream/Stream; METHOD method_10866 getStyle ()Lnet/minecraft/class_2583; CLASS class_2562 Serializer FIELD field_11752 JSON_READER_LINE_START Ljava/lang/reflect/Field; @@ -37,17 +16,17 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text ARG 0 text METHOD method_10868 toJsonTree (Lnet/minecraft/class_2561;)Lcom/google/gson/JsonElement; ARG 0 text - METHOD method_10872 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2561; + METHOD method_10872 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_5250; ARG 0 json - METHOD method_10873 fromLenientJson (Ljava/lang/String;)Lnet/minecraft/class_2561; + METHOD method_10873 fromLenientJson (Ljava/lang/String;)Lnet/minecraft/class_5250; ARG 0 json METHOD method_10875 addStyle (Lnet/minecraft/class_2583;Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V ARG 1 style ARG 2 json ARG 3 context - METHOD method_10877 fromJson (Ljava/lang/String;)Lnet/minecraft/class_2561; + METHOD method_10877 fromJson (Ljava/lang/String;)Lnet/minecraft/class_5250; ARG 0 json - METHOD method_10879 fromJson (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2561; + METHOD method_10879 fromJson (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_5250; ARG 0 reader METHOD method_10880 getPosition (Lcom/google/gson/stream/JsonReader;)I ARG 0 reader diff --git a/mappings/net/minecraft/text/Texts.mapping b/mappings/net/minecraft/text/Texts.mapping index cb8f43d017..58db52000e 100644 --- a/mappings/net/minecraft/text/Texts.mapping +++ b/mappings/net/minecraft/text/Texts.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts - METHOD method_10881 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_2561;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_2561; + METHOD method_10881 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_2561;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250; ARG 0 source ARG 1 text ARG 2 sender @@ -8,10 +8,10 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts ARG 0 profile METHOD method_10883 toText (Lcom/mojang/brigadier/Message;)Lnet/minecraft/class_2561; ARG 0 message - METHOD method_10884 join (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_2561; + METHOD method_10884 join (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_5250; ARG 0 elements ARG 1 transformer - METHOD method_10885 bracketed (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + METHOD method_10885 bracketed (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; ARG 0 text METHOD method_10886 (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 string @@ -20,6 +20,6 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts ARG 1 transformer METHOD method_10888 joinOrdered (Ljava/util/Collection;)Lnet/minecraft/class_2561; ARG 0 strings - METHOD method_10889 setStyleIfAbsent (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2561; + METHOD method_10889 setStyleIfAbsent (Lnet/minecraft/class_5250;Lnet/minecraft/class_2583;)Lnet/minecraft/class_5250; ARG 0 text ARG 1 style diff --git a/mappings/net/minecraft/text/TranslatableText.mapping b/mappings/net/minecraft/text/TranslatableText.mapping index d224d67739..ca5f6da828 100644 --- a/mappings/net/minecraft/text/TranslatableText.mapping +++ b/mappings/net/minecraft/text/TranslatableText.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableText FIELD field_11870 EMPTY_LANGUAGE Lnet/minecraft/class_2477; FIELD field_11871 languageReloadTimestamp J FIELD field_11872 ARG_FORMAT Ljava/util/regex/Pattern; - FIELD field_11873 lock Ljava/lang/Object; FIELD field_11874 LANGUAGE Lnet/minecraft/class_2477; FIELD field_11875 args [Ljava/lang/Object; FIELD field_11876 key Ljava/lang/String; diff --git a/mappings/net/minecraft/util/Formatting.mapping b/mappings/net/minecraft/util/Formatting.mapping index 2602906762..3f384df3f3 100644 --- a/mappings/net/minecraft/util/Formatting.mapping +++ b/mappings/net/minecraft/util/Formatting.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/class_124 net/minecraft/util/Formatting ARG 0 name METHOD method_536 getColorIndex ()I METHOD method_537 getName ()Ljava/lang/String; - METHOD method_538 getFormatAtEnd (Ljava/lang/String;)Ljava/lang/String; - ARG 0 string METHOD method_539 strip (Ljava/lang/String;)Ljava/lang/String; ARG 0 string METHOD method_540 getNames (ZZ)Ljava/util/Collection; @@ -46,4 +44,3 @@ CLASS net/minecraft/class_124 net/minecraft/util/Formatting METHOD method_543 isColor ()Z METHOD method_544 byCode (C)Lnet/minecraft/class_124; ARG 0 code - METHOD method_545 affectsGlyphWidth ()Z diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 449fc59b5e..627c705da8 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -47,7 +47,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 first ARG 1 second METHOD method_15357 floor (D)I - METHOD method_15359 roundUp (II)I METHOD method_15360 binarySearch (IILjava/util/function/IntPredicate;)I ARG 0 start ARG 1 end diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index e623b77ca2..9eb94892c7 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion FIELD field_14094 fluidTickScheduler Lnet/minecraft/class_1951; FIELD field_14095 generatorSettings Lnet/minecraft/class_2888; FIELD field_14096 dimension Lnet/minecraft/class_2869; - FIELD field_14097 levelProperties Lnet/minecraft/class_31; + FIELD field_14097 levelProperties Lnet/minecraft/class_5217; FIELD field_14098 chunks Ljava/util/List; FIELD field_14099 blockTickScheduler Lnet/minecraft/class_1951; FIELD field_20668 biomeAccess Lnet/minecraft/class_4543; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index ed0b038703..8f9a009790 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -33,9 +33,8 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_8357 load (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_8358 toNbt ()Lnet/minecraft/class_2487; - METHOD method_8359 register (Ljava/lang/String;Lnet/minecraft/class_1928$class_4314;)Lnet/minecraft/class_1928$class_4313; + METHOD method_8359 register (Ljava/lang/String;Lnet/minecraft/class_1928$class_5198;Lnet/minecraft/class_1928$class_4314;)Lnet/minecraft/class_1928$class_4313; ARG 0 name - ARG 1 type METHOD method_8361 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4310;)V ARG 0 server ARG 1 rule @@ -82,7 +81,7 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules ARG 0 string CLASS class_4313 RuleKey FIELD field_19413 name Ljava/lang/String; - METHOD (Ljava/lang/String;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_1928$class_5198;)V ARG 1 name METHOD equals (Ljava/lang/Object;)Z ARG 1 obj @@ -91,7 +90,7 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules FIELD field_19414 argumentType Ljava/util/function/Supplier; FIELD field_19415 ruleFactory Ljava/util/function/Function; FIELD field_19416 changeCallback Ljava/util/function/BiConsumer; - METHOD (Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/BiConsumer;)V + METHOD (Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/BiConsumer;Lnet/minecraft/class_1928$class_5199;)V ARG 1 argumentType ARG 2 ruleFactory ARG 3 changeCallback diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index f279a38f09..aa85019997 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld METHOD method_8398 getChunkManager ()Lnet/minecraft/class_2802; METHOD method_8400 getSkyAngle (F)F ARG 1 tickDelta - METHOD method_8401 getLevelProperties ()Lnet/minecraft/class_31; + METHOD method_8401 getLevelProperties ()Lnet/minecraft/class_5217; METHOD method_8404 getLocalDifficulty (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1266; ARG 1 pos METHOD method_8405 getFluidTickScheduler ()Lnet/minecraft/class_1951; diff --git a/mappings/net/minecraft/world/PlayerSaveHandler.mapping b/mappings/net/minecraft/world/PlayerSaveHandler.mapping deleted file mode 100644 index 888a8a74ac..0000000000 --- a/mappings/net/minecraft/world/PlayerSaveHandler.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_35 net/minecraft/world/PlayerSaveHandler - METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_2487; - ARG 1 player - METHOD method_262 savePlayerData (Lnet/minecraft/class_1657;)V - ARG 1 player diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 83757286de..fc2ff5ef45 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9226 ambientDarkness I FIELD field_9229 random Ljava/util/Random; FIELD field_9231 blockEntities Ljava/util/List; - FIELD field_9232 properties Lnet/minecraft/class_31; + FIELD field_9232 properties Lnet/minecraft/class_5217; FIELD field_9233 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_9234 thunderGradient F FIELD field_9235 rainGradient F @@ -22,7 +22,7 @@ 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_31;Lnet/minecraft/class_2874;Ljava/util/function/BiFunction;Ljava/util/function/Supplier;Z)V + METHOD (Lnet/minecraft/class_5217;Lnet/minecraft/class_2874;Ljava/util/function/BiFunction;Ljava/util/function/Supplier;Z)V ARG 1 levelProperties ARG 2 dimensionType ARG 3 chunkManagerProvider diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping index 0c08852b09..1b3c177866 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -1,22 +1,7 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler FIELD field_144 playerDataDir Ljava/io/File; - FIELD field_145 worldDir Ljava/io/File; - FIELD field_147 structureManager Lnet/minecraft/class_3485; FIELD field_148 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_149 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_150 worldName Ljava/lang/String; - METHOD (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;Lcom/mojang/datafixers/DataFixer;)V - ARG 1 worldsDirectory - ARG 2 worldName - ARG 3 server - ARG 4 dataFixer - METHOD method_130 getDataFixer ()Lcom/mojang/datafixers/DataFixer; - METHOD method_131 saveWorld (Lnet/minecraft/class_31;Lnet/minecraft/class_2487;)V - ARG 1 levelProperties - ARG 2 tag - METHOD method_132 getWorldDir ()Ljava/io/File; - METHOD method_133 readProperties ()Lnet/minecraft/class_31; - METHOD method_134 getStructureManager ()Lnet/minecraft/class_3485; - METHOD method_136 saveWorld (Lnet/minecraft/class_31;)V - ARG 1 levelProperties + METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_2487; + METHOD method_262 savePlayerData (Lnet/minecraft/class_1657;)V METHOD method_263 getSavedPlayerIds ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 8b528ae749..57e3ab7972 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_21740 getTemperature (Lnet/minecraft/class_2338;)F ARG 1 blockPos METHOD method_24218 calculateSkyColor ()I - METHOD method_24374 getNoiseDistance (Lnet/minecraft/class_1959$class_4762;)F - ARG 1 from METHOD method_24376 getFogColor ()I METHOD method_24377 getEffects ()Lnet/minecraft/class_4763; METHOD method_24378 getParticleConfig ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/world/biome/BiomeEffects.mapping b/mappings/net/minecraft/world/biome/BiomeEffects.mapping index dc80f07b4f..ced6238cdf 100644 --- a/mappings/net/minecraft/world/biome/BiomeEffects.mapping +++ b/mappings/net/minecraft/world/biome/BiomeEffects.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects FIELD field_22491 loopSound Ljava/util/Optional; FIELD field_22492 moodSound Ljava/util/Optional; FIELD field_22493 additionsSound Ljava/util/Optional; - METHOD (IIILjava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + METHOD (IIILjava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 fogColor ARG 2 waterColor ARG 3 waterFogCOlor diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping index ed599ab272..7fa1c5fc56 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures FIELD field_21123 CLAY Lnet/minecraft/class_2680; FIELD field_21124 GRASS_BLOCK Lnet/minecraft/class_2680; FIELD field_21125 MOSSY_COBBLESTONE Lnet/minecraft/class_2680; - FIELD field_21126 OAK_TREE_CONFIG Lnet/minecraft/class_4640; + FIELD field_21126 OAK_TREE_CONFIG Lnet/minecraft/class_4643; FIELD field_21127 LARGE_FERN Lnet/minecraft/class_2680; FIELD field_21128 TALL_GRASS Lnet/minecraft/class_2680; FIELD field_21129 LILAC Lnet/minecraft/class_2680; @@ -78,7 +78,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures FIELD field_21164 DIORITE Lnet/minecraft/class_2680; FIELD field_21165 ANDESITE Lnet/minecraft/class_2680; FIELD field_21166 COAL_ORE Lnet/minecraft/class_2680; - FIELD field_21167 JUNGLE_TREE_CONFIG Lnet/minecraft/class_4640; + FIELD field_21167 JUNGLE_TREE_CONFIG Lnet/minecraft/class_4643; FIELD field_21168 DEAD_BUSH Lnet/minecraft/class_2680; FIELD field_21169 MELON Lnet/minecraft/class_2680; FIELD field_21170 PUMPKIN Lnet/minecraft/class_2680; @@ -94,34 +94,34 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures FIELD field_21180 RED_MUSHROOM_BLOCK Lnet/minecraft/class_2680; FIELD field_21181 BROWN_MUSHROOM_BLOCK Lnet/minecraft/class_2680; FIELD field_21182 MUSHROOM_BLOCK Lnet/minecraft/class_2680; - FIELD field_21183 JUNGLE_SAPLING_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21184 PINE_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21185 SPRUCE_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21186 ACACIA_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21187 BIRCH_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21188 LARGE_BIRCH_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21189 SWAMP_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21190 FANCY_TREE_CONFIG Lnet/minecraft/class_4640; - FIELD field_21191 OAK_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; - FIELD field_21192 FANCY_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; - FIELD field_21193 OAK_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; - FIELD field_21194 FANCY_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; - FIELD field_21195 BIRCH_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4640; + FIELD field_21183 JUNGLE_SAPLING_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21184 PINE_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21185 SPRUCE_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21186 ACACIA_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21187 BIRCH_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21188 LARGE_BIRCH_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21189 SWAMP_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21190 FANCY_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21191 OAK_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4643; + FIELD field_21192 FANCY_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4643; + FIELD field_21193 OAK_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4643; + FIELD field_21194 FANCY_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4643; + FIELD field_21195 BIRCH_TREE_WITH_BEEHIVES_CONFIG Lnet/minecraft/class_4643; FIELD field_21196 JUNGLE_GROUND_BUSH_CONFIG Lnet/minecraft/class_4643; - FIELD field_21197 DARK_OAK_TREE_CONFIG Lnet/minecraft/class_4636; - FIELD field_21198 MEGA_SPRUCE_TREE_CONFIG Lnet/minecraft/class_4636; - FIELD field_21199 MEGA_PINE_TREE_CONFIG Lnet/minecraft/class_4636; - FIELD field_21200 MEGA_JUNGLE_TREE_CONFIG Lnet/minecraft/class_4636; + FIELD field_21197 DARK_OAK_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21198 MEGA_SPRUCE_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21199 MEGA_PINE_TREE_CONFIG Lnet/minecraft/class_4643; + FIELD field_21200 MEGA_JUNGLE_TREE_CONFIG Lnet/minecraft/class_4643; FIELD field_21201 GRASS_CONFIG Lnet/minecraft/class_4638; FIELD field_21202 TAIGA_GRASS_CONFIG Lnet/minecraft/class_4638; FIELD field_21203 LUSH_GRASS_CONFIG Lnet/minecraft/class_4638; FIELD field_21204 LILY_OF_THE_VALLEY_CONFIG Lnet/minecraft/class_4638; FIELD field_21205 BLUE_ORCHID_CONFIG Lnet/minecraft/class_4638; FIELD field_21206 DEFAULT_FLOWER_CONFIG Lnet/minecraft/class_4638; - FIELD field_21833 BIRCH_TREE_WITH_RARE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; - FIELD field_21834 FANCY_TREE_WITH_RARE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; - FIELD field_21835 OAK_TREE_WITH_RARE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; - FIELD field_21836 BIRCH_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4640; + FIELD field_21833 BIRCH_TREE_WITH_RARE_BEEHIVES_CONFIG Lnet/minecraft/class_4643; + FIELD field_21834 FANCY_TREE_WITH_RARE_BEEHIVES_CONFIG Lnet/minecraft/class_4643; + FIELD field_21835 OAK_TREE_WITH_RARE_BEEHIVES_CONFIG Lnet/minecraft/class_4643; + FIELD field_21836 BIRCH_TREE_WITH_MORE_BEEHIVES_CONFIG Lnet/minecraft/class_4643; FIELD field_22048 SOUL_FIRE_CONFIG Lnet/minecraft/class_4638; FIELD field_22049 SOUL_SAND_CRIMSON_ROOTS_CONFIG Lnet/minecraft/class_4638; FIELD field_22050 WATER_FLUID Lnet/minecraft/class_3610; diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index 733ace1eb2..84ed2201d4 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeSource - FIELD field_22078 temperatureNoise Lnet/minecraft/class_3537; - FIELD field_22079 humidityNoise Lnet/minecraft/class_3537; - FIELD field_22080 hillinessNoise Lnet/minecraft/class_3537; - FIELD field_22081 styleNoise Lnet/minecraft/class_3537; + FIELD field_22078 temperatureNoise Lnet/minecraft/class_5216; + FIELD field_22079 humidityNoise Lnet/minecraft/class_5216; + FIELD field_22080 hillinessNoise Lnet/minecraft/class_5216; + FIELD field_22081 styleNoise Lnet/minecraft/class_5216; METHOD (Lnet/minecraft/class_4767;)V ARG 1 config diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceConfig.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceConfig.mapping index fa1fb6cc5c..5b4624db26 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceConfig.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceConfig.mapping @@ -4,12 +4,9 @@ CLASS net/minecraft/class_4767 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_22084 humidityOctaves Lcom/google/common/collect/ImmutableList; FIELD field_22085 hillinessOctaves Lcom/google/common/collect/ImmutableList; FIELD field_22086 styleOctaves Lcom/google/common/collect/ImmutableList; - FIELD field_22087 biomes Ljava/util/Set; METHOD (J)V ARG 1 seed - METHOD method_24403 getBiomes ()Ljava/util/Set; - METHOD method_24404 withBiomes (Ljava/util/Set;)Lnet/minecraft/class_4767; - ARG 1 biomes + METHOD method_24404 withBiomes (Ljava/util/List;)Lnet/minecraft/class_4767; METHOD method_24405 getSeed ()J METHOD method_24406 getTemperatureOctaves ()Lcom/google/common/collect/ImmutableList; METHOD method_24407 getHumidityOctaves ()Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index f1c86fae62..60606b1585 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -58,9 +58,7 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_11983 addListener (Lnet/minecraft/class_2780;)V ARG 1 listener METHOD method_17903 asVoxelShape ()Lnet/minecraft/class_265; - METHOD method_17904 save (Lnet/minecraft/class_31;)V - ARG 1 levelProperties - METHOD method_17905 load (Lnet/minecraft/class_31;)V + METHOD method_17905 load (Lnet/minecraft/class_2784$class_5200;)V ARG 1 levelProperties CLASS class_2785 Area METHOD method_11984 getSize ()D diff --git a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping index 8c8e56c38d..eb4cb9c7cf 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeature - METHOD method_12773 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3341;)V - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 box METHOD method_12774 setBlockStateWithoutUpdatingNeighbors (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos @@ -21,9 +16,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeatu ARG 1 pos METHOD method_16417 (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_16419 isNaturalDirt (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos METHOD method_16420 isAirOrLeaves (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos @@ -32,24 +24,13 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeatu METHOD method_16422 isWater (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_16424 isAir (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos METHOD method_16425 isReplaceablePlant (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos METHOD method_16426 (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_16427 setToDirt (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos METHOD method_16428 (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_16429 (Lnet/minecraft/class_2680;)Z - ARG 0 state - METHOD method_16430 isNaturalDirtOrGrass (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos METHOD method_16431 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_16432 canTreeReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z @@ -65,21 +46,5 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeatu ARG 4 leaves METHOD method_23381 (Lnet/minecraft/class_1936;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4662;)V ARG 6 decorator - METHOD method_23382 setLogBlockState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z - ARG 0 world - ARG 1 random - ARG 2 pos - ARG 3 trunkPositions - ARG 4 box - ARG 5 config - METHOD method_23383 setLeavesBlockState (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Z - ARG 1 world - ARG 2 random - ARG 3 pos - ARG 4 leavesPositions - ARG 5 box - ARG 6 config METHOD method_23384 (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_23385 (Lnet/minecraft/class_2680;)Z - ARG 0 state diff --git a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping deleted file mode 100644 index a129b5ac42..0000000000 --- a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_4626 net/minecraft/world/gen/feature/BranchedTreeFeature - METHOD method_23378 findPositionToGenerate (Lnet/minecraft/class_3747;IILnet/minecraft/class_2338;Lnet/minecraft/class_4640;)Ljava/util/Optional; - ARG 1 world - ARG 2 trunkHeight - ARG 3 baseHeight - ARG 4 pos - ARG 5 config diff --git a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping deleted file mode 100644 index 50cd4aaec4..0000000000 --- a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping +++ /dev/null @@ -1,31 +0,0 @@ -CLASS net/minecraft/class_4640 net/minecraft/world/gen/feature/BranchedTreeFeatureConfig - FIELD field_21259 foliagePlacer Lnet/minecraft/class_4647; - FIELD field_21268 maxFluidDepth I - FIELD field_21269 noVines Z - FIELD field_23750 trunkPlacer Lnet/minecraft/class_5141; - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Ljava/util/List;IZ)V - ARG 1 trunkProvider - ARG 2 leavesProvider - ARG 3 foliagePlacer - ARG 4 trunkPlacer - ARG 5 decorators - ARG 6 heightRandA - ARG 7 noVines - METHOD method_23426 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4640; - ARG 0 data - CLASS class_4641 Builder - FIELD field_21270 foliagePlacer Lnet/minecraft/class_4647; - FIELD field_21271 treeDecorators Ljava/util/List; - FIELD field_21281 maxFluidDepth I - FIELD field_21282 noVines Z - FIELD field_23751 trunkPlacer Lnet/minecraft/class_5141; - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;)V - ARG 1 trunkProvider - ARG 2 leavesProvider - ARG 3 foliagePlacer - ARG 4 trunkPlacer - METHOD method_23427 noVines ()Lnet/minecraft/class_4640$class_4641; - METHOD method_23429 treeDecorators (Ljava/util/List;)Lnet/minecraft/class_4640$class_4641; - ARG 1 treeDecorators - METHOD method_23439 maxFluidDepth (I)Lnet/minecraft/class_4640$class_4641; - ARG 1 maxFluidDepth diff --git a/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping deleted file mode 100644 index 0c92d048de..0000000000 --- a/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_3159 net/minecraft/world/gen/feature/DarkOakTreeFeature - METHOD method_13875 doesTreeFit (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;I)Z - ARG 1 world - ARG 2 pos - ARG 3 treeHeight diff --git a/mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping b/mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping deleted file mode 100644 index 6b7eb4543a..0000000000 --- a/mappings/net/minecraft/world/gen/feature/JungleGroundBushFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3056 net/minecraft/world/gen/feature/JungleGroundBushFeature diff --git a/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping deleted file mode 100644 index dfb8c81c46..0000000000 --- a/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping +++ /dev/null @@ -1,50 +0,0 @@ -CLASS net/minecraft/class_2948 net/minecraft/world/gen/feature/LargeOakTreeFeature - METHOD method_12800 makeBranches (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)V - ARG 1 world - ARG 3 treeHeight - ARG 4 treePosition - ARG 5 branchPositions - ARG 7 box - ARG 8 config - METHOD method_12801 isHighEnough (II)Z - ARG 1 treeHeight - ARG 2 height - METHOD method_12802 makeLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)V - ARG 4 pos - ARG 7 box - ARG 8 config - METHOD method_12803 getTreeHeight (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)I - ARG 1 world - ARG 3 pos - ARG 4 height - ARG 5 logs - ARG 6 box - ARG 7 config - METHOD method_12804 getLeafRadiusForLayer (I)F - METHOD method_12805 getLongestSide (Lnet/minecraft/class_2338;)I - ARG 1 box - METHOD method_12806 makeTrunk (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)V - ARG 1 world - ARG 3 pos - ARG 4 height - ARG 6 box - ARG 7 config - METHOD method_12807 getBaseBranchSize (II)F - ARG 1 treeHeight - ARG 2 branchCount - METHOD method_12808 makeOrCheckBranch (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)I - ARG 1 world - ARG 3 start - ARG 4 end - ARG 5 make - ARG 6 logs - ARG 8 config - METHOD method_12809 getLogAxis (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350$class_2351; - ARG 1 branchStart - ARG 2 branchEnd - CLASS class_2949 BranchPos - FIELD field_13344 endY I - METHOD (Lnet/minecraft/class_2338;I)V - ARG 1 pos - ARG 2 endY - METHOD method_12812 getEndY ()I diff --git a/mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping deleted file mode 100644 index 75546b2da2..0000000000 --- a/mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_3092 net/minecraft/world/gen/feature/MegaJungleTreeFeature - METHOD method_13506 makeLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)V - ARG 1 world - ARG 3 pos - ARG 5 leaves - ARG 6 box - ARG 7 config diff --git a/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping deleted file mode 100644 index b7c351646d..0000000000 --- a/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_3090 net/minecraft/world/gen/feature/MegaPineTreeFeature - METHOD method_13495 makeTopLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;IIIILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4636;)V - ARG 1 world - ARG 3 x - ARG 4 z - ARG 5 height - ARG 6 radius - ARG 7 leaves - ARG 8 box - ARG 9 config diff --git a/mappings/net/minecraft/world/gen/feature/MegaTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/MegaTreeFeature.mapping deleted file mode 100644 index 5f9bf98789..0000000000 --- a/mappings/net/minecraft/world/gen/feature/MegaTreeFeature.mapping +++ /dev/null @@ -1,35 +0,0 @@ -CLASS net/minecraft/class_3096 net/minecraft/world/gen/feature/MegaTreeFeature - METHOD method_13523 checkTreeFitsAndReplaceGround (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;I)Z - ARG 1 world - ARG 2 pos - ARG 3 height - METHOD method_13524 getHeight (Ljava/util/Random;Lnet/minecraft/class_4636;)I - ARG 2 config - METHOD method_13525 replaceGround (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 pos - METHOD method_13526 makeRoundLeafLayer (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)V - ARG 1 world - ARG 3 pos - ARG 4 radius - ARG 5 leaves - ARG 6 box - ARG 7 config - METHOD method_13527 doesTreeFit (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;I)Z - ARG 1 world - ARG 2 pos - ARG 3 height - METHOD method_13528 makeSquaredLeafLayer (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)V - ARG 1 world - ARG 3 pos - ARG 4 radius - ARG 5 leaves - ARG 6 box - ARG 7 config - METHOD method_23400 generateTrunk (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4636;)V - ARG 1 world - ARG 3 pos - ARG 4 height - ARG 5 logs - ARG 6 box - ARG 7 config diff --git a/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping deleted file mode 100644 index cbdb92c6c5..0000000000 --- a/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping +++ /dev/null @@ -1,22 +0,0 @@ -CLASS net/minecraft/class_4636 net/minecraft/world/gen/feature/MegaTreeFeatureConfig - FIELD field_21233 heightInterval I - FIELD field_21591 crownHeight I - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Ljava/util/List;III)V - ARG 1 trunkProvider - ARG 2 leavesProvider - ARG 3 decorators - ARG 4 baseHeight - ARG 5 heightInterval - ARG 6 crownHeight - METHOD method_23408 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4636; - CLASS class_4637 Builder - FIELD field_21234 treeDecorators Ljava/util/List; - FIELD field_21235 height I - FIELD field_21236 heightInterval I - FIELD field_21592 crownHeight I - METHOD method_23411 treeDecorators (Ljava/util/List;)Lnet/minecraft/class_4636$class_4637; - ARG 1 decorators - METHOD method_23412 heightInterval (I)Lnet/minecraft/class_4636$class_4637; - ARG 1 heightInterval - METHOD method_23915 crownHeight (I)Lnet/minecraft/class_4636$class_4637; - ARG 1 crownHeight diff --git a/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping deleted file mode 100644 index 0ff24a79be..0000000000 --- a/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3207 net/minecraft/world/gen/feature/OakTreeFeature diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index 49736578d4..2603a920b2 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -4,11 +4,9 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_21290 decorators Ljava/util/List; FIELD field_21291 baseHeight I FIELD field_21593 skipFluidCheck Z - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Ljava/util/List;I)V + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Lnet/minecraft/class_5201;Ljava/util/List;IZLnet/minecraft/class_2902$class_2903;)V ARG 1 trunkProvider ARG 2 leavesProvider - ARG 3 decorators - ARG 4 baseHeight METHOD method_23444 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4643; ARG 0 configDeserializer METHOD method_23916 ignoreFluidCheck ()V @@ -17,7 +15,7 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_21293 leavesProvider Lnet/minecraft/class_4651; FIELD field_21294 decorators Ljava/util/List; FIELD field_21295 baseHeight I - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;)V + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5141;Lnet/minecraft/class_5201;)V ARG 1 trunkProvider ARG 2 leavesProvider METHOD method_23445 build ()Lnet/minecraft/class_4643; diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping index f1dd25ba03..cef6e66767 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -10,51 +10,25 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 3 offset ARG 4 randomOffset ARG 5 type - METHOD method_23447 getRadiusForPlacement (III)I - COMMENT This method is used to ensure that a tree can place foliage when it generates. - COMMENT - COMMENT

It runs for every y-level of the tree being generated. - ARG 1 trunkHeight - COMMENT the height of the trunk - ARG 2 baseHeight - COMMENT the height of the full tree - ARG 3 radius - COMMENT the radius of the foliage - METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;ILnet/minecraft/class_2338;IILjava/util/Set;)V + METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;I)V COMMENT This is the main method used to generate foliage. ARG 1 world ARG 2 random - ARG 3 config ARG 4 trunkHeight - ARG 5 pos ARG 6 foliageHeight ARG 7 radius ARG 8 leaves - METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4640;Lnet/minecraft/class_2338;IIILjava/util/Set;)V - ARG 1 world + METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;ILjava/util/Set;IZ)V ARG 2 random - ARG 3 config - ARG 4 pos ARG 5 baseHeight - ARG 6 y - ARG 7 radius - ARG 8 leaves - METHOD method_23450 placeLeaves (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4640;Ljava/util/Set;)V - ARG 1 world - ARG 2 random - ARG 3 pos - ARG 4 config - ARG 5 leaves - METHOD method_23451 isInvalidForLeaves (Ljava/util/Random;IIIII)Z + METHOD method_23451 isInvalidForLeaves (Ljava/util/Random;IIIIZ)Z ARG 2 baseHeight ARG 3 dx ARG 4 dy ARG 5 dz - ARG 6 radius - METHOD method_23452 getRadius (Ljava/util/Random;ILnet/minecraft/class_4640;)I + METHOD method_23452 getRadius (Ljava/util/Random;I)I ARG 1 random ARG 2 baseHeight - ARG 3 config - METHOD method_26989 getHeight (Ljava/util/Random;I)I + METHOD method_26989 getHeight (Ljava/util/Random;ILnet/minecraft/class_4643;)I ARG 1 random ARG 2 trunkHeight diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping index e43ccfc577..564301ab31 100644 --- a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping @@ -8,20 +8,14 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer ARG 2 firstRandomHeight ARG 3 secondRandomHeight ARG 4 type - METHOD method_26990 getBaseHeight ()I - METHOD method_26991 generate (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;ILjava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4640;)Ljava/util/Map; + METHOD method_26991 generate (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Ljava/util/List; COMMENT Generates the trunk blocks and return a map from branch tops to the COMMENT radius allowed for foliage generation on that branch top. ARG 1 world ARG 2 random ARG 3 trunkHeight ARG 4 pos - ARG 5 foliageRadius - ARG 6 logs - ARG 7 box - ARG 8 config METHOD method_26992 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; ARG 1 ops - METHOD method_26993 getHeight (Ljava/util/Random;Lnet/minecraft/class_4640;)I + METHOD method_26993 getHeight (Ljava/util/Random;)I ARG 1 random - ARG 2 config diff --git a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping index 7f25dba8ff..09a1841bee 100644 --- a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping +++ b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping @@ -38,7 +38,7 @@ CLASS net/minecraft/class_1942 net/minecraft/world/level/LevelGeneratorType ARG 1 dynamic METHOD method_25957 getDefaultOptions ()Lnet/minecraft/class_4952; METHOD method_8629 setHasInfo ()Lnet/minecraft/class_1942; - METHOD method_8630 getInfoTranslationKey ()Ljava/lang/String; + METHOD method_8630 getInfoTranslationKey ()Lnet/minecraft/class_2561; METHOD method_8631 setCustomizable (Z)Lnet/minecraft/class_1942; ARG 1 customizable METHOD method_8632 getTypeForVersion (I)Lnet/minecraft/class_1942; @@ -52,7 +52,7 @@ CLASS net/minecraft/class_1942 net/minecraft/world/level/LevelGeneratorType METHOD method_8638 getStoredName ()Ljava/lang/String; METHOD method_8639 getTypeFromName (Ljava/lang/String;)Lnet/minecraft/class_1942; ARG 0 name - METHOD method_8640 getTranslationKey ()Ljava/lang/String; + METHOD method_8640 getTranslationKey ()Lnet/minecraft/class_2561; METHOD method_8641 isCustomizable ()Z METHOD method_8642 isVisible ()Z METHOD method_8643 isVersioned ()Z diff --git a/mappings/net/minecraft/world/level/LevelInfo.mapping b/mappings/net/minecraft/world/level/LevelInfo.mapping index 84559a3e1f..dc0125a905 100644 --- a/mappings/net/minecraft/world/level/LevelInfo.mapping +++ b/mappings/net/minecraft/world/level/LevelInfo.mapping @@ -6,14 +6,6 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo FIELD field_9261 hardcore Z FIELD field_9262 structures Z FIELD field_9263 seed J - METHOD (JLnet/minecraft/class_1934;ZZLnet/minecraft/class_4952;)V - ARG 1 seed - ARG 3 gameMode - ARG 4 structures - ARG 5 hardcore - ARG 6 generatorOptions - METHOD (Lnet/minecraft/class_31;)V - ARG 1 properties METHOD method_8573 allowCommands ()Z METHOD method_8574 getGameMode ()Lnet/minecraft/class_1934; METHOD method_8575 setBonusChest ()Lnet/minecraft/class_1940; diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 1d30e3eec3..0480670cfd 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -8,10 +8,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_157 difficultyLocked Z FIELD field_158 version I FIELD field_159 hardcore Z - FIELD field_160 borderSizeLerpTarget D - FIELD field_161 borderWarningTime I FIELD field_162 versionName Ljava/lang/String; - FIELD field_164 borderCenterX D FIELD field_165 lastPlayed J FIELD field_167 spawnY I FIELD field_168 thundering Z @@ -21,22 +18,17 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_172 playerDataLoaded Z FIELD field_173 thunderTime I FIELD field_174 difficulty Lnet/minecraft/class_1267; - FIELD field_175 DEFAULT_DIFFICULTY Lnet/minecraft/class_1267; FIELD field_176 clearWeatherTime I FIELD field_17736 wanderingTraderSpawnDelay I FIELD field_17737 wanderingTraderSpawnChance I FIELD field_17738 wanderingTraderId Ljava/util/UUID; FIELD field_177 commandsAllowed Z - FIELD field_178 borderSafeZone D FIELD field_179 gameMode Lnet/minecraft/class_1934; - FIELD field_180 borderCenterZ D FIELD field_181 sizeOnDisk J FIELD field_182 spawnZ I FIELD field_183 versionId I FIELD field_184 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_185 initialized Z - FIELD field_187 borderDamagePerBlock D - FIELD field_188 borderSize D FIELD field_189 time J FIELD field_190 raining Z FIELD field_191 scheduledEvents Lnet/minecraft/class_236; @@ -45,147 +37,21 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_194 versionSnapshot Z FIELD field_195 structures Z FIELD field_196 dataVersion I - FIELD field_197 borderWarningBlocks I FIELD field_198 timeOfDay J - FIELD field_199 borderSizeLerpTime J FIELD field_21837 serverBrands Ljava/util/Set; FIELD field_21838 modded Z FIELD field_23089 generatorOptions Lnet/minecraft/class_4952; - METHOD (Lnet/minecraft/class_1940;Ljava/lang/String;)V - ARG 1 info - ARG 2 levelName METHOD (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;)V ARG 1 tag ARG 2 dataFixer ARG 3 dataVersion ARG 4 playerData - METHOD method_139 getBorderCenterZ ()D - METHOD method_140 loadLevelInfo (Lnet/minecraft/class_1940;)V - ARG 1 levelInfo - METHOD method_142 setVersion (I)V - ARG 1 version - METHOD method_143 getScheduledEvents ()Lnet/minecraft/class_236; - METHOD method_144 getSpawnY ()I - METHOD method_145 getThunderTime ()I - METHOD method_146 getGameRules ()Lnet/minecraft/class_1928; - METHOD method_147 setThundering (Z)V - ARG 1 thundering - METHOD method_150 getLevelName ()Ljava/lang/String; - METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V - ARG 1 section - METHOD method_152 isHardcore ()Z - METHOD method_153 getGeneratorType ()Lnet/minecraft/class_1942; - METHOD method_155 getClearWeatherTime ()I - METHOD method_156 isRaining ()Z - METHOD method_157 setRaining (Z)V - ARG 1 raining METHOD method_158 updateProperties (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V ARG 1 levelTag ARG 2 playerTag - METHOD method_159 getBorderSizeLerpTarget ()D - METHOD method_160 setWorldData (Lnet/minecraft/class_2874;Lnet/minecraft/class_2487;)V - ARG 1 type - ARG 2 tag - METHOD method_161 getBorderWarningTime ()I - METHOD method_162 setBorderSize (D)V - ARG 1 borderSize - METHOD method_163 cloneWorldTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 playerTag - METHOD method_164 setRainTime (I)V - ARG 1 rainTime - METHOD method_165 setTimeOfDay (J)V - ARG 1 timeOfDay - METHOD method_166 getSpawnZ ()I - METHOD method_167 setClearWeatherTime (I)V - ARG 1 clearWeatherTime - METHOD method_168 getVersion ()I - METHOD method_169 getGeneratorOptions ()Lnet/minecraft/class_4952; - METHOD method_170 getWorldData (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2487; - ARG 1 type - METHOD method_171 isVersionSnapshot ()Z - METHOD method_173 setThunderTime (I)V - ARG 1 thunderTime - METHOD method_174 setBorderSizeLerpTarget (D)V - ARG 1 borderSizeLerpTarget - METHOD method_177 setTime (J)V - ARG 1 time - METHOD method_178 getBorderSafeZone ()D - METHOD method_179 getEnabledDataPacks ()Ljava/util/Set; - METHOD method_180 getVersionId ()I - METHOD method_18038 getWanderingTraderSpawnDelay ()I - METHOD method_18039 getWanderingTraderSpawnChance ()I - METHOD method_18040 setWanderingTraderId (Ljava/util/UUID;)V - ARG 1 wanderingTraderId - METHOD method_18041 setWanderingTraderSpawnDelay (I)V - ARG 1 wanderingTraderSpawnDelay - METHOD method_18042 setWanderingTraderSpawnChance (I)V - ARG 1 wanderingTraderSpawnChance - METHOD method_182 setLevelName (Ljava/lang/String;)V - ARG 1 levelName - METHOD method_183 getBorderSizeLerpTime ()J - METHOD method_184 getSeed ()J METHOD method_185 loadPlayerData ()V - METHOD method_186 setDifficultyLocked (Z)V - ARG 1 difficultyLocked - METHOD method_187 setSpawnPos (Lnet/minecraft/class_2338;)V - ARG 1 pos - METHOD method_188 getTime ()J - METHOD method_189 borderCenterZ (D)V - ARG 1 borderCenterZ - METHOD method_190 getRainTime ()I - METHOD method_191 getLastPlayed ()J - METHOD method_192 setBorderWarningTime (I)V - ARG 1 borderWarningTime - METHOD method_193 setGameMode (Lnet/minecraft/class_1934;)V - ARG 1 gameMode - METHOD method_194 areCommandsAllowed ()Z - METHOD method_195 setBorderSizeLerpTime (J)V - ARG 1 borderSizeLerpTime - METHOD method_196 setStructures (Z)V - ARG 1 structures - METHOD method_197 isDifficultyLocked ()Z - METHOD method_198 setHardcore (Z)V - ARG 1 hardcore - METHOD method_200 setBorderCenterX (D)V - ARG 1 borderCenterX - METHOD method_201 setBorderWarningBlocks (I)V - ARG 1 borderWarningBlocks - METHOD method_202 getBorderDamagePerBlock ()D - METHOD method_203 isThundering ()Z - METHOD method_204 getBorderCenterX ()D - METHOD method_206 getBorderSize ()D - METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267; - METHOD method_208 setDifficulty (Lnet/minecraft/class_1267;)V - ARG 1 difficulty - METHOD method_209 getDisabledDataPacks ()Ljava/util/Set; - METHOD method_210 getGameMode ()Lnet/minecraft/class_1934; - METHOD method_211 setCommandsAllowed (Z)V - ARG 1 commandsAllowed - METHOD method_215 getSpawnX ()I - METHOD method_216 setBorderSafeZone (D)V - ARG 1 borderSafeZone - METHOD method_217 getTimeOfDay ()J - METHOD method_219 getVersionName ()Ljava/lang/String; - METHOD method_220 hasStructures ()Z - METHOD method_221 setCustomBossEvents (Lnet/minecraft/class_2487;)V - ARG 1 customBossEvents - METHOD method_222 isInitialized ()Z - METHOD method_223 setInitialized (Z)V - ARG 1 initialized - METHOD method_22418 sha256Hash (J)J - ARG 0 seed - METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487; - METHOD method_227 getBorderWarningBlocks ()I - METHOD method_228 getCustomBossEvents ()Lnet/minecraft/class_2487; - METHOD method_229 setBorderDamagePerBlock (D)V - ARG 1 borderDamagePerBlock - METHOD method_24285 addServerBrand (Ljava/lang/String;Z)V - ARG 1 brand - ARG 2 moddedMessagePresent METHOD method_25989 updateGeneratorOptionsData (Lnet/minecraft/class_1942;Lcom/mojang/datafixers/Dynamic;ILcom/mojang/datafixers/DataFixer;)Lcom/mojang/datafixers/Dynamic; ARG 0 type ARG 1 dynamic ARG 2 dataVersion ARG 3 dataFixer - METHOD method_25990 setGeneratorOptions (Lnet/minecraft/class_4952;)V - ARG 1 options diff --git a/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping b/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping index 2784c81696..ed6d35cf78 100644 --- a/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping +++ b/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_27 net/minecraft/world/level/UnmodifiableLevelProperties - FIELD field_139 properties Lnet/minecraft/class_31; - METHOD (Lnet/minecraft/class_31;)V - ARG 1 properties + FIELD field_139 properties Lnet/minecraft/class_5217; diff --git a/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping b/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping index 03ef2549c4..9058d3f629 100644 --- a/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping @@ -6,6 +6,5 @@ CLASS net/minecraft/class_24 net/minecraft/world/level/storage/AnvilLevelStorage ARG 1 baseFolder ARG 4 progressStart METHOD method_117 addRegionFiles (Ljava/io/File;Ljava/util/Collection;)V - METHOD method_118 makeMcrLevelDatBackup (Ljava/io/File;)V - ARG 0 file + METHOD method_118 makeMcrLevelDatBackup (Lnet/minecraft/class_32$class_5143;)V METHOD method_234 convertLevel (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3536;)Z diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 9a39027ea7..5ce5288379 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 savesDirectory ARG 2 backupsDirectory ARG 3 dataFixer - METHOD method_17926 readLevelProperties (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31; + METHOD method_17926 readLevelProperties (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5219; ARG 0 file ARG 1 dataFixer METHOD method_17931 getCurrentVersion ()I @@ -19,7 +19,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_236 getBackupsDirectory ()Ljava/nio/file/Path; METHOD method_240 isLevelNameValid (Ljava/lang/String;)Z ARG 1 name - METHOD method_26998 readLevelProperties (Ljava/io/File;)Lnet/minecraft/class_31; + METHOD method_26998 readLevelProperties (Ljava/io/File;)Lnet/minecraft/class_5219; METHOD method_26999 create (Ljava/nio/file/Path;)Lnet/minecraft/class_32; ARG 0 path METHOD method_27002 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; @@ -28,18 +28,14 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_23767 lock Lnet/minecraft/class_5125; FIELD field_23768 directory Ljava/nio/file/Path; FIELD field_23769 directoryName Ljava/lang/String; - METHOD (Lnet/minecraft/class_32;Ljava/lang/String;)V - ARG 2 directoryName METHOD method_27005 getDirectoryName ()Ljava/lang/String; METHOD method_27006 convert (Lnet/minecraft/class_3536;)Z ARG 1 progressListener METHOD method_27008 save (Ljava/lang/String;)V ARG 1 name - METHOD method_27009 createSaveHandler (Lnet/minecraft/server/MinecraftServer;)Lnet/minecraft/class_29; - ARG 1 server - METHOD method_27010 getDirectory ()Ljava/nio/file/Path; + METHOD method_27010 getDirectory (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; METHOD method_27012 needsConversion ()Z - METHOD method_27013 readLevelProperties ()Lnet/minecraft/class_31; + METHOD method_27013 readLevelProperties ()Lnet/minecraft/class_5219; METHOD method_27014 getIconFile ()Ljava/io/File; METHOD method_27015 deleteSessionLock ()V METHOD method_27016 createBackup ()J diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index a02b16e4e5..ad0c3f1fef 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -13,8 +13,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary FIELD field_216 snapshot Z FIELD field_23772 locked Z FIELD field_23773 file Ljava/io/File; - METHOD (Lnet/minecraft/class_31;Ljava/lang/String;Ljava/lang/String;JZZLjava/io/File;)V - ARG 1 properties + METHOD (Lnet/minecraft/class_5219;Ljava/lang/String;Ljava/lang/String;JZZLjava/io/File;)V ARG 2 name ARG 3 displayName ARG 4 size @@ -30,7 +29,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_255 requiresConversion ()Z METHOD method_256 isDifferentVersion ()Z METHOD method_257 isHardcore ()Z - METHOD method_258 getVersion ()Lnet/minecraft/class_2561; + METHOD method_258 getVersion ()Lnet/minecraft/class_5250; METHOD method_259 hasCheats ()Z METHOD method_260 isFutureLevel ()Z METHOD method_27020 getFile ()Ljava/io/File; diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 1ff99e7049..9a8771cba7 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater - FIELD field_17621 worldDirectory Ljava/io/File; FIELD field_17622 REGION_FILE_PATTERN Ljava/util/regex/Pattern; FIELD field_19225 eraseCache Z FIELD field_5755 persistentStateManager Lnet/minecraft/class_26; @@ -8,7 +7,6 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5758 levelName Ljava/lang/String; FIELD field_5759 isDone Z FIELD field_5760 keepUpgradingChunks Z - FIELD field_5761 worldSaveHandler Lnet/minecraft/class_29; FIELD field_5762 dimensionProgress Lit/unimi/dsi/fastutil/objects/Object2FloatMap; FIELD field_5763 progress F FIELD field_5764 skippedChunkCount I @@ -16,11 +14,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5766 upgradedChunkCount I FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I - METHOD (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_31;Z)V - ARG 2 properties - ARG 3 eraseCache METHOD method_17830 getChunkPositions (Lnet/minecraft/class_2874;)Ljava/util/List; - ARG 1 dimensionType METHOD method_5393 getProgress (Lnet/minecraft/class_2874;)F METHOD method_5394 getStatus ()Lnet/minecraft/class_2561; METHOD method_5397 getTotalChunkCount ()I