From 64d79d8f07158f84aaec05e9eb9b806b193003ec Mon Sep 17 00:00:00 2001 From: Player Date: Wed, 5 Apr 2023 10:59:01 -0400 Subject: [PATCH] 23w14a --- build.gradle | 2 +- mappings/net/minecraft/block/Block.mapping | 2 +- .../net/minecraft/block/DoorBlock.mapping | 1 - mappings/net/minecraft/block/Material.mapping | 70 +------------------ .../minecraft/block/SculkSensorBlock.mapping | 11 +-- .../block/entity/SignBlockEntity.mapping | 8 +-- .../minecraft/client/MinecraftClient.mapping | 2 - mappings/net/minecraft/client/RunArgs.mapping | 9 +-- .../minecraft/client/gui/LogoDrawer.mapping | 6 -- .../client/gui/screen/ConnectScreen.mapping | 4 +- .../gui/screen/DisconnectedScreen.mapping | 2 - .../gui/screen/RealmsBackupScreen.mapping | 32 --------- .../gui/screen/RealmsMainScreen.mapping | 19 ----- .../screen/RealmsPendingInvitesScreen.mapping | 2 +- .../gui/screen/RealmsPlayerScreen.mapping | 42 ----------- .../entity/SignBlockEntityRenderer.mapping | 26 ++----- .../loottable/LootTableProvider.mapping | 5 -- .../minecraft/entity/EyeOfEnderEntity.mapping | 2 - .../decoration/ArmorStandEntity.mapping | 1 - .../entity/passive/SnifferEntity.mapping | 2 - .../projectile/AbstractFireballEntity.mapping | 2 - .../thrown/ThrownItemEntity.mapping | 2 - mappings/net/minecraft/item/BrushItem.mapping | 2 - mappings/net/minecraft/item/ItemStack.mapping | 2 - .../net/minecraft/loot/LootManager.mapping | 38 ++++------ mappings/net/minecraft/loot/LootTable.mapping | 1 - .../minecraft/loot/LootTableReporter.mapping | 27 +------ .../condition/LootConditionManager.mapping | 25 ------- .../loot/context/LootContext.mapping | 22 +----- .../loot/function/LootFunctionManager.mapping | 32 --------- ...ncementEntityPredicateDeserializer.mapping | 5 +- .../minecraft/screen/ScreenHandler.mapping | 3 +- .../minecraft/server/DataPackContents.mapping | 4 -- .../minecraft/server/MinecraftServer.mapping | 2 - .../server/ServerAdvancementLoader.mapping | 3 +- .../structure/DesertTempleGenerator.mapping | 12 +--- .../packageinfo/PackageInfo8501.mapping | 1 + .../util/function/MaterialPredicate.mapping | 9 --- .../world/gen/feature/TreeFeature.mapping | 10 --- .../structure/DesertPyramidStructure.mapping | 2 - 40 files changed, 41 insertions(+), 411 deletions(-) delete mode 100644 mappings/net/minecraft/loot/condition/LootConditionManager.mapping delete mode 100644 mappings/net/minecraft/loot/function/LootFunctionManager.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping delete mode 100644 mappings/net/minecraft/util/function/MaterialPredicate.mapping diff --git a/build.gradle b/build.gradle index 3b43039f67..f3850e8350 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w13a" +def minecraft_version = "23w14a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index dff29659b1..95412cbadd 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -191,7 +191,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT COMMENT @see net.minecraft.loot.condition.SurvivesExplosionLootCondition ARG 1 explosion - METHOD method_9538 canMobSpawnInside ()Z + METHOD method_9538 canMobSpawnInside (Lnet/minecraft/class_2680;)Z METHOD method_9539 getTranslationKey ()Ljava/lang/String; COMMENT {@return the translation key for the name of this block} COMMENT diff --git a/mappings/net/minecraft/block/DoorBlock.mapping b/mappings/net/minecraft/block/DoorBlock.mapping index 7b808a15d7..86b3dfd25f 100644 --- a/mappings/net/minecraft/block/DoorBlock.mapping +++ b/mappings/net/minecraft/block/DoorBlock.mapping @@ -29,6 +29,5 @@ CLASS net/minecraft/class_2323 net/minecraft/block/DoorBlock ARG 0 world ARG 1 pos METHOD method_24796 isWoodenDoor (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_30841 isOpen (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index b4487ee2dd..d06eb15c0a 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -1,91 +1,25 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_15911 solid Z - FIELD field_15913 COBWEB Lnet/minecraft/class_3614; FIELD field_15914 STONE Lnet/minecraft/class_3614; COMMENT Material for blocks that are stone or made from it, and generally prefer to be broken by a pickaxe. - FIELD field_15915 BUBBLE_COLUMN Lnet/minecraft/class_3614; FIELD field_15916 AGGREGATE Lnet/minecraft/class_3614; COMMENT A material or structure formed from a loosely compacted mass of fragments or particles. - FIELD field_15917 SPONGE Lnet/minecraft/class_3614; - FIELD field_15918 REDSTONE_LAMP Lnet/minecraft/class_3614; - FIELD field_15919 PORTAL Lnet/minecraft/class_3614; - COMMENT Material for the various portal blocks. - FIELD field_15920 WATER Lnet/minecraft/class_3614; - FIELD field_15921 MOSS_BLOCK Lnet/minecraft/class_3614; - COMMENT Material for full sized moss blocks. - FIELD field_15922 LAVA Lnet/minecraft/class_3614; - FIELD field_15923 LEAVES Lnet/minecraft/class_3614; - FIELD field_15924 DECORATION Lnet/minecraft/class_3614; - COMMENT Material for decoration blocks such as redstone components, torches, flower pots, rails, buttons, and skulls. - FIELD field_15925 CACTUS Lnet/minecraft/class_3614; - FIELD field_15926 REPLACEABLE_UNDERWATER_PLANT Lnet/minecraft/class_3614; - FIELD field_15927 STRUCTURE_VOID Lnet/minecraft/class_3614; - COMMENT Material for structure void block. - FIELD field_15928 DENSE_ICE Lnet/minecraft/class_3614; - COMMENT Material for ice blocks that do not melt. See {@link #ICE} for meltable ice. - FIELD field_15929 liquid Z - FIELD field_15930 EGG Lnet/minecraft/class_3614; - COMMENT Material for egg blocks, such as dragon and turtle eggs. - FIELD field_15931 WOOL Lnet/minecraft/class_3614; - COMMENT Material for wool and bed blocks. FIELD field_15932 WOOD Lnet/minecraft/class_3614; COMMENT Material for wood logs, and things crafted from them. - FIELD field_15933 PISTON Lnet/minecraft/class_3614; - FIELD field_15934 SNOW_BLOCK Lnet/minecraft/class_3614; - COMMENT Material for full sized snow blocks. FIELD field_15935 PLANT Lnet/minecraft/class_3614; COMMENT Material for plants such as flowers and crops - FIELD field_15936 ORGANIC_PRODUCT Lnet/minecraft/class_3614; - COMMENT Material for blocks that come from mobs such as honey, slime, or infested blocks. Includes clay but not bone blocks. - FIELD field_15937 CAKE Lnet/minecraft/class_3614; - FIELD field_15938 BAMBOO_SAPLING Lnet/minecraft/class_3614; FIELD field_15939 blocksLight Z FIELD field_15940 blocksMovement Z - FIELD field_15941 SOIL Lnet/minecraft/class_3614; - COMMENT Material for the top layer of soil. Path, dirt, podzol, soul soil, farmland and similar. FIELD field_15942 GLASS Lnet/minecraft/class_3614; COMMENT Material for glass and glass-like blocks (includes sea lanterns and conduits). - FIELD field_15943 FIRE Lnet/minecraft/class_3614; FIELD field_15944 color Lnet/minecraft/class_3620; - FIELD field_15945 SOLID_ORGANIC Lnet/minecraft/class_3614; - COMMENT Organic blocks that are solid, including hay, target, and grass blocks. - FIELD field_15946 BAMBOO Lnet/minecraft/class_3614; - FIELD field_15947 UNDERWATER_PLANT Lnet/minecraft/class_3614; - COMMENT Material for underwater plants without the replaceable property. - FIELD field_15948 SNOW_LAYER Lnet/minecraft/class_3614; - COMMENT Material for non-full blocks of snow. Has the replaceable property. - FIELD field_15949 REPAIR_STATION Lnet/minecraft/class_3614; - COMMENT Material for blocks that can repair tools, including grindstone and anvils. FIELD field_15950 replaceable Z - FIELD field_15952 BARRIER Lnet/minecraft/class_3614; - FIELD field_15953 METAL Lnet/minecraft/class_3614; - COMMENT Material for blocks metallic in nature, such as cauldrons, bells, iron doors, and iron trapdoors. It also includes non-obvious blocks such as brewing stands and compressed ore blocks, including diamond, redstone, and lapis blocks. - FIELD field_15954 GOURD Lnet/minecraft/class_3614; - COMMENT Material for gourds. Includes the carved pumpkin and jack o' lantern. - FIELD field_15955 TNT Lnet/minecraft/class_3614; - FIELD field_15956 REPLACEABLE_PLANT Lnet/minecraft/class_3614; - FIELD field_15957 CARPET Lnet/minecraft/class_3614; - FIELD field_15958 ICE Lnet/minecraft/class_3614; - COMMENT Material for ice that can melt. See {@link #DENSE_ICE} for unmeltable ice. - FIELD field_15959 AIR Lnet/minecraft/class_3614; - FIELD field_17008 SHULKER_BOX Lnet/minecraft/class_3614; - FIELD field_26708 NETHER_SHOOTS Lnet/minecraft/class_3614; - COMMENT Material for crimson and warped roots, as well as Nether sprouts. - FIELD field_27340 AMETHYST Lnet/minecraft/class_3614; - FIELD field_27890 POWDER_SNOW Lnet/minecraft/class_3614; - FIELD field_28242 SCULK Lnet/minecraft/class_3614; - FIELD field_37828 FROGSPAWN Lnet/minecraft/class_3614; - FIELD field_38977 FROGLIGHT Lnet/minecraft/class_3614; - FIELD field_42857 DECORATED_POT Lnet/minecraft/class_3614; - FIELD field_43404 SNIFFER_EGG Lnet/minecraft/class_3614; - METHOD (Lnet/minecraft/class_3620;ZZZZZ)V + METHOD (Lnet/minecraft/class_3620;ZZZZ)V ARG 1 color ARG 2 liquid ARG 3 solid ARG 4 blocksMovement ARG 5 blocksLight - ARG 6 replaceable - METHOD method_15797 isLiquid ()Z METHOD method_15799 isSolid ()Z METHOD method_15800 isReplaceable ()Z METHOD method_15801 blocksMovement ()Z @@ -96,12 +30,10 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_15962 blocksLight Z FIELD field_15963 solid Z FIELD field_15964 replaceable Z - FIELD field_15965 liquid Z FIELD field_15969 blocksMovement Z METHOD (Lnet/minecraft/class_3620;)V ARG 1 color METHOD method_15806 notSolid ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15810 liquid ()Lnet/minecraft/class_3614$class_3615; METHOD method_15811 allowsMovement ()Lnet/minecraft/class_3614$class_3615; METHOD method_15812 lightPassesThrough ()Lnet/minecraft/class_3614$class_3615; METHOD method_15813 build ()Lnet/minecraft/class_3614; diff --git a/mappings/net/minecraft/block/SculkSensorBlock.mapping b/mappings/net/minecraft/block/SculkSensorBlock.mapping index 9b38ffd0ff..f1217f1203 100644 --- a/mappings/net/minecraft/block/SculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/SculkSensorBlock.mapping @@ -15,12 +15,6 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock ARG 1 pos ARG 2 state METHOD method_32904 setActive (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;II)V - ARG 0 entity - ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 power - ARG 5 frequency METHOD method_32905 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5704;)V ARG 0 world ARG 1 pos @@ -30,9 +24,6 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock ARG 0 state METHOD method_32909 isInactive (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_49822 tryResonate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V - ARG 0 world - ARG 1 pos - ARG 2 frequency + METHOD method_49822 tryResonate (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V METHOD method_49823 ([F)V ARG 0 frequency diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index 9f2ef146b5..4a11b6d103 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -65,13 +65,9 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity METHOD method_49853 getFrontText ()Lnet/minecraft/class_8242; METHOD method_49854 getBackText ()Lnet/minecraft/class_8242; METHOD method_49855 isWaxed ()Z - METHOD method_50006 createCommandSource (Lnet/minecraft/class_3222;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2168; - ARG 0 player - ARG 1 world + METHOD method_50006 createCommandSource (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2168; ARG 2 pos - METHOD method_50007 runCommandClickEvent (Lnet/minecraft/class_3222;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)Z - ARG 1 player - ARG 2 world + METHOD method_50007 runCommandClickEvent (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Z ARG 3 pos ARG 4 front METHOD method_50008 parseLines (Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 0d9597c8e1..06af43a212 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -490,8 +490,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_44377 getAbuseReportContext ()Lnet/minecraft/class_7574; METHOD method_44646 getRealmsPeriodicCheckers ()Lnet/minecraft/class_7578; METHOD method_44647 getMultiplayerBanDetails ()Lcom/mojang/authlib/minecraft/BanDetails; - METHOD method_44648 (Z)V - ARG 1 confirmed METHOD method_44649 isMultiplayerBanned ()Z METHOD method_44713 getNarratorManager ()Lnet/minecraft/class_333; METHOD method_44714 getMessageHandler ()Lnet/minecraft/class_7594; diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index 7797765c28..57299412fe 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs FIELD field_3278 network Lnet/minecraft/class_542$class_547; FIELD field_3279 windowSettings Lnet/minecraft/class_543; FIELD field_3280 game Lnet/minecraft/class_542$class_545; - FIELD field_3281 autoConnect Lnet/minecraft/class_542$class_546; - METHOD (Lnet/minecraft/class_542$class_547;Lnet/minecraft/class_543;Lnet/minecraft/class_542$class_544;Lnet/minecraft/class_542$class_545;Lnet/minecraft/class_542$class_546;)V + METHOD (Lnet/minecraft/class_542$class_547;Lnet/minecraft/class_543;Lnet/minecraft/class_542$class_544;Lnet/minecraft/class_542$class_545;Lnet/minecraft/class_542$class_8495;)V ARG 1 network ARG 2 windowSettings ARG 3 dirs @@ -33,12 +32,6 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 3 versionType ARG 4 multiplayerDisabled ARG 5 onlineChatDisabled - CLASS class_546 AutoConnect - FIELD field_3294 serverAddress Ljava/lang/String; - FIELD field_3295 serverPort I - METHOD (Ljava/lang/String;I)V - ARG 1 serverAddress - ARG 2 serverPort CLASS class_547 Network FIELD field_3296 netProxy Ljava/net/Proxy; FIELD field_3297 profileProperties Lcom/mojang/authlib/properties/PropertyMap; diff --git a/mappings/net/minecraft/client/gui/LogoDrawer.mapping b/mappings/net/minecraft/client/gui/LogoDrawer.mapping index c960249090..c83eeec51a 100644 --- a/mappings/net/minecraft/client/gui/LogoDrawer.mapping +++ b/mappings/net/minecraft/client/gui/LogoDrawer.mapping @@ -14,9 +14,3 @@ CLASS net/minecraft/class_8020 net/minecraft/client/gui/LogoDrawer ARG 2 screenWidth ARG 3 alpha ARG 4 y - METHOD method_48211 (Lnet/minecraft/class_4587;Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 1 x - ARG 2 y - METHOD method_48212 (Lnet/minecraft/class_4587;Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 1 x - ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping index 7a6d18763a..6f3cb9e5c5 100644 --- a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen FIELD field_2413 status Lnet/minecraft/class_2561; FIELD field_32238 NARRATOR_INTERVAL J FIELD field_33736 BLOCKED_HOST_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;)V ARG 1 parent METHOD method_19800 (Lnet/minecraft/class_4185;)V ARG 1 button @@ -24,7 +24,7 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen ARG 3 info METHOD method_2131 setStatus (Lnet/minecraft/class_2561;)V ARG 1 status - METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V + METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;Z)V ARG 0 screen ARG 1 client ARG 2 address diff --git a/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping b/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping index e974400890..c05270a41c 100644 --- a/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_419 net/minecraft/client/gui/screen/DisconnectedScreen - FIELD field_2454 reasonHeight I FIELD field_2456 parent Lnet/minecraft/class_437; FIELD field_2457 reason Lnet/minecraft/class_2561; - FIELD field_2458 reasonFormatted Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 parent ARG 2 title diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping index 6cebba51fa..686900b2b4 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBackupScreen FIELD field_19741 LOGGER Lorg/slf4j/Logger; - FIELD field_19742 lastScrollPosition I FIELD field_19743 parent Lnet/minecraft/class_4388; FIELD field_19744 backups Ljava/util/List; - FIELD field_19745 tooltip Lnet/minecraft/class_2561; FIELD field_19746 backupObjectSelectionList Lnet/minecraft/class_4381$class_4382; FIELD field_19747 selectedBackup I FIELD field_19748 slotId I @@ -23,15 +21,6 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 parent ARG 2 serverData ARG 3 slotId - METHOD method_21147 addToChangeList (Lnet/minecraft/class_4867;Ljava/lang/String;)V - ARG 1 backup - ARG 2 key - METHOD method_21153 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices - ARG 2 text - ARG 3 mouseX - ARG 4 mouseY - METHOD method_21154 generateChangeList ()V METHOD method_21155 restoreClicked (I)V ARG 1 selectedBackup METHOD method_21160 updateButtonStates ()V @@ -59,26 +48,5 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 backup CLASS class_4383 BackupObjectSelectionListEntry 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 (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - METHOD method_21175 renderBackupItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4867;IIII)V - ARG 1 matrices - ARG 2 backup - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY METHOD method_21176 getMediumDatePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 1 lastModifiedDate - METHOD method_21177 drawInfo (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 34d78dfae7..b48277b4f9 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -52,8 +52,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_22560 REALMS Lnet/minecraft/class_2960; FIELD field_22563 NEWS_ICON Lnet/minecraft/class_2960; FIELD field_22564 POPUP Lnet/minecraft/class_2960; - FIELD field_26447 NO_PENDING_TEXT Lnet/minecraft/class_2561; - FIELD field_26448 PENDING_TEXT Lnet/minecraft/class_2561; FIELD field_26449 TRIAL_MESSAGE_LINES Ljava/util/List; FIELD field_26450 UNINITIALIZED_TEXT Lnet/minecraft/class_2561; FIELD field_26451 EXPIRED_LIST_TEXT Lnet/minecraft/class_2561; @@ -95,24 +93,12 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_20844 isOutsidePopup (DD)Z ARG 1 xm ARG 3 ym - METHOD method_20845 drawRealmsLogo (Lnet/minecraft/class_4587;II)V - ARG 1 matrices - ARG 2 x - ARG 3 y METHOD method_20846 drawExpired (Lnet/minecraft/class_4587;IIII)V ARG 1 matrices ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_20849 drawInvitationPendingIcon (Lnet/minecraft/class_4587;IIIIZZ)V - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - ARG 4 x - ARG 5 y - ARG 6 hovered - ARG 7 active METHOD method_20850 renderNews (Lnet/minecraft/class_4587;IIZIIZZ)V ARG 1 matrices ARG 2 mouseX @@ -128,9 +114,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 1 serverData ARG 2 parent METHOD method_20870 shouldShowPopup ()Z - METHOD method_20871 inPendingInvitationArea (DD)Z - ARG 1 xm - ARG 3 ym METHOD method_20872 drawPopup (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_20873 drawOpen (Lnet/minecraft/class_4587;IIII)V @@ -174,8 +157,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 0 manager METHOD method_23766 (Lnet/minecraft/class_2960;)Z ARG 0 filename - METHOD method_24985 openPendingInvitesScreen (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_24987 drawExpiring (Lnet/minecraft/class_4587;IIIII)V ARG 1 matrices ARG 2 x diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping index 52a090ca22..50d5081ed9 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend FIELD field_26493 NO_PENDING_TEXT Lnet/minecraft/class_2561; FIELD field_26494 ACCEPT_TEXT Lnet/minecraft/class_2561; FIELD field_26495 REJECT_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;)V ARG 1 parent METHOD method_21300 updateList (I)V ARG 1 slot diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index ab556f2498..d3bbe2d9c5 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -1,23 +1,18 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlayerScreen FIELD field_19958 LOGGER Lorg/slf4j/Logger; - FIELD field_19959 tooltip Lnet/minecraft/class_2561; FIELD field_19960 parent Lnet/minecraft/class_4388; FIELD field_19961 serverData Lnet/minecraft/class_4877; FIELD field_19962 invitedObjectSelectionList Lnet/minecraft/class_4406$class_4407; FIELD field_19963 column1_x I FIELD field_19964 column_width I - FIELD field_19965 column2_x I FIELD field_19966 removeButton Lnet/minecraft/class_4185; FIELD field_19967 opdeopButton Lnet/minecraft/class_4185; - FIELD field_19968 selectedInvitedIndex I - FIELD field_19969 selectedInvited Ljava/lang/String; FIELD field_19970 player I FIELD field_19971 stateChanged Z FIELD field_22704 OP_ICON Lnet/minecraft/class_2960; FIELD field_22705 USER_ICON Lnet/minecraft/class_2960; FIELD field_22706 CROSS_PLAYER_ICON Lnet/minecraft/class_2960; FIELD field_22707 OPTIONS_BACKGROUND Lnet/minecraft/class_2960; - FIELD field_26496 operation Lnet/minecraft/class_4406$class_5488; FIELD field_26498 NORMAL_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26499 OPERATOR_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26500 REMOVE_TOOLTIP Lnet/minecraft/class_2561; @@ -28,48 +23,21 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay METHOD method_21325 updateButtonStates ()V METHOD method_21326 shouldRemoveAndOpdeopButtonBeVisible (I)Z ARG 1 player - METHOD method_21327 drawRemoveIcon (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21328 updateOps (Lnet/minecraft/class_4870;)V ARG 1 ops - METHOD method_21332 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices - ARG 2 tooltip - ARG 3 mouseX - ARG 4 mouseY METHOD method_21333 backButtonClicked ()V METHOD method_21334 op (I)V ARG 1 index - METHOD method_21335 drawOpped (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21339 deop (I)V ARG 1 index - METHOD method_21340 drawNormal (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21344 uninvite (I)V ARG 1 index - METHOD method_21347 deleteFromInvitedList (I)V - ARG 1 selectedInvitedIndex METHOD method_25190 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25192 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25194 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25195 (Z)V - ARG 1 confirmed METHOD method_25197 (Lnet/minecraft/class_4185;)V ARG 1 button CLASS class_4407 InvitedObjectSelectionList @@ -79,13 +47,3 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay ARG 1 playerInfo CLASS class_4408 InvitedObjectSelectionListEntry FIELD field_19979 playerInfo Lnet/minecraft/class_4874; - METHOD (Lnet/minecraft/class_4406;Lnet/minecraft/class_4874;)V - ARG 2 playerInfo - METHOD method_21356 renderInvitedItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4874;IIII)V - ARG 1 matrices - ARG 2 playerInfo - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY - CLASS class_5488 PlayerOperation diff --git a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping index 146324319d..2a6e97ab99 100644 --- a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlock FIELD field_32830 STICK Ljava/lang/String; FIELD field_33962 GLOWING_BLACK_COLOR I FIELD field_33963 RENDER_DISTANCE I - FIELD field_43376 SCALE F METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx METHOD method_32154 getTexturedModelData ()Lnet/minecraft/class_5607; @@ -20,8 +19,7 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlock METHOD method_37312 shouldRender (Lnet/minecraft/class_2338;I)Z ARG 0 pos ARG 1 signColor - METHOD method_45790 getTextOffset (F)Lnet/minecraft/class_243; - ARG 1 scale + METHOD method_45790 getTextOffset ()Lnet/minecraft/class_243; METHOD method_45792 getTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 1 signType METHOD method_45793 renderSignModel (Lnet/minecraft/class_4587;IILnet/minecraft/class_3879;Lnet/minecraft/class_4588;)V @@ -30,37 +28,24 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlock ARG 3 overlay ARG 4 model ARG 5 vertexConsumers - METHOD method_45798 renderText (Lnet/minecraft/class_2338;Lnet/minecraft/class_8242;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IFLnet/minecraft/class_243;IIZ)V + METHOD method_45798 renderText (Lnet/minecraft/class_2338;Lnet/minecraft/class_8242;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IIIZ)V ARG 1 pos ARG 2 signText ARG 3 matrices ARG 4 vertexConsumers ARG 5 light - ARG 6 scale - ARG 7 textOffset - ARG 8 lineHeight - ARG 9 lineWidth - ARG 10 front METHOD method_45799 (ILnet/minecraft/class_2561;)Lnet/minecraft/class_5481; ARG 2 text - METHOD method_45800 renderSign (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IIFLnet/minecraft/class_4719;Lnet/minecraft/class_3879;)V - ARG 1 matrices + METHOD method_45800 renderSign (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_4719;Lnet/minecraft/class_3879;)V ARG 2 vertexConsumers ARG 3 light ARG 4 overlay - ARG 5 scale - ARG 6 type - ARG 7 model METHOD method_49918 setAngles (Lnet/minecraft/class_4587;FLnet/minecraft/class_2680;)V ARG 1 matrices ARG 2 rotationDegrees ARG 3 state - METHOD method_49919 setTextAngles (FLnet/minecraft/class_4587;ZLnet/minecraft/class_243;)V - ARG 1 scale - ARG 2 matrices - ARG 3 front - ARG 4 textOffset - METHOD method_49920 render (Lnet/minecraft/class_2625;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_2680;Lnet/minecraft/class_2478;Lnet/minecraft/class_4719;Lnet/minecraft/class_3879;F)V + METHOD method_49919 setTextAngles (Lnet/minecraft/class_4587;ZLnet/minecraft/class_243;)V + METHOD method_49920 render (Lnet/minecraft/class_2625;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_2680;Lnet/minecraft/class_2478;Lnet/minecraft/class_4719;Lnet/minecraft/class_3879;)V ARG 1 entity ARG 2 matrices ARG 3 vertexConsumers @@ -70,7 +55,6 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlock ARG 7 block ARG 8 woodType ARG 9 model - ARG 10 scale CLASS class_4702 SignModel FIELD field_21531 stick Lnet/minecraft/class_630; FIELD field_27756 root Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index 0404dad8ef..8cf73e5bf9 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -14,12 +14,7 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv ARG 2 entry METHOD method_10410 (Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;)V ARG 1 lootTypeGenerator - METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V - ARG 1 id - ARG 2 table METHOD method_10412 (Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V ARG 2 id ARG 3 builder - METHOD method_22825 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 0 id CLASS class_7790 LootTypeGenerator diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping index 1a47247678..f8b2220379 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity ARG 6 z METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_16934 (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_16935 getTrackedItem ()Lnet/minecraft/class_1799; METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V COMMENT Sets where the eye will fly towards. diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 97741d4fd7..be33a6e3e1 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -47,7 +47,6 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity METHOD method_6904 equip (Lnet/minecraft/class_1657;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Z ARG 1 player ARG 2 slot - ARG 3 stack ARG 4 hand METHOD method_6905 updateHealth (Lnet/minecraft/class_1282;F)V ARG 1 damageSource diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping index 485d9525f1..8b08982393 100644 --- a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -20,13 +20,11 @@ CLASS net/minecraft/class_8153 net/minecraft/entity/passive/SnifferEntity METHOD method_49138 getState ()Lnet/minecraft/class_8153$class_8154; METHOD method_49139 stopAnimations ()V METHOD method_49140 isDiggable (Lnet/minecraft/class_2338;)Z - ARG 1 pos METHOD method_49141 setDigging ()Lnet/minecraft/class_8153; METHOD method_49142 dropSeeds ()V METHOD method_49143 getExploredPositions ()Ljava/util/stream/Stream; METHOD method_49144 playSearchingSound ()V METHOD method_49145 addExploredPosition (Lnet/minecraft/class_2338;)Lnet/minecraft/class_8153; - ARG 1 pos METHOD method_49146 createSnifferAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_49147 isPanicking ()Z METHOD method_49149 finishDigging (Z)Lnet/minecraft/class_8153; diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 6305ccee8f..3ff3173a9a 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -2,6 +2,4 @@ CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballE FIELD field_17081 ITEM Lnet/minecraft/class_2940; METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_16937 (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_16938 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping index 6697600c0c..d06ec04772 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping @@ -2,7 +2,5 @@ CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItem FIELD field_17082 ITEM Lnet/minecraft/class_2940; METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V ARG 1 item - METHOD method_16941 (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_16942 getDefaultItem ()Lnet/minecraft/class_1792; METHOD method_16943 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/item/BrushItem.mapping b/mappings/net/minecraft/item/BrushItem.mapping index 22c1ef1b59..a076a27321 100644 --- a/mappings/net/minecraft/item/BrushItem.mapping +++ b/mappings/net/minecraft/item/BrushItem.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem - METHOD method_49183 (Lnet/minecraft/class_1309;)V - ARG 0 user METHOD method_49184 addDustParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;Lnet/minecraft/class_243;Z)V ARG 1 world ARG 2 hitResult diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 10128ee435..a9875a5d1e 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -109,7 +109,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_8030 bobbingAnimationTime I FIELD field_8031 count I FIELD field_8033 LOGGER Lorg/slf4j/Logger; - FIELD field_8036 empty Z FIELD field_8037 EMPTY Lnet/minecraft/class_1799; COMMENT The empty item stack that holds no item. COMMENT @@ -451,7 +450,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 3 breakCallback COMMENT the callback that takes the entity holding the stack and is executed COMMENT when the item breaks - METHOD method_7957 updateEmptyState ()V METHOD method_7958 hasGlint ()Z METHOD method_7959 setSubNbt (Ljava/lang/String;Lnet/minecraft/class_2520;)V COMMENT Sets the given NBT element in the item stack's custom NBT at the specified key. diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index 25cab6c2ec..0771a87a82 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -1,25 +1,17 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager - FIELD field_20752 conditionManager Lnet/minecraft/class_4567; - FIELD field_970 tables Ljava/util/Map; - FIELD field_974 GSON Lcom/google/gson/Gson; FIELD field_975 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_4567;)V - ARG 1 conditionManager - METHOD method_20711 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 1 id - ARG 2 json - METHOD method_367 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 1 id - METHOD method_368 (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 key - ARG 1 value - METHOD method_369 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V - ARG 0 reporter - ARG 1 id - ARG 2 table - METHOD method_370 getTableIds ()Ljava/util/Set; - METHOD method_372 toJson (Lnet/minecraft/class_52;)Lcom/google/gson/JsonElement; - ARG 0 table - METHOD method_373 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V - ARG 1 id - ARG 2 lootTable + CLASS class_5334 AndCondition + FIELD field_25202 terms [Lnet/minecraft/class_5341; + FIELD field_25203 predicate Ljava/util/function/Predicate; + METHOD ([Lnet/minecraft/class_5341;)V + ARG 1 terms + METHOD test (Ljava/lang/Object;)Z + ARG 1 context + CLASS class_5641 AndFunction + FIELD field_27904 functions [Lnet/minecraft/class_117; + FIELD field_27905 applier Ljava/util/function/BiFunction; + METHOD ([Lnet/minecraft/class_117;)V + ARG 1 functions + METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 stack + ARG 2 context diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 0ca503221a..7dae5c6c5b 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable METHOD method_322 getType ()Lnet/minecraft/class_176; METHOD method_324 builder ()Lnet/minecraft/class_52$class_53; METHOD method_328 generateUnprocessedLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V - ARG 1 context ARG 2 lootConsumer METHOD method_329 supplyInventory (Lnet/minecraft/class_1263;Lnet/minecraft/class_47;)V ARG 1 inventory diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index 3ff3a0b391..493296573d 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -1,42 +1,19 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter FIELD field_20756 contextType Lnet/minecraft/class_176; - FIELD field_20757 conditionGetter Ljava/util/function/Function; - FIELD field_20758 conditions Ljava/util/Set; - FIELD field_20759 tableGetter Ljava/util/function/Function; - FIELD field_20760 tables Ljava/util/Set; FIELD field_964 name Ljava/lang/String; FIELD field_965 messages Lcom/google/common/collect/Multimap; FIELD field_966 nameFactory Ljava/util/function/Supplier; - METHOD (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;Lnet/minecraft/class_176;Ljava/util/function/Function;Ljava/util/Set;Ljava/util/function/Function;Ljava/util/Set;)V + METHOD (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;Lnet/minecraft/class_176;Lnet/minecraft/class_8489;Ljava/util/Set;)V ARG 1 messages ARG 2 nameFactory ARG 3 contextType - ARG 4 conditionGetter ARG 5 conditions - ARG 6 tableGetter - ARG 7 tables - METHOD (Lnet/minecraft/class_176;Ljava/util/function/Function;Ljava/util/function/Function;)V + METHOD (Lnet/minecraft/class_176;Lnet/minecraft/class_8489;)V ARG 1 contextType - ARG 2 conditionGetter - ARG 3 tableFactory METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V ARG 1 contextAware METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58; ARG 1 contextType - METHOD method_22569 withTable (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; - ARG 1 name - ARG 2 id - METHOD method_22570 hasTable (Lnet/minecraft/class_2960;)Z - ARG 1 id - METHOD method_22571 withCondition (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; - ARG 1 name - ARG 2 id - METHOD method_22572 hasCondition (Lnet/minecraft/class_2960;)Z - ARG 1 id - METHOD method_22574 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 1 id - METHOD method_22576 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 1 id METHOD method_359 getName ()Ljava/lang/String; METHOD method_360 report (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping deleted file mode 100644 index e7d4516c0f..0000000000 --- a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping +++ /dev/null @@ -1,25 +0,0 @@ -CLASS net/minecraft/class_4567 net/minecraft/loot/condition/LootConditionManager - FIELD field_20753 LOGGER Lorg/slf4j/Logger; - FIELD field_20754 GSON Lcom/google/gson/Gson; - FIELD field_20755 conditions Ljava/util/Map; - METHOD method_22559 getIds ()Ljava/util/Set; - METHOD method_22560 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 1 id - ARG 2 json - METHOD method_22561 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_5341;)V - ARG 1 id - ARG 2 condition - METHOD method_22562 (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 name - ARG 1 message - METHOD method_22564 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 1 id - METHOD method_22566 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 0 id - CLASS class_5334 AndCondition - FIELD field_25202 terms [Lnet/minecraft/class_5341; - FIELD field_25203 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 terms - METHOD test (Ljava/lang/Object;)Z - ARG 1 context diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index 1fcd470fcc..965339ee9f 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -1,39 +1,23 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext - FIELD field_20750 conditionGetter Ljava/util/function/Function; - FIELD field_20751 conditions Ljava/util/Set; FIELD field_923 random Lnet/minecraft/class_5819; - FIELD field_924 tableGetter Ljava/util/function/Function; FIELD field_925 parameters Ljava/util/Map; FIELD field_926 luck F FIELD field_927 activeTables Ljava/util/Set; FIELD field_928 world Lnet/minecraft/class_3218; FIELD field_929 drops Ljava/util/Map; - METHOD (Lnet/minecraft/class_5819;FLnet/minecraft/class_3218;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/Map;Ljava/util/Map;)V + METHOD (Lnet/minecraft/class_5819;FLnet/minecraft/class_3218;Lnet/minecraft/class_8489;Ljava/util/Map;Ljava/util/Map;)V ARG 1 random ARG 2 luck ARG 3 world - ARG 4 tableGetter - ARG 5 conditionGetter ARG 6 parameters - ARG 7 drops - METHOD method_22555 addCondition (Lnet/minecraft/class_5341;)Z - ARG 1 condition - METHOD method_22556 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 1 id - METHOD method_22557 removeCondition (Lnet/minecraft/class_5341;)V - ARG 1 condition - METHOD method_22558 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 1 id METHOD method_294 getRandom ()Lnet/minecraft/class_5819; - METHOD method_295 markInactive (Lnet/minecraft/class_52;)V - ARG 1 table + METHOD method_295 markInactive (Lnet/minecraft/class_47$class_8487;)V METHOD method_296 get (Lnet/minecraft/class_169;)Ljava/lang/Object; ARG 1 parameter METHOD method_297 drop (Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 lootConsumer - METHOD method_298 markActive (Lnet/minecraft/class_52;)Z - ARG 1 table + METHOD method_298 markActive (Lnet/minecraft/class_47$class_8487;)Z METHOD method_299 getWorld ()Lnet/minecraft/class_3218; METHOD method_300 hasParameter (Lnet/minecraft/class_169;)Z ARG 1 parameter diff --git a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping b/mappings/net/minecraft/loot/function/LootFunctionManager.mapping deleted file mode 100644 index 688deea929..0000000000 --- a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping +++ /dev/null @@ -1,32 +0,0 @@ -CLASS net/minecraft/class_5640 net/minecraft/loot/function/LootFunctionManager - FIELD field_27899 LOGGER Lorg/slf4j/Logger; - FIELD field_27900 GSON Lcom/google/gson/Gson; - FIELD field_27901 lootConditionManager Lnet/minecraft/class_4567; - FIELD field_27902 lootManager Lnet/minecraft/class_60; - FIELD field_27903 functions Ljava/util/Map; - METHOD (Lnet/minecraft/class_4567;Lnet/minecraft/class_60;)V - ARG 1 lootConditionManager - ARG 2 lootManager - METHOD method_32399 getFunctionIds ()Ljava/util/Set; - METHOD method_32400 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 1 id - ARG 2 json - METHOD method_32401 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_117;)V - ARG 1 id - ARG 2 function - METHOD method_32402 (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 name - ARG 1 message - METHOD method_32404 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_117; - ARG 1 id - METHOD method_35507 getOrDefault (Lnet/minecraft/class_2960;Lnet/minecraft/class_117;)Lnet/minecraft/class_117; - ARG 1 id - ARG 2 fallback - CLASS class_5641 AndFunction - FIELD field_27904 functions [Lnet/minecraft/class_117; - FIELD field_27905 applier Ljava/util/function/BiFunction; - METHOD ([Lnet/minecraft/class_117;)V - ARG 1 functions - METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 stack - ARG 2 context diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping index 8f050d9c04..8d377dd7f2 100644 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer FIELD field_24383 LOGGER Lorg/slf4j/Logger; FIELD field_24384 advancementId Lnet/minecraft/class_2960; - FIELD field_24385 conditionManager Lnet/minecraft/class_4567; FIELD field_24386 gson Lcom/google/gson/Gson; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_4567;)V + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_60;)V ARG 1 advancementId ARG 2 conditionManager METHOD method_27795 getAdvancementId ()Lnet/minecraft/class_2960; @@ -14,5 +13,3 @@ CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityP METHOD method_27797 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 message - METHOD method_27798 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 0 tableId diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index dc21df25d0..91963a121f 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -397,11 +397,10 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 2 startIndex ARG 3 endIndex ARG 4 fromLast - METHOD method_7617 calculateStackSize (Ljava/util/Set;ILnet/minecraft/class_1799;I)V + METHOD method_7617 calculateStackSize (Ljava/util/Set;ILnet/minecraft/class_1799;)I ARG 0 slots ARG 1 mode ARG 2 stack - ARG 3 stackSize METHOD method_7618 calculateComparatorOutput (Lnet/minecraft/class_1263;)I ARG 0 inventory METHOD method_7619 setStackInSlot (IILnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index 55438fafa0..3b69cb2331 100644 --- a/mappings/net/minecraft/server/DataPackContents.mapping +++ b/mappings/net/minecraft/server/DataPackContents.mapping @@ -8,11 +8,9 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents FIELD field_25336 commandManager Lnet/minecraft/class_2170; FIELD field_25337 recipeManager Lnet/minecraft/class_1863; FIELD field_25338 registryTagManager Lnet/minecraft/class_3505; - FIELD field_25339 lootConditionManager Lnet/minecraft/class_4567; FIELD field_25340 lootManager Lnet/minecraft/class_60; FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989; FIELD field_25342 functionLoader Lnet/minecraft/class_5349; - FIELD field_28017 lootFunctionManager Lnet/minecraft/class_5640; FIELD field_36491 LOGGER Lorg/slf4j/Logger; FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157$class_7870; METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V @@ -36,7 +34,6 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents ARG 4 functionPermissionLevel ARG 5 prepareExecutor ARG 6 applyExecutor - METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567; METHOD method_29469 getLootManager ()Lnet/minecraft/class_60; COMMENT @see MinecraftServer#getLootManager METHOD method_29471 getRecipeManager ()Lnet/minecraft/class_1863; @@ -45,7 +42,6 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents COMMENT @see MinecraftServer#getCommandManager METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989; COMMENT @see MinecraftServer#getAdvancementLoader - METHOD method_32703 getLootFunctionManager ()Lnet/minecraft/class_5640; METHOD method_40421 refresh (Lnet/minecraft/class_5455;)V ARG 1 dynamicRegistryManager METHOD method_40422 repopulateTags (Lnet/minecraft/class_5455;Lnet/minecraft/class_3505$class_6863;)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 9f064348c9..0a1813676e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -119,7 +119,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 path METHOD method_21714 getFunctionPermissionLevel ()I METHOD method_22827 getDataCommandStorage ()Lnet/minecraft/class_4565; - METHOD method_22828 getPredicateManager ()Lnet/minecraft/class_4567; METHOD method_24307 getModStatus ()Lnet/minecraft/class_6683; METHOD method_24487 startTickMetrics ()V METHOD method_24488 isDebugRunning ()Z @@ -171,7 +170,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 player METHOD method_31400 generateKeyPair ()V METHOD method_32303 requireResourcePack ()Z - METHOD method_32699 getItemModifierManager ()Lnet/minecraft/class_5640; METHOD method_32816 getPlayerInteractionManager (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3225; ARG 1 player METHOD method_34864 getResourceManager ()Lnet/minecraft/class_3300; diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping index 49d7a83909..227480e325 100644 --- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping +++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader FIELD field_13404 manager Lnet/minecraft/class_163; FIELD field_13405 GSON Lcom/google/gson/Gson; FIELD field_13406 LOGGER Lorg/slf4j/Logger; - FIELD field_24452 conditionManager Lnet/minecraft/class_4567; - METHOD (Lnet/minecraft/class_4567;)V + METHOD (Lnet/minecraft/class_60;)V ARG 1 conditionManager METHOD method_12893 getAdvancements ()Ljava/util/Collection; METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; diff --git a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping index c57c118e82..d26679357f 100644 --- a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping @@ -9,11 +9,10 @@ CLASS net/minecraft/class_3346 net/minecraft/structure/DesertTempleGenerator ARG 1 random ARG 2 x ARG 3 z - METHOD method_49259 addPotentialSuspiciousSandPosition (IIILnet/minecraft/class_3341;)V + METHOD method_49259 addPotentialSuspiciousSandPosition (III)V ARG 1 x ARG 2 y ARG 3 z - ARG 4 chunkBox METHOD method_49260 addSandOrSandstone (Lnet/minecraft/class_5281;IIILnet/minecraft/class_3341;)V ARG 1 world ARG 2 x @@ -31,14 +30,7 @@ CLASS net/minecraft/class_3346 net/minecraft/structure/DesertTempleGenerator ARG 5 startZ ARG 6 endX ARG 7 endZ - METHOD method_49263 addPotentialSuspiciousSandArea (Lnet/minecraft/class_3341;IIIIII)V - ARG 1 chunkBox - ARG 2 startX - ARG 3 startY - ARG 4 startZ - ARG 5 endX - ARG 6 endY - ARG 7 endZ + METHOD method_49263 addPotentialSuspiciousSandArea (IIIIII)V METHOD method_49264 generateBasementStairs (Lnet/minecraft/class_2338;Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;)V ARG 1 pos ARG 2 world diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping new file mode 100644 index 0000000000..2bd3698b0b --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8501 net/minecraft/unused/packageinfo/PackageInfo8501 diff --git a/mappings/net/minecraft/util/function/MaterialPredicate.mapping b/mappings/net/minecraft/util/function/MaterialPredicate.mapping deleted file mode 100644 index bcfda4d01d..0000000000 --- a/mappings/net/minecraft/util/function/MaterialPredicate.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_2710 net/minecraft/util/function/MaterialPredicate - FIELD field_12404 IS_AIR Lnet/minecraft/class_2710; - FIELD field_12405 material Lnet/minecraft/class_3614; - METHOD (Lnet/minecraft/class_3614;)V - ARG 1 material - METHOD method_11746 create (Lnet/minecraft/class_3614;)Lnet/minecraft/class_2710; - ARG 0 material - METHOD test (Ljava/lang/Object;)Z - ARG 1 state diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index b0912a2bdb..05f7055808 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -20,16 +20,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_16420 isAirOrLeaves (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_16421 (Lnet/minecraft/class_2680;)Z - ARG 0 state - METHOD method_16422 isWater (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_16428 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251; ARG 0 world ARG 1 box diff --git a/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping b/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping index e11cd9f05c..30a6bbb0cc 100644 --- a/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_3006 net/minecraft/world/gen/structure/DesertPyramidStructure FIELD field_37791 CODEC Lcom/mojang/serialization/Codec; - METHOD method_49267 (Lnet/minecraft/class_2338;Lnet/minecraft/class_8174;)V - ARG 1 blockEntity