diff --git a/build.gradle b/build.gradle index 9b5fa74504..fb85efb983 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w45a" +def minecraft_version = "20w46a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/ResetWorldInfo.mapping b/mappings/ResetWorldInfo.mapping new file mode 100644 index 0000000000..f28b74cb4a --- /dev/null +++ b/mappings/ResetWorldInfo.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_4413 ResetWorldInfo + FIELD field_20042 seed Ljava/lang/String; + FIELD field_20043 levelType Lnet/minecraft/class_5672; + FIELD field_20044 generateStructures Z + METHOD (Ljava/lang/String;Lnet/minecraft/class_5672;Z)V + ARG 1 seed + ARG 3 generateStructures diff --git a/mappings/net/minecraft/MinecraftVersion.mapping b/mappings/net/minecraft/MinecraftVersion.mapping index 8c1518a097..6dd81ab6ce 100644 --- a/mappings/net/minecraft/MinecraftVersion.mapping +++ b/mappings/net/minecraft/MinecraftVersion.mapping @@ -12,5 +12,4 @@ CLASS net/minecraft/class_3797 net/minecraft/MinecraftVersion FIELD field_27843 resourcePackVersion I METHOD getPackVersion (Lcom/mojang/bridge/game/PackType;)I ARG 1 packType - METHOD getProtocolVersion ()I METHOD method_16672 create ()Lcom/mojang/bridge/game/GameVersion; diff --git a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping index 1022ad6eca..0bf81589fb 100644 --- a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping @@ -10,4 +10,4 @@ CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock METHOD method_31616 isEntityTouchingFluid (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z ARG 1 state ARG 2 pos - ARG 3 entity \ No newline at end of file + ARG 3 entity diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 04297cb044..c2919d144b 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 entity METHOD method_9503 getBlockFromItem (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2248; ARG 0 item - METHOD method_9504 rainTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_9504 rainTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1959$class_1963;)V ARG 1 state ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/block/CauldronBlock.mapping b/mappings/net/minecraft/block/CauldronBlock.mapping index d5165f4314..6b1d9fe8fe 100644 --- a/mappings/net/minecraft/block/CauldronBlock.mapping +++ b/mappings/net/minecraft/block/CauldronBlock.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_5546 net/minecraft/block/CauldronBlock - METHOD method_31636 canFillWithRain (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + METHOD method_31636 canFillWithRain (Lnet/minecraft/class_1937;)Z ARG 0 world - ARG 1 pos \ No newline at end of file diff --git a/mappings/net/minecraft/block/EntityShapeContext.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping index 8b3eeda5fc..e9e664ba6c 100644 --- a/mappings/net/minecraft/block/EntityShapeContext.mapping +++ b/mappings/net/minecraft/block/EntityShapeContext.mapping @@ -5,6 +5,6 @@ CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext FIELD field_17594 heldItem Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD (ZDLnet/minecraft/class_1799;Ljava/util/function/Predicate;)V + METHOD (ZDLnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Ljava/util/Optional;)V ARG 1 descending ARG 2 minY diff --git a/mappings/net/minecraft/block/FluidDrainable.mapping b/mappings/net/minecraft/block/FluidDrainable.mapping index eb043b6b9b..df812e81e2 100644 --- a/mappings/net/minecraft/block/FluidDrainable.mapping +++ b/mappings/net/minecraft/block/FluidDrainable.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2263 net/minecraft/block/FluidDrainable - METHOD method_9700 tryDrainFluid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3611; + METHOD method_9700 tryDrainFluid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; ARG 1 world ARG 2 pos ARG 3 state diff --git a/mappings/net/minecraft/block/WaterCauldronBlock.mapping b/mappings/net/minecraft/block/WaterCauldronBlock.mapping index 1780332c98..0f8e7cb896 100644 --- a/mappings/net/minecraft/block/WaterCauldronBlock.mapping +++ b/mappings/net/minecraft/block/WaterCauldronBlock.mapping @@ -3,4 +3,4 @@ CLASS net/minecraft/class_5556 net/minecraft/block/WaterCauldronBlock METHOD method_31650 subtractWaterLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 state ARG 1 world - ARG 2 pos \ No newline at end of file + ARG 2 pos diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index 401182bae0..af9f9780f2 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -15,14 +15,14 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior ARG 5 hand ARG 6 stack METHOD method_32206 createMap ()Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap; - METHOD method_32207 fillCauldron (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1269; + METHOD method_32207 fillCauldron (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; ARG 0 world ARG 1 pos ARG 2 player ARG 3 hand ARG 4 stack ARG 5 state - METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;)Lnet/minecraft/class_1269; + METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; ARG 0 state ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 41672e1d47..d660713714 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -66,7 +66,6 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 1 pos METHOD method_11379 setPowered (Z)V ARG 1 powered - METHOD method_11380 cycleMode ()V METHOD method_11381 setMode (Lnet/minecraft/class_2776;)V ARG 1 mode METHOD method_11382 setSeed (J)V diff --git a/mappings/net/minecraft/class_5629.mapping b/mappings/net/minecraft/class_5629.mapping new file mode 100644 index 0000000000..365df6a595 --- /dev/null +++ b/mappings/net/minecraft/class_5629.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5629 + METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V diff --git a/mappings/net/minecraft/class_5633.mapping b/mappings/net/minecraft/class_5633.mapping new file mode 100644 index 0000000000..29b446fb24 --- /dev/null +++ b/mappings/net/minecraft/class_5633.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5633 + METHOD method_7728 onEmptied (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V + METHOD method_7731 placeFluid (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3965;)Z diff --git a/mappings/net/minecraft/class_5658.mapping b/mappings/net/minecraft/class_5658.mapping new file mode 100644 index 0000000000..de67f3cbaa --- /dev/null +++ b/mappings/net/minecraft/class_5658.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5658 + METHOD method_365 getType ()Lnet/minecraft/class_5657; + METHOD method_366 next (Lnet/minecraft/class_47;)I diff --git a/mappings/net/minecraft/client/gui/MapRenderer.mapping b/mappings/net/minecraft/client/gui/MapRenderer.mapping index 9c8386a782..259a2c921c 100644 --- a/mappings/net/minecraft/client/gui/MapRenderer.mapping +++ b/mappings/net/minecraft/client/gui/MapRenderer.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_330 net/minecraft/client/gui/MapRenderer FIELD field_2043 textureManager Lnet/minecraft/class_1060; FIELD field_2044 MAP_ICONS_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2045 mapTextures Ljava/util/Map; - METHOD method_1768 getTexture (Ljava/lang/String;)Lnet/minecraft/class_330$class_331; - METHOD method_1769 updateTexture (Lnet/minecraft/class_22;)V + FIELD field_2045 mapTextures Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD method_1769 updateTexture (ILnet/minecraft/class_22;)V METHOD method_1771 clearStateTextures ()V - METHOD method_1772 getState (Lnet/minecraft/class_330$class_331;)Lnet/minecraft/class_22; - ARG 1 texture - METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_22;ZI)V - METHOD method_1774 getMapTexture (Lnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331; + METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_22;ZI)V CLASS class_331 MapTexture FIELD field_2046 mapState Lnet/minecraft/class_22; FIELD field_2048 texture Lnet/minecraft/class_1043; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index a14c785172..69f7094656 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -115,9 +115,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 5 color METHOD method_31406 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID; ARG 1 message - METHOD method_31976 renderOverlay (Lnet/minecraft/class_2960;)V - ARG 1 texture - METHOD method_31977 renderOverlay (Lnet/minecraft/class_2960;FI)V + METHOD method_31977 renderOverlay (Lnet/minecraft/class_2960;F)V ARG 1 texture ARG 2 scale - ARG 3 color diff --git a/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping index d8f2b417ab..58ee5e75be 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_530 net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand - FIELD field_26611 name Lnet/minecraft/class_2585; + FIELD field_26611 name Lnet/minecraft/class_2561; FIELD field_3252 skinId Lnet/minecraft/class_2960; FIELD field_3253 gameProfile Lcom/mojang/authlib/GameProfile; METHOD (Lcom/mojang/authlib/GameProfile;)V diff --git a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping index e21601dbdc..3ac401d19e 100644 --- a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/AddServerScreen FIELD field_2469 server Lnet/minecraft/class_642; FIELD field_2471 serverNameField Lnet/minecraft/class_342; FIELD field_2472 buttonAdd Lnet/minecraft/class_4185; - FIELD field_2473 resourcePackOptionButton Lnet/minecraft/class_4185; FIELD field_2474 addressField Lnet/minecraft/class_342; FIELD field_2475 addressTextFilter Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_437;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_642;)V diff --git a/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping b/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping index 421b2af6c4..eccf75e321 100644 --- a/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_436 net/minecraft/client/gui/screen/OpenToLanScreen - FIELD field_2545 gameMode Ljava/lang/String; + FIELD field_2545 gameMode Lnet/minecraft/class_5681; FIELD field_2546 allowCommands Z - FIELD field_2547 buttonAllowCommands Lnet/minecraft/class_4185; FIELD field_2548 parent Lnet/minecraft/class_437; - FIELD field_2549 buttonGameMode Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent - METHOD method_2204 updateButtonText ()V diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index d583fcbcd8..3d27f599a3 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -43,7 +43,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 link METHOD method_25417 renderOrderedTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V ARG 1 matrices - ARG 2 lines ARG 3 x ARG 4 y METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_4587;Lnet/minecraft/class_2583;II)V diff --git a/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping b/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping index b72f867606..3a5e2bf630 100644 --- a/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping @@ -8,7 +8,5 @@ CLASS net/minecraft/class_5244 net/minecraft/client/gui/screen/ScreenTexts FIELD field_24338 PROCEED Lnet/minecraft/class_2561; FIELD field_24339 BACK Lnet/minecraft/class_2561; FIELD field_26625 CONNECT_FAILED Lnet/minecraft/class_2561; - METHOD method_27654 getToggleText (Z)Lnet/minecraft/class_2561; - ARG 0 value METHOD method_30619 composeToggleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; ARG 1 value diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping index 3b7cbb1afd..c91a691b25 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_463 net/minecraft/client/gui/screen/ingame/AbstractCom FIELD field_2752 trackingOutput Z FIELD field_2753 cancelButton Lnet/minecraft/class_4185; FIELD field_2755 previousOutputTextField Lnet/minecraft/class_342; - FIELD field_2760 toggleTrackingOutputButton Lnet/minecraft/class_4185; + FIELD field_2760 toggleTrackingOutputButton Lnet/minecraft/class_5676; FIELD field_2762 doneButton Lnet/minecraft/class_4185; METHOD method_2351 getCommandExecutor ()Lnet/minecraft/class_1918; METHOD method_2352 syncSettingsToServer (Lnet/minecraft/class_1918;)V @@ -13,4 +13,3 @@ CLASS net/minecraft/class_463 net/minecraft/client/gui/screen/ingame/AbstractCom METHOD method_2360 onCommandChanged (Ljava/lang/String;)V ARG 1 text METHOD method_2364 getTrackOutputButtonHeight ()I - METHOD method_2368 updateTrackedOutput ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index 4b4bcba15b..56f31e233c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -4,9 +4,5 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_17566 drawMap (Lnet/minecraft/class_22;IIF)V - ARG 1 state - ARG 2 x - ARG 3 y - ARG 4 size - METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_22;ZZZZ)V + METHOD method_17566 drawMap (Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V + METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping index d4972b8e12..18b1d83356 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping @@ -1,15 +1,11 @@ CLASS net/minecraft/class_477 net/minecraft/client/gui/screen/ingame/CommandBlockScreen FIELD field_2865 blockEntity Lnet/minecraft/class_2593; - FIELD field_2866 redstoneTriggerButton Lnet/minecraft/class_4185; + FIELD field_2866 redstoneTriggerButton Lnet/minecraft/class_5676; FIELD field_2867 autoActivate Z FIELD field_2868 conditional Z - FIELD field_2869 modeButton Lnet/minecraft/class_4185; + FIELD field_2869 modeButton Lnet/minecraft/class_5676; FIELD field_2870 mode Lnet/minecraft/class_2593$class_2594; - FIELD field_2871 conditionalModeButton Lnet/minecraft/class_4185; + FIELD field_2871 conditionalModeButton Lnet/minecraft/class_5676; METHOD (Lnet/minecraft/class_2593;)V ARG 1 blockEntity - METHOD method_2450 cycleType ()V - METHOD method_2451 updateMode ()V - METHOD method_2452 updateConditionalMode ()V - METHOD method_2454 updateActivationMode ()V METHOD method_2457 updateCommandBlock ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping index 8935cd8006..bb4d61577b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3742 net/minecraft/client/gui/screen/ingame/JigsawBloc FIELD field_23348 nameField Lnet/minecraft/class_342; FIELD field_23349 targetField Lnet/minecraft/class_342; FIELD field_23350 poolField Lnet/minecraft/class_342; - FIELD field_23351 jointRotationButton Lnet/minecraft/class_4185; + FIELD field_23351 jointRotationButton Lnet/minecraft/class_5676; FIELD field_23352 joint Lnet/minecraft/class_3751$class_4991; FIELD field_24052 generationDepth I FIELD field_25271 keepJigsaws Z @@ -15,5 +15,4 @@ 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 ()Lnet/minecraft/class_2561; METHOD method_27272 generate ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping index ade9450436..31bf6b51a8 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_497 net/minecraft/client/gui/screen/ingame/StructureBlockScreen - FIELD field_2977 buttonMode Lnet/minecraft/class_4185; FIELD field_2978 inputSizeZ Lnet/minecraft/class_342; - FIELD field_2979 buttonMirror Lnet/minecraft/class_4185; + FIELD field_2979 buttonMirror Lnet/minecraft/class_5676; FIELD field_2980 structureBlock Lnet/minecraft/class_2633; FIELD field_2981 buttonRotate90 Lnet/minecraft/class_4185; FIELD field_2982 inputPosX Lnet/minecraft/class_342; @@ -10,37 +9,30 @@ CLASS net/minecraft/class_497 net/minecraft/client/gui/screen/ingame/StructureBl FIELD field_2986 inputMetadata Lnet/minecraft/class_342; FIELD field_2987 buttonSave Lnet/minecraft/class_4185; FIELD field_2988 inputSizeX Lnet/minecraft/class_342; - FIELD field_2990 buttonEntities Lnet/minecraft/class_4185; + FIELD field_2990 buttonEntities Lnet/minecraft/class_5676; FIELD field_2991 decimalFormat Ljava/text/DecimalFormat; FIELD field_2992 inputSeed Lnet/minecraft/class_342; FIELD field_2993 buttonRotate270 Lnet/minecraft/class_4185; - FIELD field_2994 buttonCancel Lnet/minecraft/class_4185; FIELD field_2995 buttonRotate0 Lnet/minecraft/class_4185; FIELD field_2996 mirror Lnet/minecraft/class_2415; FIELD field_2997 showAir Z FIELD field_2998 inputSizeY Lnet/minecraft/class_342; FIELD field_2999 inputPosY Lnet/minecraft/class_342; FIELD field_3000 inputIntegrity Lnet/minecraft/class_342; - FIELD field_3001 buttonShowBoundingBox Lnet/minecraft/class_4185; - FIELD field_3002 buttonDone Lnet/minecraft/class_4185; + FIELD field_3001 buttonShowBoundingBox Lnet/minecraft/class_5676; FIELD field_3003 rotation Lnet/minecraft/class_2470; FIELD field_3004 mode Lnet/minecraft/class_2776; FIELD field_3005 inputName Lnet/minecraft/class_342; FIELD field_3006 buttonLoad Lnet/minecraft/class_4185; FIELD field_3007 buttonRotate180 Lnet/minecraft/class_4185; - FIELD field_3008 buttonShowAir Lnet/minecraft/class_4185; + FIELD field_3008 buttonShowAir Lnet/minecraft/class_5676; FIELD field_3009 buttonDetect Lnet/minecraft/class_4185; FIELD field_3010 inputPosZ Lnet/minecraft/class_342; METHOD (Lnet/minecraft/class_2633;)V ARG 1 structureBlock METHOD method_2500 parseFloat (Ljava/lang/String;)F METHOD method_2504 parseLong (Ljava/lang/String;)J - METHOD method_2508 updateMirrorButton ()V - METHOD method_2509 updateMode ()V METHOD method_2510 updateRotationButton ()V - METHOD method_2511 updateShowBoundingBoxButton ()V - METHOD method_2513 updateShowAirButton ()V METHOD method_2514 cancel ()V METHOD method_2515 done ()V METHOD method_2517 parseInt (Ljava/lang/String;)I - METHOD method_2524 updateIgnoreEntitiesButton ()V diff --git a/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping index cb77e3b8e8..7d36b3e5ac 100644 --- a/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/options/LanguageOptionsScreen FIELD field_2486 languageSelectionList Lnet/minecraft/class_426$class_4195; - FIELD field_2487 forceUnicodeButton Lnet/minecraft/class_349; FIELD field_2488 languageManager Lnet/minecraft/class_1076; - FIELD field_2491 doneButton Lnet/minecraft/class_4185; FIELD field_26543 WARNING_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_1076;)V ARG 1 parent @@ -10,8 +8,6 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/options/LanguageOp ARG 3 languageManager METHOD method_19820 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19821 (Lnet/minecraft/class_4185;)V - ARG 1 button CLASS class_4195 LanguageSelectionListWidget METHOD (Lnet/minecraft/class_426;Lnet/minecraft/class_310;)V ARG 2 client diff --git a/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping index 1662241b1b..4bf81b2bf7 100644 --- a/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/options/OptionsScreen - FIELD field_18745 difficulty Lnet/minecraft/class_1267; - FIELD field_2500 difficultyButton Lnet/minecraft/class_4185; + FIELD field_2500 difficultyButton Lnet/minecraft/class_5676; FIELD field_2501 parent Lnet/minecraft/class_437; FIELD field_2502 settings Lnet/minecraft/class_315; FIELD field_2503 lockDifficultyButton Lnet/minecraft/class_347; @@ -26,15 +25,9 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/options/OptionsScr ARG 1 button METHOD method_19830 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19831 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_19832 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19833 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_20374 lockDifficulty (Z)V ARG 1 difficultyLocked - METHOD method_2189 getDifficultyButtonText (Lnet/minecraft/class_1267;)Lnet/minecraft/class_2561; - ARG 1 difficulty METHOD method_29975 refreshResourcePacks (Lnet/minecraft/class_3283;)V ARG 1 resourcePackManager diff --git a/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping index fd4625b05f..60ee196e7b 100644 --- a/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping @@ -2,11 +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_19852 (Lnet/minecraft/class_1664;Lnet/minecraft/class_4185;)V - ARG 2 button METHOD method_19853 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19854 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_2248 getPlayerModelPartDisplayString (Lnet/minecraft/class_1664;)Lnet/minecraft/class_2561; - ARG 1 part diff --git a/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping index d94e93e0a2..dcdd98e2f6 100644 --- a/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/options/SoundOptio ARG 2 options METHOD method_19855 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19856 (Lnet/minecraft/class_4185;)V - ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping index a5a7d5ab81..3374822dcc 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping @@ -1,8 +1,3 @@ CLASS net/minecraft/class_517 net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen - FIELD field_3149 fuels Ljava/util/Set; - FIELD field_3150 outputSlot Lnet/minecraft/class_1735; - FIELD field_3151 frameTime F - FIELD field_3152 currentItem Lnet/minecraft/class_1792; - FIELD field_3153 fuelIterator Ljava/util/Iterator; + FIELD field_3149 fuels Lnet/minecraft/class_1856; METHOD method_17065 getAllowedFuels ()Ljava/util/Set; - METHOD method_2658 getItem ()Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index ac2841933a..d6a8dee1d9 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldScreen - FIELD field_24286 difficultyButton Lnet/minecraft/class_4185; + FIELD field_24286 difficultyButton Lnet/minecraft/class_5676; FIELD field_24287 gameRulesButton Lnet/minecraft/class_4185; FIELD field_24288 gameRules Lnet/minecraft/class_1928; FIELD field_24588 moreOptionsDialog Lnet/minecraft/class_5292; FIELD field_25478 dataPacksButton Lnet/minecraft/class_4185; FIELD field_3178 hardcore Z FIELD field_3179 tweakedCheats Z - FIELD field_3182 enableCheatsButton Lnet/minecraft/class_4185; + FIELD field_3182 enableCheatsButton Lnet/minecraft/class_5676; FIELD field_3185 lastMode Lnet/minecraft/class_525$class_4539; - FIELD field_3186 gameModeSwitchButton Lnet/minecraft/class_4185; + FIELD field_3186 gameModeSwitchButton Lnet/minecraft/class_5676; FIELD field_3187 parent Lnet/minecraft/class_437; FIELD field_3188 levelNameField Lnet/minecraft/class_342; FIELD field_3192 cheatsEnabled Z @@ -21,8 +21,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3202 moreOptionsOpen Z FIELD field_3205 createLevelButton Lnet/minecraft/class_4185; METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V - METHOD method_23493 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_2710 setMoreOptionsOpen (Z)V ARG 1 moreOptionsOpen METHOD method_2721 toggleMoreOptions ()V @@ -31,8 +29,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_2736 createLevel ()V METHOD method_27615 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_27618 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_28084 setMoreOptionsOpen ()V METHOD method_29692 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index ba6eae3501..a2d869c789 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul ARG 1 ruleWidget METHOD method_27632 updateDoneButton ()V CLASS class_5236 BooleanRuleWidget - FIELD field_24300 toggleButton Lnet/minecraft/class_4185; + FIELD field_24300 toggleButton Lnet/minecraft/class_5676; METHOD (Lnet/minecraft/class_5235;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_1928$class_4310;)V ARG 2 name ARG 3 description diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping index 602d6a8b7d..bd5f61446b 100644 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptionsDialog - FIELD field_24589 bonusItemsButton Lnet/minecraft/class_4185; + FIELD field_24589 bonusItemsButton Lnet/minecraft/class_5676; FIELD field_24591 AMPLIFIED_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_24592 textRenderer Lnet/minecraft/class_327; FIELD field_24593 parentWidth I FIELD field_24594 seedTextField Lnet/minecraft/class_342; - FIELD field_24595 mapFeaturesButton Lnet/minecraft/class_4185; - FIELD field_24596 mapTypeButton Lnet/minecraft/class_4185; + FIELD field_24595 mapFeaturesButton Lnet/minecraft/class_5676; + FIELD field_24596 mapTypeButton Lnet/minecraft/class_5676; FIELD field_24597 customizeTypeButton Lnet/minecraft/class_4185; FIELD field_24598 generatorOptions Lnet/minecraft/class_5285; FIELD field_24600 seed Ljava/util/OptionalLong; diff --git a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping index d8d7f5cf8b..686fcfead5 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget METHOD method_31046 getButtonFor (Lnet/minecraft/class_316;)Lnet/minecraft/class_339; CLASS class_354 ButtonEntry FIELD field_18214 buttons Ljava/util/List; - METHOD (Ljava/util/List;)V - ARG 1 buttons METHOD method_18622 (ILnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V ARG 5 button METHOD method_20409 create (Lnet/minecraft/class_315;ILnet/minecraft/class_316;)Lnet/minecraft/class_353$class_354; diff --git a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping index 561de89cb4..78da25452e 100644 --- a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSliderWidget FIELD field_18012 option Lnet/minecraft/class_4067; - METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_4067;)V + METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_4067;Ljava/util/List;)V ARG 1 gameOptions ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping deleted file mode 100644 index 126a650703..0000000000 --- a/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_349 net/minecraft/client/gui/widget/OptionButtonWidget - FIELD field_18970 option Lnet/minecraft/class_316; - 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 7 pressAction - METHOD method_29623 getOption ()Lnet/minecraft/class_316; diff --git a/mappings/net/minecraft/client/options/BooleanOption.mapping b/mappings/net/minecraft/client/options/BooleanOption.mapping deleted file mode 100644 index 2d80005d8d..0000000000 --- a/mappings/net/minecraft/client/options/BooleanOption.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_4062 net/minecraft/client/options/BooleanOption - FIELD field_18158 getter Ljava/util/function/Predicate; - FIELD field_18159 setter Ljava/util/function/BiConsumer; - METHOD (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V - ARG 1 key - ARG 2 getter - ARG 3 setter - METHOD method_18491 toggle (Lnet/minecraft/class_315;)V - ARG 1 options - METHOD method_18492 set (Lnet/minecraft/class_315;Ljava/lang/String;)V - ARG 1 options - ARG 2 value - METHOD method_18493 set (Lnet/minecraft/class_315;Z)V - ARG 1 options - ARG 2 value - METHOD method_18494 get (Lnet/minecraft/class_315;)Z - ARG 1 options - METHOD method_18495 getDisplayString (Lnet/minecraft/class_315;)Lnet/minecraft/class_2561; - ARG 1 options - METHOD method_19786 (Lnet/minecraft/class_315;Lnet/minecraft/class_4185;)V - ARG 2 button diff --git a/mappings/net/minecraft/client/options/CloudRenderMode.mapping b/mappings/net/minecraft/client/options/CloudRenderMode.mapping index b56c80ff12..23c7e0a11d 100644 --- a/mappings/net/minecraft/client/options/CloudRenderMode.mapping +++ b/mappings/net/minecraft/client/options/CloudRenderMode.mapping @@ -6,6 +6,4 @@ CLASS net/minecraft/class_4063 net/minecraft/client/options/CloudRenderMode ARG 3 id ARG 4 translationKey METHOD method_18496 getId ()I - METHOD method_18497 byId (I)Lnet/minecraft/class_4063; - ARG 0 id METHOD method_18498 getTranslationKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/CyclingOption.mapping b/mappings/net/minecraft/client/options/CyclingOption.mapping index 7d94cc117e..9e7a2f494b 100644 --- a/mappings/net/minecraft/client/options/CyclingOption.mapping +++ b/mappings/net/minecraft/client/options/CyclingOption.mapping @@ -1,14 +1,4 @@ CLASS net/minecraft/class_4064 net/minecraft/client/options/CyclingOption - FIELD field_18169 setter Ljava/util/function/BiConsumer; - FIELD field_18170 messageProvider Ljava/util/function/BiFunction; - METHOD (Ljava/lang/String;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;)V + FIELD field_18169 setter Lnet/minecraft/class_4064$class_5675; + METHOD (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;Ljava/util/function/Supplier;)V ARG 1 key - ARG 2 setter - ARG 3 messageProvider - METHOD method_18500 cycle (Lnet/minecraft/class_315;I)V - ARG 1 options - ARG 2 amount - METHOD method_18501 getMessage (Lnet/minecraft/class_315;)Lnet/minecraft/class_2561; - ARG 1 options - METHOD method_19787 (Lnet/minecraft/class_315;Lnet/minecraft/class_4185;)V - ARG 2 button diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index 63efaa6e11..d948dfbd0c 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -120,10 +120,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions ARG 1 manager METHOD method_1630 getSoundVolume (Lnet/minecraft/class_3419;)F ARG 1 category - METHOD method_1631 togglePlayerModelPart (Lnet/minecraft/class_1664;)V + METHOD method_1631 togglePlayerModelPart (Lnet/minecraft/class_1664;Z)V ARG 1 part METHOD method_1632 getCloudRenderMode ()Lnet/minecraft/class_4063; - METHOD method_1633 getEnabledPlayerModelParts ()Ljava/util/Set; METHOD method_1634 parseFloat (Ljava/lang/String;)F METHOD method_1635 setPlayerModelPart (Lnet/minecraft/class_1664;Z)V ARG 1 part diff --git a/mappings/net/minecraft/client/options/GraphicsMode.mapping b/mappings/net/minecraft/client/options/GraphicsMode.mapping index 932e0f11e6..8860320e80 100644 --- a/mappings/net/minecraft/client/options/GraphicsMode.mapping +++ b/mappings/net/minecraft/client/options/GraphicsMode.mapping @@ -9,4 +9,3 @@ CLASS net/minecraft/class_5365 net/minecraft/client/options/GraphicsMode METHOD method_29592 byId (I)Lnet/minecraft/class_5365; ARG 0 id METHOD method_29593 getTranslationKey ()Ljava/lang/String; - METHOD method_29595 next ()Lnet/minecraft/class_5365; diff --git a/mappings/net/minecraft/client/options/Option.mapping b/mappings/net/minecraft/client/options/Option.mapping index 4626874eeb..4cc5e5ae64 100644 --- a/mappings/net/minecraft/client/options/Option.mapping +++ b/mappings/net/minecraft/client/options/Option.mapping @@ -1,34 +1,34 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option - FIELD field_18184 ENTITY_SHADOWS Lnet/minecraft/class_4062; - FIELD field_18185 FORCE_UNICODE_FONT Lnet/minecraft/class_4062; - FIELD field_18186 REALMS_NOTIFICATIONS Lnet/minecraft/class_4062; - FIELD field_18187 REDUCED_DEBUG_INFO Lnet/minecraft/class_4062; - FIELD field_18188 SUBTITLES Lnet/minecraft/class_4062; + FIELD field_18184 ENTITY_SHADOWS Lnet/minecraft/class_4064; + FIELD field_18185 FORCE_UNICODE_FONT Lnet/minecraft/class_4064; + FIELD field_18186 REALMS_NOTIFICATIONS Lnet/minecraft/class_4064; + FIELD field_18187 REDUCED_DEBUG_INFO Lnet/minecraft/class_4064; + FIELD field_18188 SUBTITLES Lnet/minecraft/class_4064; FIELD field_18189 BIOME_BLEND_RADIUS Lnet/minecraft/class_4067; FIELD field_18190 MIPMAP_LEVELS Lnet/minecraft/class_4067; FIELD field_18191 MOUSE_WHEEL_SENSITIVITY Lnet/minecraft/class_4067; FIELD field_18192 ATTACK_INDICATOR Lnet/minecraft/class_4064; FIELD field_18193 MAIN_HAND Lnet/minecraft/class_4064; FIELD field_18194 NARRATOR Lnet/minecraft/class_4064; - FIELD field_18195 AUTO_JUMP Lnet/minecraft/class_4062; - FIELD field_18196 AUTO_SUGGESTIONS Lnet/minecraft/class_4062; + FIELD field_18195 AUTO_JUMP Lnet/minecraft/class_4064; + FIELD field_18196 AUTO_SUGGESTIONS Lnet/minecraft/class_4064; FIELD field_18723 TEXT_BACKGROUND_OPACITY Lnet/minecraft/class_4067; FIELD field_18724 TEXT_BACKGROUND Lnet/minecraft/class_4064; - FIELD field_1917 CHAT_COLOR Lnet/minecraft/class_4062; + FIELD field_1917 CHAT_COLOR Lnet/minecraft/class_4064; FIELD field_1919 PARTICLES Lnet/minecraft/class_4064; - FIELD field_1920 CHAT_LINKS Lnet/minecraft/class_4062; + FIELD field_1920 CHAT_LINKS Lnet/minecraft/class_4064; FIELD field_1921 CHAT_OPACITY Lnet/minecraft/class_4067; FIELD field_1922 GUI_SCALE Lnet/minecraft/class_4064; FIELD field_1923 VISIBILITY Lnet/minecraft/class_4064; - FIELD field_19243 DISCRETE_MOUSE_SCROLL Lnet/minecraft/class_4062; + FIELD field_19243 DISCRETE_MOUSE_SCROLL Lnet/minecraft/class_4064; FIELD field_1924 AO Lnet/minecraft/class_4064; - FIELD field_1925 CHAT_LINKS_PROMPT Lnet/minecraft/class_4062; - FIELD field_1926 SNOOPER Lnet/minecraft/class_4062; - FIELD field_1927 VSYNC Lnet/minecraft/class_4062; - FIELD field_1930 TOUCHSCREEN Lnet/minecraft/class_4062; - FIELD field_1932 FULLSCREEN Lnet/minecraft/class_4062; + FIELD field_1925 CHAT_LINKS_PROMPT Lnet/minecraft/class_4064; + FIELD field_1926 SNOOPER Lnet/minecraft/class_4064; + FIELD field_1927 VSYNC Lnet/minecraft/class_4064; + FIELD field_1930 TOUCHSCREEN Lnet/minecraft/class_4064; + FIELD field_1932 FULLSCREEN Lnet/minecraft/class_4064; FIELD field_1933 RENDER_DISTANCE Lnet/minecraft/class_4067; - FIELD field_1934 VIEW_BOBBING Lnet/minecraft/class_4062; + FIELD field_1934 VIEW_BOBBING Lnet/minecraft/class_4064; FIELD field_1935 FRAMERATE_LIMIT Lnet/minecraft/class_4067; FIELD field_1937 CLOUDS Lnet/minecraft/class_4064; FIELD field_1938 GRAPHICS Lnet/minecraft/class_4064; @@ -38,16 +38,15 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option FIELD field_1944 SENSITIVITY Lnet/minecraft/class_4067; FIELD field_1945 GAMMA Lnet/minecraft/class_4067; FIELD field_1946 CHAT_SCALE Lnet/minecraft/class_4067; - FIELD field_1963 INVERT_MOUSE Lnet/minecraft/class_4062; + FIELD field_1963 INVERT_MOUSE Lnet/minecraft/class_4064; FIELD field_1964 FOV Lnet/minecraft/class_4067; FIELD field_1966 key Lnet/minecraft/class_2561; - FIELD field_20307 RAW_MOUSE_INPUT Lnet/minecraft/class_4062; + FIELD field_20307 RAW_MOUSE_INPUT Lnet/minecraft/class_4064; FIELD field_21330 SNEAK_TOGGLED Lnet/minecraft/class_4064; FIELD field_21331 SPRINT_TOGGLED Lnet/minecraft/class_4064; FIELD field_23930 CHAT_LINE_SPACING Lnet/minecraft/class_4067; FIELD field_23931 CHAT_DELAY_INSTANT Lnet/minecraft/class_4067; FIELD field_24213 ENTITY_DISTANCE_SCALING Lnet/minecraft/class_4067; - FIELD field_25442 tooltip Ljava/util/Optional; FIELD field_25672 FAST_GRAPHICS_TOOLTIP Lnet/minecraft/class_2561; FIELD field_25673 FABULOUS_GRAPHICS_TOOLTIP Lnet/minecraft/class_2561; FIELD field_25674 FANCY_GRAPHICS_TOOLTIP Lnet/minecraft/class_2561; @@ -68,222 +67,120 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option METHOD method_18517 (Lnet/minecraft/class_315;)Ljava/lang/Double; ARG 0 gameOptions METHOD method_18518 getDisplayPrefix ()Lnet/minecraft/class_2561; - METHOD method_18519 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions METHOD method_18520 createButton (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339; ARG 1 options ARG 2 x ARG 3 y ARG 4 width - METHOD method_18521 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18522 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18523 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18523 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 bobView METHOD method_18524 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 mouseSensitivity - METHOD method_18525 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18526 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18527 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18528 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18529 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18529 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 fullscreen METHOD method_18530 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 viewDistance - METHOD method_18531 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18532 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18533 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18534 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18534 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 touchscreen METHOD method_18535 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 mouseWheelSensitivity - METHOD method_18536 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18537 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18538 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18539 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18540 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18540 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 snooperEnabled METHOD method_18541 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 mipmapLevels - METHOD method_18542 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18543 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18544 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18545 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18546 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18546 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 showSubtitles METHOD method_18547 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 gamma - METHOD method_18548 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V + METHOD method_18552 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 amount - METHOD method_18549 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18550 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option - METHOD method_18552 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V - ARG 0 gameOptions - ARG 1 reducedDebugInfo - METHOD method_18554 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18555 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18556 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18557 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18558 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18558 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 realmsNotifications METHOD method_18559 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 maxFps - METHOD method_18560 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18561 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18562 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18563 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18564 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18564 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 invertYMouse METHOD method_18565 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 fov - METHOD method_18566 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18567 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18568 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_18569 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18570 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18570 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 forceUnicodeFont METHOD method_18571 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 chatWidth - METHOD method_18572 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_18573 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions METHOD method_18574 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18575 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18575 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 entityShadows METHOD method_18576 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 chatScale - METHOD method_18577 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions METHOD method_18578 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18579 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18579 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 enableVsync METHOD method_18580 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 chatOpacity - METHOD method_18581 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions METHOD method_18582 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18583 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18583 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 chatLinksPrompt METHOD method_18584 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 chatHeightUnfocused - METHOD method_18585 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions METHOD method_18586 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18587 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18587 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 chatLinks METHOD method_18588 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 chatHeightFocused - METHOD method_18589 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions METHOD method_18590 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18591 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_18591 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 chatColors METHOD method_18592 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 biomeBlendRadius - METHOD method_18593 (Lnet/minecraft/class_315;)Z + METHOD method_18594 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - METHOD method_18594 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V - ARG 0 gameOptions - ARG 1 autoSuggestions - METHOD method_18595 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_18596 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V - ARG 0 gameOptions - ARG 1 autoJump - METHOD method_18597 (Lnet/minecraft/class_315;)Z + METHOD method_18596 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions METHOD method_18598 (Lnet/minecraft/class_315;)Ljava/lang/Double; ARG 0 gameOptions @@ -301,42 +198,18 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option ARG 0 gameOptions METHOD method_18606 (Lnet/minecraft/class_315;)Ljava/lang/Double; ARG 0 gameOptions - METHOD method_19338 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_19339 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option METHOD method_19340 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 textBackgroundOpacity - METHOD method_19341 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount METHOD method_19342 (Lnet/minecraft/class_315;)Ljava/lang/Double; ARG 0 gameOptions - METHOD method_20404 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V + METHOD method_20404 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - ARG 1 discreteMouseScroll - METHOD method_20405 (Lnet/minecraft/class_315;)Z + METHOD method_21669 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions - METHOD method_21669 (Lnet/minecraft/class_315;Ljava/lang/Boolean;)V - ARG 0 gameOptions - ARG 1 rawMouseInput - METHOD method_21670 (Lnet/minecraft/class_315;)Z - ARG 0 gameOptions - METHOD method_23482 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option - METHOD method_23483 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount - METHOD method_23484 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option - METHOD method_23485 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V - ARG 0 gameOptions - ARG 1 amount METHOD method_27140 (Lnet/minecraft/class_315;)Ljava/lang/Double; ARG 0 gameOptions METHOD method_27141 (Lnet/minecraft/class_315;)Ljava/lang/Double; @@ -361,9 +234,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option ARG 1 entityDistanceScaling METHOD method_27469 (Lnet/minecraft/class_315;)Ljava/lang/Double; ARG 0 gameOptions - METHOD method_29618 setTooltip (Ljava/util/List;)V - ARG 1 tooltip - METHOD method_29619 getTooltip ()Ljava/util/Optional; METHOD method_30500 getPixelLabel (I)Lnet/minecraft/class_2561; ARG 1 pixel METHOD method_30501 getGenericLabel (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; @@ -378,15 +248,9 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option ARG 0 gameOptions METHOD method_31038 (Lnet/minecraft/class_315;)Ljava/lang/Double; ARG 0 gameOptions - METHOD method_31039 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_31040 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 distortionEffectScale - METHOD method_31041 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; - ARG 0 gameOptions - ARG 1 option METHOD method_31042 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 fovEffectScale diff --git a/mappings/net/minecraft/client/realms/RealmsClient.mapping b/mappings/net/minecraft/client/realms/RealmsClient.mapping index 8431a9386a..dd6e04915d 100644 --- a/mappings/net/minecraft/client/realms/RealmsClient.mapping +++ b/mappings/net/minecraft/client/realms/RealmsClient.mapping @@ -27,11 +27,8 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient METHOD method_20994 uninvite (JLjava/lang/String;)V ARG 1 worldId ARG 3 profileUuid - METHOD method_20995 resetWorldWithSeed (JLjava/lang/String;Ljava/lang/Integer;Z)Ljava/lang/Boolean; + METHOD method_20995 resetWorldWithSeed (JLnet/minecraft/class_4413;)Ljava/lang/Boolean; ARG 1 worldId - ARG 3 seed - ARG 4 levelType - ARG 5 generateStructures METHOD method_20996 initializeWorld (JLjava/lang/String;Ljava/lang/String;)V ARG 1 worldId ARG 3 name diff --git a/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping b/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping index e396617c1f..9252e1fb85 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping @@ -1,29 +1,19 @@ CLASS net/minecraft/class_4883 net/minecraft/client/realms/dto/RealmsWorldOptions - FIELD field_22632 pvp Ljava/lang/Boolean; - FIELD field_22633 spawnAnimals Ljava/lang/Boolean; - FIELD field_22634 spawnMonsters Ljava/lang/Boolean; - FIELD field_22635 spawnNPCs Ljava/lang/Boolean; - FIELD field_22636 spawnProtection Ljava/lang/Integer; - FIELD field_22637 commandBlocks Ljava/lang/Boolean; - FIELD field_22638 forceGameMode Ljava/lang/Boolean; - FIELD field_22639 difficulty Ljava/lang/Integer; - FIELD field_22640 gameMode Ljava/lang/Integer; + FIELD field_22632 pvp Z + FIELD field_22633 spawnAnimals Z + FIELD field_22634 spawnMonsters Z + FIELD field_22635 spawnNPCs Z + FIELD field_22636 spawnProtection I + FIELD field_22637 commandBlocks Z + FIELD field_22638 forceGameMode Z + FIELD field_22639 difficulty I + FIELD field_22640 gameMode I FIELD field_22641 slotName Ljava/lang/String; FIELD field_22642 templateId J FIELD field_22643 templateImage Ljava/lang/String; - FIELD field_22644 adventureMap Z FIELD field_22645 empty Z FIELD field_22646 DEFAULT_WORLD_TEMPLATE_IMAGE Ljava/lang/String; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;)V - ARG 1 pvp - ARG 2 spawnAnimals - ARG 3 spawnMonsters - ARG 4 spawnNPCs - ARG 5 spawnProtection - ARG 6 commandBlocks - ARG 7 difficulty - ARG 8 gameMode - ARG 9 forceGameMode + METHOD (ZZZZIZIIZLjava/lang/String;)V ARG 10 slotName METHOD method_25076 getDefaults ()Lnet/minecraft/class_4883; METHOD method_25077 getSlotName (I)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping index 610a838ed3..d80e30d04f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping @@ -1,8 +1,3 @@ CLASS net/minecraft/class_4409 net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen - FIELD field_19982 parent 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; - METHOD (Lnet/minecraft/class_4410;Lnet/minecraft/class_2561;)V - ARG 1 parent diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping index bf9e3588bb..a2837663da 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese 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; FIELD field_22708 NEW_WORLD_TEXTURE Lnet/minecraft/class_2960; FIELD field_22709 EXPERIENCE_TEXTURE Lnet/minecraft/class_2960; FIELD field_22710 INSPIRATION_TEXTURE Lnet/minecraft/class_2960; @@ -25,18 +24,11 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese ARG 2 x ARG 3 y ARG 4 text - METHOD method_21372 resetWorld (Lnet/minecraft/class_4410$class_4413;)V - ARG 1 resetWorldInfo METHOD method_21376 setResetTitle (Lnet/minecraft/class_2561;)V METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V ARG 1 callback - METHOD method_21378 switchSlot ()V METHOD method_21379 setSlot (I)V ARG 1 slot - METHOD method_21380 resetWorldWithTemplate (Lnet/minecraft/class_4890;)V - ARG 1 template - METHOD method_21381 triggerResetWorld (Lnet/minecraft/class_4410$class_4413;)V - ARG 1 resetWorldInfo METHOD method_21384 frame (I)I ARG 1 i CLASS class_4411 FrameButton @@ -44,21 +36,3 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese 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 - CLASS class_4412 ResetType - FIELD field_20034 NONE Lnet/minecraft/class_4410$class_4412; - FIELD field_20035 GENERATE Lnet/minecraft/class_4410$class_4412; - FIELD field_20036 UPLOAD Lnet/minecraft/class_4410$class_4412; - FIELD field_20037 ADVENTURE Lnet/minecraft/class_4410$class_4412; - FIELD field_20038 SURVIVAL_SPAWN Lnet/minecraft/class_4410$class_4412; - FIELD field_20039 EXPERIENCE Lnet/minecraft/class_4410$class_4412; - FIELD field_20040 INSPIRATION Lnet/minecraft/class_4410$class_4412; - METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4410$class_4412; - ARG 0 name - CLASS class_4413 ResetWorldInfo - FIELD field_20042 seed Ljava/lang/String; - FIELD field_20043 levelType I - FIELD field_20044 generateStructures Z - METHOD (Ljava/lang/String;IZ)V - ARG 1 seed - ARG 2 levelType - ARG 3 generateStructures diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsScreenWithCallback.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsScreenWithCallback.mapping deleted file mode 100644 index aaeeaca327..0000000000 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsScreenWithCallback.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4415 net/minecraft/client/realms/gui/screen/RealmsScreenWithCallback - METHOD method_21395 callback (Lnet/minecraft/class_4890;)V - ARG 1 template diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping index 383fdaf392..17207aa643 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen FIELD field_20069 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_20070 parent Lnet/minecraft/class_4415; FIELD field_20071 templateList Lnet/minecraft/class_4419$class_4420; FIELD field_20072 selectedTemplate I FIELD field_20073 title Lnet/minecraft/class_2561; @@ -19,11 +18,9 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_22719 LINK_ICONS Lnet/minecraft/class_2960; FIELD field_22720 TRAILER_ICONS Lnet/minecraft/class_2960; FIELD field_22721 SLOT_FRAME Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_4415;Lnet/minecraft/class_4877$class_4321;)V - ARG 1 parent + METHOD (Ljava/util/function/Consumer;Lnet/minecraft/class_4877$class_4321;)V ARG 2 worldType - METHOD (Lnet/minecraft/class_4415;Lnet/minecraft/class_4877$class_4321;Lnet/minecraft/class_4891;)V - ARG 1 parent + METHOD (Ljava/util/function/Consumer;Lnet/minecraft/class_4877$class_4321;Lnet/minecraft/class_4891;)V ARG 2 worldType ARG 3 list METHOD method_21415 setPagination (Lnet/minecraft/class_4891;)V @@ -35,7 +32,6 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele METHOD method_21430 shouldSelectButtonBeActive ()Z METHOD method_21432 shouldPublisherBeVisible ()Z METHOD method_21436 shouldTrailerBeVisible ()Z - METHOD method_21438 backButtonClicked ()V METHOD method_21440 selectTemplate ()V METHOD method_21442 onTrailer ()V METHOD method_21444 onPublish ()V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping index 4013021b37..4221a7d767 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping @@ -3,47 +3,29 @@ CLASS net/minecraft/class_4423 net/minecraft/client/realms/gui/screen/RealmsSlot FIELD field_20109 parent Lnet/minecraft/class_4388; FIELD field_20113 nameEdit Lnet/minecraft/class_342; FIELD field_20114 column1_x I - FIELD field_20115 column_width I FIELD field_20116 column2_x I FIELD field_20117 options Lnet/minecraft/class_4883; FIELD field_20118 worldType Lnet/minecraft/class_4877$class_4321; FIELD field_20119 activeSlot I FIELD field_20120 difficultyIndex I - FIELD field_20121 gameModeIndex I - FIELD field_20122 pvp Ljava/lang/Boolean; - FIELD field_20123 spawnNPCs Ljava/lang/Boolean; - FIELD field_20124 spawnAnimals Ljava/lang/Boolean; - FIELD field_20125 spawnMonsters Ljava/lang/Boolean; - FIELD field_20126 spawnProtection Ljava/lang/Integer; - FIELD field_20127 commandBlocks Ljava/lang/Boolean; - FIELD field_20128 forceGameMode Ljava/lang/Boolean; - FIELD field_20129 pvpButton Lnet/minecraft/class_4185; - FIELD field_20130 spawnAnimalsButton Lnet/minecraft/class_4185; - FIELD field_20131 spawnMonstersButton Lnet/minecraft/class_4185; - FIELD field_20132 spawnNPCsButton Lnet/minecraft/class_4185; + FIELD field_20121 gameModeIndex Lnet/minecraft/class_5681; + FIELD field_20122 pvp Z + FIELD field_20123 spawnNPCs Z + FIELD field_20124 spawnAnimals Z + FIELD field_20125 spawnMonsters Z + FIELD field_20127 commandBlocks Z + FIELD field_20128 forceGameMode Z FIELD field_20133 spawnProtectionButton Lnet/minecraft/class_4423$class_4424; - 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 [Lnet/minecraft/class_2561; - FIELD field_22724 GAME_MODES [Lnet/minecraft/class_2561; + FIELD field_22723 DIFFICULTIES Ljava/util/List; + FIELD field_22724 GAME_MODES Ljava/util/List; 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 ()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)Lnet/minecraft/class_2561; - ARG 0 enabled CLASS class_4424 SettingsSlider FIELD field_22725 min D FIELD field_22726 max D diff --git a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping index f4822d8d93..b42acac05e 100644 --- a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping +++ b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping @@ -8,9 +8,8 @@ CLASS net/minecraft/class_4358 net/minecraft/client/realms/task/LongRunningTask METHOD method_21069 setTitle (Lnet/minecraft/class_2561;)V METHOD method_21070 init ()V METHOD method_21071 abortTask ()V - METHOD method_25287 pause (I)V + METHOD method_25287 pause (J)V COMMENT Moved from RealmsTasks in 20w10a. - ARG 0 seconds METHOD method_25289 setScreen (Lnet/minecraft/class_437;)V COMMENT Moved from Realms in 20w10a. ARG 0 screen diff --git a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping index 7303d7286e..3089e32c8a 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerD ARG 2 lastScreen ARG 3 server ARG 4 connectLock - METHOD method_21554 sleep (I)V - ARG 1 sleepTimeSeconds diff --git a/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping index a48fe049ae..c90d51957d 100644 --- a/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping +++ b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/class_4440 net/minecraft/client/realms/task/ResettingWorldTask - FIELD field_20228 seed Ljava/lang/String; - FIELD field_20229 worldTemplate Lnet/minecraft/class_4890; - FIELD field_20230 levelType I - FIELD field_20231 generateStructures Z FIELD field_20232 serverId J FIELD field_20235 title Lnet/minecraft/class_2561; FIELD field_22732 callback Ljava/lang/Runnable; - METHOD (Ljava/lang/String;Lnet/minecraft/class_4890;IZJLnet/minecraft/class_2561;Ljava/lang/Runnable;)V - ARG 1 seed - ARG 2 worldTemplate - ARG 3 levelType - ARG 4 generateStructures - ARG 5 serverId - ARG 8 callback diff --git a/mappings/net/minecraft/client/render/Camera.mapping b/mappings/net/minecraft/client/render/Camera.mapping index c9c6299eca..e7b97e1f3e 100644 --- a/mappings/net/minecraft/client/render/Camera.mapping +++ b/mappings/net/minecraft/client/render/Camera.mapping @@ -43,7 +43,7 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera METHOD method_19331 getFocusedEntity ()Lnet/minecraft/class_1297; METHOD method_19332 isReady ()Z METHOD method_19333 isThirdPerson ()Z - METHOD method_19334 getSubmergedFluidState ()Lnet/minecraft/class_3610; + METHOD method_19334 getSubmergedFluidState ()Lnet/minecraft/class_5636; METHOD method_19335 getHorizontalPlane ()Lnet/minecraft/class_1160; METHOD method_19336 getVerticalPlane ()Lnet/minecraft/class_1160; METHOD method_19337 reset ()V diff --git a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping index 258ea4b27f..2b48c9608a 100644 --- a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping @@ -4,4 +4,3 @@ CLASS net/minecraft/class_602 net/minecraft/client/render/entity/model/ShulkerEn FIELD field_3555 topShell Lnet/minecraft/class_630; METHOD method_2829 getTopShell ()Lnet/minecraft/class_630; METHOD method_2830 getHead ()Lnet/minecraft/class_630; - METHOD method_2831 getBottomShell ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/util/OrderableTooltip.mapping b/mappings/net/minecraft/client/util/OrderableTooltip.mapping index 29ce604d87..4747d3a3c4 100644 --- a/mappings/net/minecraft/client/util/OrderableTooltip.mapping +++ b/mappings/net/minecraft/client/util/OrderableTooltip.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_5499 net/minecraft/client/util/OrderableTooltip - METHOD method_31047 getOrderedTooltip ()Ljava/util/Optional; + METHOD method_31047 getOrderedTooltip ()Ljava/util/List; diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping index 738d0d9a90..e73fe45e2a 100644 --- a/mappings/net/minecraft/command/DataCommandStorage.mapping +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -6,9 +6,8 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage METHOD method_22542 getIds ()Ljava/util/stream/Stream; METHOD method_22543 getSaveKey (Ljava/lang/String;)Ljava/lang/String; ARG 0 namespace - METHOD method_22544 createStorage (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_4565$class_4566; + METHOD method_22544 createStorage (Ljava/lang/String;)Lnet/minecraft/class_4565$class_4566; ARG 1 namespace - ARG 2 saveKey METHOD method_22546 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2487; ARG 1 id METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping index dce824c3ac..0f28df2218 100644 --- a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping @@ -35,13 +35,13 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 1 drop METHOD method_10383 slabDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 drop - METHOD method_10384 drops (Lnet/minecraft/class_1935;Lnet/minecraft/class_59;)Lnet/minecraft/class_52$class_53; + METHOD method_10384 drops (Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53; ARG 0 drop ARG 1 count METHOD method_10385 mushroomBlockDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; ARG 0 dropWithSilkTouch ARG 1 drop - METHOD method_10386 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;Lnet/minecraft/class_59;)Lnet/minecraft/class_52$class_53; + METHOD method_10386 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53; ARG 0 dropWithSilkTouch ARG 1 drop ARG 2 count diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 938557628e..40fab51efa 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -498,9 +498,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5756 isInvisibleTo (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_5757 isInsideWall ()Z - METHOD method_5758 equip (ILnet/minecraft/class_1799;)Z - ARG 1 slot - ARG 2 item METHOD method_5759 updateTrackedPositionAndAngles (DDDFFIZ)V ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/entity/TntEntity.mapping b/mappings/net/minecraft/entity/TntEntity.mapping index 7a50be7e3a..43f4b7498a 100644 --- a/mappings/net/minecraft/entity/TntEntity.mapping +++ b/mappings/net/minecraft/entity/TntEntity.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1541 net/minecraft/entity/TntEntity - FIELD field_7196 fuseTimer I FIELD field_7197 FUSE Lnet/minecraft/class_2940; FIELD field_7198 causingEntity Lnet/minecraft/class_1309; METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1309;)V @@ -10,7 +9,6 @@ CLASS net/minecraft/class_1541 net/minecraft/entity/TntEntity ARG 8 igniter METHOD method_6967 setFuse (I)V ARG 1 fuse - METHOD method_6968 getFuseTimer ()I METHOD method_6969 getFuse ()I METHOD method_6970 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_6971 explode ()V diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index bc870740e3..22973466bb 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity - FIELD field_18126 PLAYER_ENDERMITE_PREDICATE Ljava/util/function/Predicate; FIELD field_20618 PROVOKED Lnet/minecraft/class_2940; FIELD field_25376 angerTime I FIELD field_25377 targetUuid Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping index a7ea3c2930..e59ca7f72b 100644 --- a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1559 net/minecraft/entity/mob/EndermiteEntity FIELD field_7250 lifeTime I - FIELD field_7251 playerSpawned Z METHOD method_20674 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type ARG 1 world @@ -8,7 +7,3 @@ CLASS net/minecraft/class_1559 net/minecraft/entity/mob/EndermiteEntity ARG 3 pos ARG 4 random METHOD method_26911 createEndermiteAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_7022 setPlayerSpawned (Z)V - ARG 1 playerSpawned - METHOD method_7023 isPlayerSpawned ()Z - COMMENT Returns whether this endermite was spawned from an ender pearl thrown by a player. diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 43cc9c9649..e3cebac6c3 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -84,9 +84,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 2 dropItem METHOD method_5933 getHoldingEntity ()Lnet/minecraft/class_1297; METHOD method_5934 isLeashed ()Z - METHOD method_5935 canEquipmentSlotContain (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)Z - ARG 0 slot - ARG 1 item METHOD method_5936 canPickUpLoot ()Z METHOD method_5937 setLeftHanded (Z)V ARG 1 leftHanded @@ -123,8 +120,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 3 maxPitchChange METHOD method_5952 setCanPickUpLoot (Z)V ARG 1 pickUpLoot - METHOD method_5953 getPreferredEquipmentSlot (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304; - ARG 0 stack METHOD method_5954 attachLeash (Lnet/minecraft/class_1297;Z)V ARG 1 entity ARG 2 sendPacket diff --git a/mappings/net/minecraft/item/BucketItem.mapping b/mappings/net/minecraft/item/BucketItem.mapping index 266db4da1a..8e05df1e3e 100644 --- a/mappings/net/minecraft/item/BucketItem.mapping +++ b/mappings/net/minecraft/item/BucketItem.mapping @@ -7,14 +7,6 @@ CLASS net/minecraft/class_1755 net/minecraft/item/BucketItem ARG 1 player ARG 2 world ARG 3 pos - METHOD method_7728 onEmptied (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 stack - ARG 3 pos - METHOD method_7731 placeFluid (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3965;)Z - ARG 1 player - ARG 2 world - ARG 3 pos METHOD method_7732 getEmptiedStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 player diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 8621f80fed..9e61a4786f 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -12,16 +12,14 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 0 map ARG 1 world ARG 2 amount - METHOD method_7997 getMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; - ARG 0 stack - ARG 1 world + METHOD method_7997 getMapState (Ljava/lang/Integer;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; METHOD method_7998 updateColors (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_22;)V ARG 1 world ARG 2 entity ARG 3 state METHOD method_7999 getMapColor (Lnet/minecraft/class_1799;)I ARG 0 stack - METHOD method_8000 createMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)Lnet/minecraft/class_22; + METHOD method_8000 createMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)V ARG 0 stack ARG 1 world ARG 2 x @@ -35,7 +33,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 1 world METHOD method_8002 fillExplorationMap (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V ARG 1 map - METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)I + METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)Ljava/lang/Integer; ARG 0 stack METHOD method_8004 hasPositiveDepth ([Lnet/minecraft/class_1959;III)Z ARG 0 biomes diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 4dd92e4e38..a5249c0bb9 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -38,15 +38,15 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_30267 isSectionHidden (ILnet/minecraft/class_1799$class_5422;)Z ARG 0 flags METHOD method_30268 addHideFlag (Lnet/minecraft/class_1799$class_5422;)V + METHOD method_31573 isIn (Lnet/minecraft/class_3494;)Z + ARG 1 tag + METHOD method_31574 isOf (Lnet/minecraft/class_1792;)Z + ARG 1 item METHOD method_31575 onStackClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_5536;Lnet/minecraft/class_1661;)Z METHOD method_31576 onClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_5536;Lnet/minecraft/class_1661;)Z METHOD method_31578 isItemBarVisible ()Z METHOD method_31579 getItemBarStep ()I METHOD method_31580 getItemBarColor ()I - METHOD method_31573 isIn (Lnet/minecraft/class_3494;)Z - ARG 1 tag - METHOD method_31574 isOf (Lnet/minecraft/class_1792;)Z - ARG 1 item METHOD method_7909 getItem ()Lnet/minecraft/class_1792; METHOD method_7910 finishUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 world diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index b526da7b4f..5ca40694f5 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -12,10 +12,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD field_122 colors [B FIELD field_123 banners Ljava/util/Map; FIELD field_17403 locked Z - METHOD method_100 getPlayerMarkerPacket (Lnet/minecraft/class_1799;Lnet/minecraft/class_1922;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2596; - ARG 1 map - ARG 2 world - ARG 3 pos + METHOD method_100 getPlayerMarkerPacket (ILnet/minecraft/class_1657;)Lnet/minecraft/class_2596; METHOD method_101 getPlayerSyncData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_22$class_23; ARG 1 player METHOD method_102 update (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V @@ -27,17 +24,6 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_104 removeFrame (Lnet/minecraft/class_2338;I)V ARG 1 pos ARG 2 id - METHOD method_105 init (IIIZZLnet/minecraft/class_5321;)V - ARG 1 x - ARG 2 z - ARG 3 scale - ARG 4 showIcons - ARG 5 unlimitedTracking - ARG 6 dimension - METHOD method_106 calculateCenter (DDI)V - ARG 1 x - ARG 3 z - ARG 5 scale METHOD method_107 addIcon (Lnet/minecraft/class_20$class_21;Lnet/minecraft/class_1936;Ljava/lang/String;DDDLnet/minecraft/class_2561;)V ARG 1 type ARG 2 world @@ -58,8 +44,6 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 1 pos ARG 2 id ARG 3 type - METHOD method_18818 copyFrom (Lnet/minecraft/class_22;)V - ARG 1 state CLASS class_23 PlayerUpdateTracker FIELD field_124 emptyPacketsRequested I FIELD field_125 player Lnet/minecraft/class_1657; @@ -73,5 +57,4 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_111 markDirty (II)V ARG 1 x ARG 2 z - METHOD method_112 getPacket (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2596; - ARG 1 stack + METHOD method_112 getPacket (I)Lnet/minecraft/class_2596; diff --git a/mappings/net/minecraft/loot/BinomialLootTableRange.mapping b/mappings/net/minecraft/loot/BinomialLootTableRange.mapping index 15b7bbe7e5..14556d1ef5 100644 --- a/mappings/net/minecraft/loot/BinomialLootTableRange.mapping +++ b/mappings/net/minecraft/loot/BinomialLootTableRange.mapping @@ -1,18 +1,7 @@ CLASS net/minecraft/class_40 net/minecraft/loot/BinomialLootTableRange - FIELD field_917 p F - FIELD field_918 n I - METHOD (IF)V - ARG 1 n - ARG 2 p + FIELD field_917 p Lnet/minecraft/class_5658; + FIELD field_918 n Lnet/minecraft/class_5658; METHOD method_273 create (IF)Lnet/minecraft/class_40; ARG 0 n ARG 1 p CLASS class_41 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 range - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/ConstantLootTableRange.mapping b/mappings/net/minecraft/loot/ConstantLootTableRange.mapping index 76259d9a76..8a6e5c7098 100644 --- a/mappings/net/minecraft/loot/ConstantLootTableRange.mapping +++ b/mappings/net/minecraft/loot/ConstantLootTableRange.mapping @@ -1,15 +1,2 @@ CLASS net/minecraft/class_44 net/minecraft/loot/ConstantLootTableRange - FIELD field_922 value I - METHOD (I)V - ARG 1 value - METHOD method_289 create (I)Lnet/minecraft/class_44; - ARG 0 value - CLASS class_45 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 range - ARG 2 unused - ARG 3 context + FIELD field_922 value F diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index 1425052a9c..af64600685 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -4,9 +4,9 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool FIELD field_954 conditions [Lnet/minecraft/class_5341; FIELD field_955 predicate Ljava/util/function/Predicate; FIELD field_956 functions [Lnet/minecraft/class_117; - FIELD field_957 rolls Lnet/minecraft/class_59; - FIELD field_958 bonusRolls Lnet/minecraft/class_61; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;Lnet/minecraft/class_59;Lnet/minecraft/class_61;)V + FIELD field_957 rolls Lnet/minecraft/class_5658; + FIELD field_958 bonusRolls Lnet/minecraft/class_5658; + METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 entries ARG 2 conditions ARG 3 functions @@ -23,14 +23,14 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool METHOD method_347 builder ()Lnet/minecraft/class_55$class_56; METHOD method_349 validate (Lnet/minecraft/class_58;)V CLASS class_56 Builder - FIELD field_959 rolls Lnet/minecraft/class_59; + FIELD field_959 rolls Lnet/minecraft/class_5658; FIELD field_960 entries Ljava/util/List; FIELD field_961 functions Ljava/util/List; - FIELD field_962 bonusRollsRange Lnet/minecraft/class_61; + FIELD field_962 bonusRollsRange Lnet/minecraft/class_5658; FIELD field_963 conditions Ljava/util/List; METHOD method_351 with (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_55$class_56; ARG 1 entry - METHOD method_352 rolls (Lnet/minecraft/class_59;)Lnet/minecraft/class_55$class_56; + METHOD method_352 rolls (Lnet/minecraft/class_5658;)Lnet/minecraft/class_55$class_56; ARG 1 rolls METHOD method_355 build ()Lnet/minecraft/class_55; CLASS class_57 Serializer diff --git a/mappings/net/minecraft/loot/LootTableRange.mapping b/mappings/net/minecraft/loot/LootTableRange.mapping deleted file mode 100644 index 335b0fbfb1..0000000000 --- a/mappings/net/minecraft/loot/LootTableRange.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_59 net/minecraft/loot/LootTableRange - FIELD field_967 UNIFORM Lnet/minecraft/class_2960; - FIELD field_968 CONSTANT Lnet/minecraft/class_2960; - FIELD field_969 BINOMIAL Lnet/minecraft/class_2960; - METHOD method_365 getType ()Lnet/minecraft/class_2960; - METHOD method_366 next (Ljava/util/Random;)I - ARG 1 random diff --git a/mappings/net/minecraft/loot/LootTableRanges.mapping b/mappings/net/minecraft/loot/LootTableRanges.mapping deleted file mode 100644 index 34c6ff4e6b..0000000000 --- a/mappings/net/minecraft/loot/LootTableRanges.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_63 net/minecraft/loot/LootTableRanges - FIELD field_978 TYPES Ljava/util/Map; - METHOD method_383 fromJson (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_59; - ARG 0 json - ARG 1 context - METHOD method_384 toJson (Lnet/minecraft/class_59;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 0 range - ARG 1 context diff --git a/mappings/net/minecraft/loot/UniformLootTableRange.mapping b/mappings/net/minecraft/loot/UniformLootTableRange.mapping deleted file mode 100644 index d2fd904886..0000000000 --- a/mappings/net/minecraft/loot/UniformLootTableRange.mapping +++ /dev/null @@ -1,26 +0,0 @@ -CLASS net/minecraft/class_61 net/minecraft/loot/UniformLootTableRange - FIELD field_976 max F - FIELD field_977 min F - METHOD (F)V - ARG 1 value - METHOD (FF)V - ARG 1 min - ARG 2 max - METHOD method_374 nextFloat (Ljava/util/Random;)F - ARG 1 random - METHOD method_376 contains (I)Z - ARG 1 value - METHOD method_377 between (FF)Lnet/minecraft/class_61; - ARG 0 min - ARG 1 max - METHOD method_378 getMinValue ()F - METHOD method_380 getMaxValue ()F - CLASS class_62 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping index 94fb6b1126..e3b08ab601 100644 --- a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping @@ -4,11 +4,7 @@ CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondi METHOD (Ljava/util/Map;Lnet/minecraft/class_47$class_50;)V ARG 1 scores ARG 2 target - METHOD method_865 entityScoreIsInRange (Lnet/minecraft/class_1297;Lnet/minecraft/class_269;Ljava/lang/String;Lnet/minecraft/class_61;)Z - ARG 1 entity - ARG 2 scoreboard - ARG 3 objective - ARG 4 scoreRange + METHOD method_865 entityScoreIsInRange (Lnet/minecraft/class_47;Lnet/minecraft/class_1297;Lnet/minecraft/class_269;Ljava/lang/String;Lnet/minecraft/class_42;)Z METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_200 Serializer diff --git a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping index dbcc929ca0..180712333a 100644 --- a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4571 net/minecraft/loot/condition/TimeCheckLootCondition FIELD field_20767 period Ljava/lang/Long; - FIELD field_20768 value Lnet/minecraft/class_61; - METHOD (Ljava/lang/Long;Lnet/minecraft/class_61;)V + FIELD field_20768 value Lnet/minecraft/class_42; + METHOD (Ljava/lang/Long;Lnet/minecraft/class_42;)V ARG 1 period ARG 2 value METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index b0ac30e8df..cc3020c778 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -1,24 +1,20 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction - FIELD field_17013 source Lnet/minecraft/class_3837$class_3840; + FIELD field_17013 source Lnet/minecraft/class_5651; FIELD field_17014 operations Ljava/util/List; - FIELD field_17015 ENTITY_TAG_GETTER Ljava/util/function/Function; - FIELD field_17016 BLOCK_ENTITY_TAG_GETTER Ljava/util/function/Function; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_3837$class_3840;Ljava/util/List;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5651;Ljava/util/List;)V ARG 1 conditions ARG 2 source ARG 3 operations METHOD method_16846 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2520;Lnet/minecraft/class_3837$class_3839;)V ARG 2 operation - METHOD method_16847 (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2520; - ARG 0 blockEntity - METHOD method_16848 builder (Lnet/minecraft/class_3837$class_3840;)Lnet/minecraft/class_3837$class_3838; + METHOD method_16848 builder (Lnet/minecraft/class_5651;)Lnet/minecraft/class_3837$class_3838; ARG 0 source METHOD method_16853 parseNbtPath (Ljava/lang/String;)Lnet/minecraft/class_2203$class_2209; ARG 0 nbtPath CLASS class_3838 Builder - FIELD field_17017 source Lnet/minecraft/class_3837$class_3840; + FIELD field_17017 source Lnet/minecraft/class_5651; FIELD field_17018 operations Ljava/util/List; - METHOD (Lnet/minecraft/class_3837$class_3840;)V + METHOD (Lnet/minecraft/class_5651;)V ARG 1 source METHOD method_16856 withOperation (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_3837$class_3838; ARG 1 source @@ -43,18 +39,6 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction METHOD method_16860 execute (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)V ARG 1 itemTagTagGetter ARG 2 sourceEntityTag - CLASS class_3840 Source - FIELD field_17028 name Ljava/lang/String; - FIELD field_17029 parameter Lnet/minecraft/class_169; - FIELD field_17030 getter Ljava/util/function/Function; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_169;Ljava/util/function/Function;)V - ARG 3 name - ARG 4 parameter - ARG 5 operator - METHOD method_16861 (Lnet/minecraft/class_169;Ljava/util/function/Function;Lnet/minecraft/class_47;)Lnet/minecraft/class_2520; - ARG 2 context - METHOD method_16862 get (Ljava/lang/String;)Lnet/minecraft/class_3837$class_3840; - ARG 0 name CLASS class_3841 Operator FIELD field_17035 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping index b94f298e9c..21624ad466 100644 --- a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootFunction - FIELD field_1026 range Lnet/minecraft/class_59; + FIELD field_1026 range Lnet/minecraft/class_5658; FIELD field_1027 treasureEnchantmentsAllowed Z - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_59;Z)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V ARG 1 conditions ARG 2 range ARG 3 treasureEnchantmentsAllowed - METHOD method_481 builder (Lnet/minecraft/class_59;)Lnet/minecraft/class_106$class_107; + METHOD method_481 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_106$class_107; ARG 0 range CLASS class_107 Builder - FIELD field_1028 range Lnet/minecraft/class_59; + FIELD field_1028 range Lnet/minecraft/class_5658; FIELD field_1029 treasureEnchantmentsAllowed Z - METHOD (Lnet/minecraft/class_59;)V + METHOD (Lnet/minecraft/class_5658;)V ARG 1 range METHOD method_484 allowTreasureEnchantments ()Lnet/minecraft/class_106$class_107; CLASS class_108 Serializer diff --git a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping index bfd02afe0f..c99923d132 100644 --- a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping @@ -1,17 +1,17 @@ CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunction - FIELD field_1082 countRange Lnet/minecraft/class_61; + FIELD field_1082 countRange Lnet/minecraft/class_5658; FIELD field_1083 limit I - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_61;I)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;I)V ARG 1 conditions ARG 2 countRange ARG 3 limit - METHOD method_547 builder (Lnet/minecraft/class_61;)Lnet/minecraft/class_125$class_126; + METHOD method_547 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_125$class_126; ARG 0 countRange METHOD method_549 hasLimit ()Z CLASS class_126 Builder - FIELD field_1084 countRange Lnet/minecraft/class_61; + FIELD field_1084 countRange Lnet/minecraft/class_5658; FIELD field_1085 limit I - METHOD (Lnet/minecraft/class_61;)V + METHOD (Lnet/minecraft/class_5658;)V ARG 1 countRange METHOD method_551 withLimit (I)Lnet/minecraft/class_125$class_126; ARG 1 limit diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index bb7c677d0d..ef7ff2d3b7 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -5,12 +5,12 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct ARG 2 attributes CLASS class_138 Attribute FIELD field_1107 name Ljava/lang/String; - FIELD field_1108 amountRange Lnet/minecraft/class_61; + FIELD field_1108 amountRange Lnet/minecraft/class_5658; FIELD field_1109 operation Lnet/minecraft/class_1322$class_1323; FIELD field_1110 attribute Lnet/minecraft/class_1320; FIELD field_1111 id Ljava/util/UUID; FIELD field_1112 slots [Lnet/minecraft/class_1304; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_61;[Lnet/minecraft/class_1304;Ljava/util/UUID;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;[Lnet/minecraft/class_1304;Ljava/util/UUID;)V ARG 1 name ARG 3 operation ARG 4 amountRange diff --git a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index 2e50f1869d..d42f1eeaee 100644 --- a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_141 net/minecraft/loot/function/SetCountLootFunction - FIELD field_1114 countRange Lnet/minecraft/class_59; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_59;)V + FIELD field_1114 countRange Lnet/minecraft/class_5658; + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V ARG 1 conditions ARG 2 countRange - METHOD method_620 (Lnet/minecraft/class_59;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_620 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions - METHOD method_621 builder (Lnet/minecraft/class_59;)Lnet/minecraft/class_120$class_121; + METHOD method_621 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 countRange CLASS class_142 Serializer diff --git a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index 74fd876774..0ea5c1c921 100644 --- a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_149 net/minecraft/loot/function/SetDamageLootFunction - FIELD field_1120 durabilityRange Lnet/minecraft/class_61; + FIELD field_1120 durabilityRange Lnet/minecraft/class_5658; FIELD field_1121 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_61;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V ARG 1 contents ARG 2 durabilityRange - METHOD method_633 builder (Lnet/minecraft/class_61;)Lnet/minecraft/class_120$class_121; + METHOD method_633 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange - METHOD method_634 (Lnet/minecraft/class_61;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_634 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions CLASS class_150 Serializer diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 9f373511b9..5804381c96 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunct METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; CLASS class_153 Builder FIELD field_1123 map Ljava/util/Map; - METHOD method_640 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_61;)Lnet/minecraft/class_152$class_153; + METHOD method_640 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; ARG 1 effect ARG 2 durationRange CLASS class_154 Serializer diff --git a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping index 194a60a0c8..947b31a4ba 100644 --- a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping +++ b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping @@ -1,12 +1,6 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator - FIELD field_919 operator Ljava/util/function/IntUnaryOperator; - FIELD field_920 max Ljava/lang/Integer; - FIELD field_921 min Ljava/lang/Integer; - METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 1 min - ARG 2 max - METHOD applyAsInt (I)I - ARG 1 value + FIELD field_920 max Lnet/minecraft/class_5658; + FIELD field_921 min Lnet/minecraft/class_5658; METHOD method_277 createMax (I)Lnet/minecraft/class_42; ARG 0 max METHOD method_280 createMin (I)Lnet/minecraft/class_42; @@ -14,12 +8,12 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator METHOD method_282 create (II)Lnet/minecraft/class_42; ARG 0 min ARG 1 max - CLASS class_43 Serializer + CLASS class_62 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson + ARG 1 json ARG 2 unused ARG 3 context METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 op - ARG 2 type + ARG 1 entry + ARG 2 unused ARG 3 context diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index b7dbee8487..7f3a38c40f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -1,24 +1,11 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket FIELD field_12296 scale B - FIELD field_12297 height I - FIELD field_12298 colors [B - FIELD field_12299 width I - FIELD field_12300 startZ I - FIELD field_12301 startX I - FIELD field_12302 showIcons Z FIELD field_12303 id I FIELD field_12304 icons [Lnet/minecraft/class_20; FIELD field_17433 locked Z - METHOD (IBZZLjava/util/Collection;[BIIII)V + METHOD (IBZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V ARG 1 id ARG 2 scale ARG 3 showIcons - ARG 4 locked - ARG 5 icons - ARG 6 mapColors - ARG 7 startX - ARG 8 startZ - ARG 9 width - ARG 10 height METHOD method_11642 apply (Lnet/minecraft/class_22;)V METHOD method_11644 getId ()I diff --git a/mappings/net/minecraft/recipe/FurnaceInputSlotFiller.mapping b/mappings/net/minecraft/recipe/FurnaceInputSlotFiller.mapping deleted file mode 100644 index 264bde0633..0000000000 --- a/mappings/net/minecraft/recipe/FurnaceInputSlotFiller.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2958 net/minecraft/recipe/FurnaceInputSlotFiller - FIELD field_13351 slotMatchesRecipe Z - METHOD method_12827 fillInputSlot (ILit/unimi/dsi/fastutil/ints/IntList;)V - ARG 1 limit - ARG 2 inputs diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index c36c3ac277..da2186db93 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -7,10 +7,9 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller ARG 1 craftAll ARG 2 limit ARG 3 recipeInCraftingSlots - METHOD method_12820 returnSlot (I)V METHOD method_12821 fillInputSlots (Lnet/minecraft/class_1860;Z)V ARG 2 craftAll - METHOD method_12822 returnInputs ()V + METHOD method_12822 returnInputs (Z)V METHOD method_12823 getFreeInventorySlots ()I METHOD method_12824 fillInputSlot (Lnet/minecraft/class_1735;Lnet/minecraft/class_1799;)V METHOD method_12825 canReturnInputs ()Z diff --git a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping index 7ca56fbc55..be5bde08c3 100644 --- a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping +++ b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_1861 net/minecraft/recipe/MapExtendingRecipe - METHOD method_8120 matches (Lnet/minecraft/class_22;)Z - ARG 1 state diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index a5fda3c8a0..e832713f37 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState - FIELD field_1449 scoreboard Lnet/minecraft/class_269; - FIELD field_1450 tag Lnet/minecraft/class_2487; - FIELD field_1451 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_1215 deserializeTeamPlayers (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V ARG 1 team METHOD method_1216 serializeObjectives ()Lnet/minecraft/class_2499; METHOD method_1217 serializeTeams ()Lnet/minecraft/class_2499; - METHOD method_1218 setScoreboard (Lnet/minecraft/class_269;)V METHOD method_1219 deserializeTeams (Lnet/minecraft/class_2499;)V METHOD method_1220 deserializeObjectives (Lnet/minecraft/class_2499;)V METHOD method_1221 deserializeDisplaySlots (Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/scoreboard/ScoreboardSynchronizer.mapping b/mappings/net/minecraft/scoreboard/ScoreboardSynchronizer.mapping deleted file mode 100644 index 5a4dff3d0d..0000000000 --- a/mappings/net/minecraft/scoreboard/ScoreboardSynchronizer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_16 net/minecraft/scoreboard/ScoreboardSynchronizer - FIELD field_66 compound Lnet/minecraft/class_18; - METHOD (Lnet/minecraft/class_18;)V - ARG 1 compound diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index 11469bf3cc..9b18cc07cd 100644 --- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard - FIELD field_13426 updateListeners [Ljava/lang/Runnable; + FIELD field_13426 updateListeners Ljava/util/List; FIELD field_13427 objectives Ljava/util/Set; FIELD field_13428 server Lnet/minecraft/server/MinecraftServer; METHOD (Lnet/minecraft/server/MinecraftServer;)V diff --git a/mappings/net/minecraft/server/command/ReplaceItemCommand.mapping b/mappings/net/minecraft/server/command/ReplaceItemCommand.mapping deleted file mode 100644 index 4b0e369b52..0000000000 --- a/mappings/net/minecraft/server/command/ReplaceItemCommand.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_3102 net/minecraft/server/command/ReplaceItemCommand - FIELD field_13695 SLOT_INAPPLICABLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_13696 BLOCK_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_13697 ENTITY_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; - METHOD method_13537 executeEntity (Lnet/minecraft/class_2168;Ljava/util/Collection;ILnet/minecraft/class_1799;)I - ARG 0 source - ARG 1 targets - ARG 2 slot - ARG 3 item - METHOD method_13539 executeBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_1799;)I - ARG 0 source - ARG 1 pos - ARG 2 slot - ARG 3 item - METHOD method_13541 register (Lcom/mojang/brigadier/CommandDispatcher;)V - ARG 0 dispatcher diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index c627eba385..2d29ae347b 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -50,8 +50,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 5 z ARG 7 yaw ARG 8 pitch - METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V - ARG 1 packet METHOD method_14367 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_14369 sendPacket (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index bc16dc323c..ea6061536a 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13985 inTeleportationState Z FIELD field_13986 screenHandlerSyncId I FIELD field_13987 networkHandler Lnet/minecraft/class_3244; - FIELD field_13988 removedEntities Ljava/util/List; + FIELD field_13988 removedEntities Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_13989 notInAnyWorld Z FIELD field_13990 cameraPosition Lnet/minecraft/class_4076; FIELD field_13991 skipPacketSlotUpdates Z diff --git a/mappings/net/minecraft/server/rcon/RconCommandOutput.mapping b/mappings/net/minecraft/server/rcon/RconCommandOutput.mapping index f515892a73..39eff99829 100644 --- a/mappings/net/minecraft/server/rcon/RconCommandOutput.mapping +++ b/mappings/net/minecraft/server/rcon/RconCommandOutput.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3350 net/minecraft/server/rcon/RconCommandOutput FIELD field_14404 buffer Ljava/lang/StringBuffer; FIELD field_14405 server Lnet/minecraft/server/MinecraftServer; - FIELD field_25146 RCON_NAME Lnet/minecraft/class_2585; + FIELD field_25146 RCON_NAME Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 1 server METHOD method_14700 createRconCommandSource ()Lnet/minecraft/class_2168; diff --git a/mappings/net/minecraft/util/BlockMirror.mapping b/mappings/net/minecraft/util/BlockMirror.mapping index ea26fe708d..a839bc5fc2 100644 --- a/mappings/net/minecraft/util/BlockMirror.mapping +++ b/mappings/net/minecraft/util/BlockMirror.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2415 net/minecraft/util/BlockMirror FIELD field_23263 directionTransformation Lnet/minecraft/class_4990; - METHOD (Ljava/lang/String;ILnet/minecraft/class_4990;)V - ARG 3 directionTransformation METHOD method_10343 apply (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; ARG 1 direction METHOD method_10344 mirror (II)I diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index 9ccab5f4f3..370bc58c7d 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -20,3 +20,4 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 1 raid METHOD method_19209 getRaidAt (Lnet/minecraft/class_2338;I)Lnet/minecraft/class_3765; ARG 1 pos + METHOD method_77 fromTag (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; diff --git a/mappings/net/minecraft/world/Difficulty.mapping b/mappings/net/minecraft/world/Difficulty.mapping index 1b586cd850..d40cb281a1 100644 --- a/mappings/net/minecraft/world/Difficulty.mapping +++ b/mappings/net/minecraft/world/Difficulty.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_1267 net/minecraft/world/Difficulty ARG 4 name METHOD method_16691 byName (Ljava/lang/String;)Lnet/minecraft/class_1267; ARG 0 name - METHOD method_27297 cycle ()Lnet/minecraft/class_1267; METHOD method_5460 getName ()Ljava/lang/String; METHOD method_5461 getId ()I METHOD method_5462 byOrdinal (I)Lnet/minecraft/class_1267; diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index 7cb97138d2..f14ac5b484 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -1,15 +1,9 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState FIELD field_17661 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_71 key Ljava/lang/String; FIELD field_72 dirty Z - METHOD (Ljava/lang/String;)V - ARG 1 key METHOD method_17919 save (Ljava/io/File;)V METHOD method_75 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag - METHOD method_76 getId ()Ljava/lang/String; - METHOD method_77 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag METHOD method_78 setDirty (Z)V ARG 1 dirty METHOD method_79 isDirty ()Z diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 18936d0ab0..5e8b239a11 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -6,11 +6,9 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V ARG 1 directory ARG 2 dataFixer - METHOD method_120 readFromFile (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; - ARG 1 factory + METHOD method_120 readFromFile (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 2 id - METHOD method_123 set (Lnet/minecraft/class_18;)V - ARG 1 state + METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V METHOD method_125 save ()V METHOD method_17921 isCompressed (Ljava/io/PushbackInputStream;)Z METHOD method_17922 getFile (Ljava/lang/String;)Ljava/io/File; @@ -18,9 +16,6 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager METHOD method_17923 readTag (Ljava/lang/String;I)Lnet/minecraft/class_2487; ARG 1 id ARG 2 dataVersion - METHOD method_17924 getOrCreate (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; - ARG 1 factory - ARG 2 id - METHOD method_20786 get (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; - ARG 1 factory + METHOD method_17924 getOrCreate (Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; + METHOD method_20786 get (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 2 id diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 12a5208017..4a8b8c32bf 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -48,8 +48,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 11 velocityY ARG 13 velocityZ METHOD method_17889 getNextMapId ()I - METHOD method_17890 putMapState (Lnet/minecraft/class_22;)V - ARG 1 mapState + METHOD method_17890 putMapState (Ljava/lang/String;Lnet/minecraft/class_22;)V METHOD method_17891 getMapState (Ljava/lang/String;)Lnet/minecraft/class_22; ARG 1 id METHOD method_18471 tickBlockEntities ()V diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index d7d2593427..1b7ffa8be3 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -94,4 +94,4 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_27226 hasWarned Z CLASS class_5564 WrappedBlockEntityTickInvoker FIELD field_27228 wrapped Lnet/minecraft/class_5562; - METHOD method_31727 setWrapped (Lnet/minecraft/class_5562;)V \ No newline at end of file + METHOD method_31727 setWrapped (Lnet/minecraft/class_5562;)V