From 49710ba86abbc4702c428da06af19829e5bfaa8e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 10 Jun 2020 18:05:28 +0100 Subject: [PATCH] 1.16-pre3 --- build.gradle | 2 +- .../blaze3d/platform/GlStateManager.mapping | 5 --- .../criterion/AbstractCriterion.mapping | 2 -- mappings/net/minecraft/block/BedBlock.mapping | 3 +- .../minecraft/block/TurtleEggBlock.mapping | 2 -- .../minecraft/client/font/TextHandler.mapping | 2 -- .../MultiplayerServerListWidget.mapping | 1 - .../screen/pack/AbstractPackScreen.mapping | 4 +-- .../gui/screen/pack/DataPackScreen.mapping | 7 +--- .../screen/pack/ResourcePackOrganizer.mapping | 15 ++------ .../screen/pack/ResourcePackScreen.mapping | 4 +-- .../screen/world/CreateWorldScreen.mapping | 1 - .../screen/world/EditGameRulesScreen.mapping | 6 +--- .../network/ClientPlayNetworkHandler.mapping | 2 +- .../MultiplayerServerListPinger.mapping | 2 +- .../client/options/GraphicsMode.mapping | 1 - .../client/render/RenderPhase.mapping | 2 -- .../client/render/SkyProperties.mapping | 3 +- .../entity/BannerBlockEntityRenderer.mapping | 2 +- .../entity/PiglinEntityRenderer.mapping | 1 - .../feature/ArmorBipedFeatureRenderer.mapping | 1 - .../feature/ArmorFeatureRenderer.mapping | 34 ++----------------- .../PiglinBipedArmorFeatureRenderer.mapping | 4 --- .../arguments/DimensionArgumentType.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 3 +- .../task/FindPointOfInterestTask.mapping | 3 +- .../entity/ai/brain/task/Task.mapping | 1 - .../entity/ai/pathing/TargetPathNode.mapping | 1 - .../effect/StatusEffectInstance.mapping | 4 --- .../minecraft/entity/mob/Angerable.mapping | 6 ++-- .../minecraft/entity/mob/PiglinBrain.mapping | 6 +--- .../minecraft/entity/mob/ZombieEntity.mapping | 2 +- .../entity/passive/StriderEntity.mapping | 2 -- .../thrown/EnderPearlEntity.mapping | 1 - mappings/net/minecraft/nbt/NbtIo.mapping | 3 -- .../s2c/play/GameStateChangeS2CPacket.mapping | 8 ++--- .../s2c/play/LightUpdateS2CPacket.mapping | 3 +- .../minecraft/resource/ResourceImpl.mapping | 2 -- .../server/network/SpawnLocating.mapping | 11 ------ .../server/world/ChunkHolder.mapping | 2 +- .../util/dynamic/RegistryCodec.mapping | 8 ++--- .../util/dynamic/RegistryElementCodec.mapping | 8 ++--- .../util/dynamic/RegistryOps.mapping | 14 +++----- .../util/dynamic/RegistryReadingOps.mapping | 2 +- .../util/registry/MutableRegistry.mapping | 1 + .../minecraft/util/registry/Registry.mapping | 1 + .../util/registry/SimpleRegistry.mapping | 19 ++--------- .../net/minecraft/world/EntityView.mapping | 2 -- mappings/net/minecraft/world/World.mapping | 2 -- .../chunk/light/ChunkLightProvider.mapping | 2 +- .../world/chunk/light/LightStorage.mapping | 3 +- .../chunk/light/LightingProvider.mapping | 2 +- .../world/dimension/DimensionOptions.mapping | 2 +- .../world/dimension/DimensionType.mapping | 25 +++----------- .../world/gen/feature/TreeFeature.mapping | 3 +- .../world/poi/PointOfInterestStorage.mapping | 6 ---- 56 files changed, 53 insertions(+), 213 deletions(-) delete mode 100644 mappings/net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/feature/PiglinBipedArmorFeatureRenderer.mapping diff --git a/build.gradle b/build.gradle index f42c76dde4..f6c6a9b72c 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "1.16-pre2" +def minecraft_version = "1.16-pre3" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index 67e3ccded8..7ddd1c788c 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_20476 POLY_OFFSET Lnet/minecraft/class_4493$class_1031; FIELD field_20477 COLOR_LOGIC Lnet/minecraft/class_4493$class_1021; FIELD field_20478 TEX_GEN Lnet/minecraft/class_4493$class_1038; - FIELD field_20479 CLEAR Lnet/minecraft/class_4493$class_1019; FIELD field_20480 STENCIL Lnet/minecraft/class_4493$class_1035; FIELD field_20482 activeTexture I FIELD field_20483 TEXTURES [Lnet/minecraft/class_4493$class_1039; @@ -482,10 +481,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_4470 setState (Z)V ARG 1 state METHOD method_4471 enable ()V - CLASS class_1019 ClearState - FIELD field_16202 clearStencil I - FIELD field_5052 clearColor Lnet/minecraft/class_4493$class_1020; - FIELD field_5053 clearDepth D CLASS class_1020 Color4 FIELD field_5054 alpha F FIELD field_5055 blue F diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping index 24480215cd..3a29b5bc7c 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCrite METHOD method_22510 test (Lnet/minecraft/class_3222;Ljava/util/function/Predicate;)V ARG 1 player ARG 2 tester - METHOD method_22511 grant (Lnet/minecraft/class_2985;)V - ARG 1 tracker METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195; ARG 1 obj ARG 2 playerPredicate diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index b5d25247cb..fbf4eb7dbd 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -26,9 +26,8 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock ARG 0 state METHOD method_24164 getBedPart (Lnet/minecraft/class_2680;)Lnet/minecraft/class_4732$class_4733; ARG 0 state - METHOD method_27352 isOverworld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + METHOD method_27352 isOverworld (Lnet/minecraft/class_1937;)Z ARG 0 world - ARG 1 pos METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Ljava/util/Optional; ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/block/TurtleEggBlock.mapping b/mappings/net/minecraft/block/TurtleEggBlock.mapping index 8b3334b309..f5f6f78299 100644 --- a/mappings/net/minecraft/block/TurtleEggBlock.mapping +++ b/mappings/net/minecraft/block/TurtleEggBlock.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_2542 net/minecraft/block/TurtleEggBlock FIELD field_11711 HATCH Lnet/minecraft/class_2758; FIELD field_11712 SMALL_SHAPE Lnet/minecraft/class_265; METHOD method_10831 isSand (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 pos METHOD method_10832 shouldHatchProgress (Lnet/minecraft/class_1937;)Z ARG 1 world METHOD method_10833 breakEgg (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/client/font/TextHandler.mapping b/mappings/net/minecraft/client/font/TextHandler.mapping index b15a00d2af..0f4cb8917e 100644 --- a/mappings/net/minecraft/client/font/TextHandler.mapping +++ b/mappings/net/minecraft/client/font/TextHandler.mapping @@ -50,9 +50,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 3 style COMMENT the style of the trimmed string METHOD method_27495 wrapLines (Lnet/minecraft/class_5348;ILnet/minecraft/class_2583;)Ljava/util/List; - ARG 1 text ARG 2 maxWidth - ARG 3 style METHOD method_27497 trimToWidthBackwards (Ljava/lang/String;ILnet/minecraft/class_2583;)Ljava/lang/String; COMMENT Trim a string from right to left to be at most {@code maxWidth} wide. COMMENT diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index d29c7440f7..bb356d6a4b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -45,7 +45,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 3 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; METHOD method_20134 draw (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V - METHOD method_20137 updateIcon ()V METHOD method_22110 swapEntries (II)V ARG 1 i ARG 2 j diff --git a/mappings/net/minecraft/client/gui/screen/pack/AbstractPackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/AbstractPackScreen.mapping index f5a2ffd274..71594cff3c 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/AbstractPackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/AbstractPackScreen.mapping @@ -4,16 +4,14 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/AbstractPack FIELD field_25466 FOLDER_INFO Lnet/minecraft/class_2561; FIELD field_25468 organizer Lnet/minecraft/class_5369; FIELD field_25469 parent Lnet/minecraft/class_437; - FIELD field_25470 dirty Z FIELD field_25471 shouldSave Z FIELD field_25472 availablePackList Lnet/minecraft/class_521; FIELD field_25473 selectedPackList Lnet/minecraft/class_521; FIELD field_25475 doneButton Lnet/minecraft/class_4185; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2588;Ljava/util/function/Function;Ljava/util/function/Function;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2588;Ljava/util/function/Function;Ljava/io/File;)V ARG 1 parent ARG 2 title METHOD method_29673 updatePackList (Lnet/minecraft/class_521;Ljava/util/stream/Stream;)V ARG 1 widget ARG 2 packs METHOD method_29678 updatePackLists ()V - METHOD method_29679 organizerUpdated ()V diff --git a/mappings/net/minecraft/client/gui/screen/pack/DataPackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/DataPackScreen.mapping index 94ac1a2832..e7e22203e3 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/DataPackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/DataPackScreen.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_5368 net/minecraft/client/gui/screen/pack/DataPackScreen FIELD field_25446 UNKNOWN_PACK_TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5359;Ljava/util/function/BiConsumer;Ljava/io/File;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/io/File;)V ARG 1 parent - METHOD method_29630 (Lnet/minecraft/class_3283;Ljava/util/stream/Stream;)Ljava/util/List; - ARG 0 packManager - CLASS 1 - FIELD field_25450 settings Lnet/minecraft/class_5359; - FIELD field_25451 packManager Lnet/minecraft/class_3283; diff --git a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping index 519e12a088..37f2fe0b37 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping @@ -3,22 +3,13 @@ CLASS net/minecraft/class_5369 net/minecraft/client/gui/screen/pack/ResourcePack FIELD field_25456 disabledPacks Ljava/util/List; FIELD field_25457 renderer Ljava/util/function/BiConsumer; FIELD field_25458 updateCallback Ljava/lang/Runnable; - FIELD field_25459 applier Lnet/minecraft/class_5369$class_5370; - METHOD (Ljava/lang/Runnable;Ljava/util/function/BiConsumer;Ljava/util/Collection;Ljava/util/Collection;Lnet/minecraft/class_5369$class_5370;)V + FIELD field_25459 applier Ljava/util/function/Consumer; + METHOD (Ljava/lang/Runnable;Ljava/util/function/BiConsumer;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;)V ARG 1 updateCallback ARG 2 renderer - ARG 3 enabledPacks - ARG 4 disabledPacks - ARG 5 applier METHOD method_29639 getDisabledPacks ()Ljava/util/stream/Stream; - METHOD method_29642 apply (Z)V - ARG 1 unchanged + METHOD method_29642 apply ()V METHOD method_29643 getEnabledPacks ()Ljava/util/stream/Stream; - CLASS class_5370 Applier - METHOD accept (Ljava/util/List;Ljava/util/List;Z)V - ARG 1 enabled - ARG 2 disabled - ARG 3 unchanged CLASS class_5371 Pack METHOD method_29648 getCompatibility ()Lnet/minecraft/class_3281; METHOD method_29649 render (Lnet/minecraft/class_1060;)V diff --git a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackScreen.mapping index 976ef3f976..cadf2a556d 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackScreen.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_519 net/minecraft/client/gui/screen/pack/ResourcePackScreen - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_3283;Ljava/lang/Runnable;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/io/File;)V ARG 1 parent - ARG 2 gameOptions - ARG 3 packManager diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 8b58397c04..77137dd70f 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3186 gameModeSwitchButton Lnet/minecraft/class_4185; FIELD field_3187 parent Lnet/minecraft/class_437; FIELD field_3188 levelNameField Lnet/minecraft/class_342; - FIELD field_3190 creatingLevel Z FIELD field_3192 cheatsEnabled Z FIELD field_3193 moreOptionsButton Lnet/minecraft/class_4185; FIELD field_3194 firstGameModeDescriptionLine Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index aaf72df285..5bcc3a6bdd 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -17,13 +17,11 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul METHOD method_27632 updateDoneButton ()V CLASS class_5236 BooleanRuleWidget FIELD field_24300 toggleButton Lnet/minecraft/class_4185; - FIELD field_24301 children Ljava/util/List; 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 ARG 4 ruleName - ARG 5 rule - METHOD method_27634 createBooleanRuleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_2561; + METHOD method_27634 createBooleanRuleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; ARG 1 text ARG 2 value CLASS class_5237 RuleCategoryWidget @@ -37,9 +35,7 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul ARG 3 ruleName ARG 4 rule CLASS class_5239 IntRuleWidget - FIELD field_24308 name Lnet/minecraft/class_2561; FIELD field_24309 valueWidget Lnet/minecraft/class_342; - FIELD field_24310 children Ljava/util/List; METHOD (Lnet/minecraft/class_5235;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_1928$class_4312;)V ARG 2 name ARG 3 description diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index ce0bb7e53b..294ae4a138 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2867 getTagManager ()Lnet/minecraft/class_3505; METHOD method_2868 clearWorld ()V METHOD method_2869 getAdvancementHandler ()Lnet/minecraft/class_632; - METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;IILjava/util/Iterator;)V + METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;IILjava/util/Iterator;Z)V ARG 1 chunkX ARG 2 chunkZ ARG 3 provider diff --git a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping index 94f370a087..026d388a71 100644 --- a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping +++ b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerList METHOD method_3000 tick ()V METHOD method_3001 ping (Lnet/minecraft/class_642;)V METHOD method_3002 getLogger ()Lorg/apache/logging/log4j/Logger; - METHOD method_3003 add (Lnet/minecraft/class_642;)V + METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;)V ARG 1 entry METHOD method_3004 cancel ()V CLASS 1 diff --git a/mappings/net/minecraft/client/options/GraphicsMode.mapping b/mappings/net/minecraft/client/options/GraphicsMode.mapping index 0b4d275c88..932e0f11e6 100644 --- a/mappings/net/minecraft/client/options/GraphicsMode.mapping +++ b/mappings/net/minecraft/client/options/GraphicsMode.mapping @@ -10,4 +10,3 @@ CLASS net/minecraft/class_5365 net/minecraft/client/options/GraphicsMode ARG 0 id METHOD method_29593 getTranslationKey ()Ljava/lang/String; METHOD method_29595 next ()Lnet/minecraft/class_5365; - METHOD method_29596 previous ()Lnet/minecraft/class_5365; diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index 0b0720c542..a343d97b14 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -47,9 +47,7 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase FIELD field_25281 PARTICLES_TARGET Lnet/minecraft/class_4668$class_4678; FIELD field_25282 WEATHER_TARGET Lnet/minecraft/class_4668$class_4678; FIELD field_25283 CLOUDS_TARGET Lnet/minecraft/class_4668$class_4678; - FIELD field_25284 ITEM_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; FIELD field_25485 GLINT_GUI_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; - FIELD field_25486 DRAGON_EXPLOSION_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 beginAction diff --git a/mappings/net/minecraft/client/render/SkyProperties.mapping b/mappings/net/minecraft/client/render/SkyProperties.mapping index 8d95f61bef..fc08a7e2e8 100644 --- a/mappings/net/minecraft/client/render/SkyProperties.mapping +++ b/mappings/net/minecraft/client/render/SkyProperties.mapping @@ -4,10 +4,9 @@ CLASS net/minecraft/class_5294 net/minecraft/client/render/SkyProperties FIELD field_24611 cloudsHeight F FIELD field_24612 alternateSkyColor Z FIELD field_24613 shouldRenderSky Z - METHOD (FZZ)V + METHOD (FZLnet/minecraft/class_5294$class_5401;ZZ)V ARG 1 cloudsHeight ARG 2 alternateSkyColor - ARG 3 shouldRenderSky METHOD method_28108 getCloudsHeight ()F METHOD method_28109 getSkyColor (FF)[F ARG 1 skyAngle diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 50d0dfe5f6..8b1ce9e725 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo FIELD field_20810 banner Lnet/minecraft/class_630; FIELD field_20811 pillar Lnet/minecraft/class_630; FIELD field_20812 crossbar Lnet/minecraft/class_630; - METHOD method_23802 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLjava/util/List;)V + METHOD method_23802 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLjava/util/List;Z)V ARG 0 matrices ARG 1 vertexConsumers ARG 2 light diff --git a/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping index 01f40f5ed0..9c7a5436d2 100644 --- a/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping @@ -4,6 +4,5 @@ CLASS net/minecraft/class_4842 net/minecraft/client/render/entity/PiglinEntityRe METHOD (Lnet/minecraft/class_898;Z)V ARG 1 dispatcher ARG 2 zombified - METHOD method_24813 createEarlessPiglinModel ()Lnet/minecraft/class_4840; METHOD method_24875 getPiglinModel (Z)Lnet/minecraft/class_4840; ARG 0 zombified diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer.mapping deleted file mode 100644 index 1904831a42..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_987 net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index 01c13507fe..b610a4c338 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -6,32 +6,10 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 context ARG 2 leggingsModel ARG 3 bodyModel - METHOD method_23192 renderArmorParts (Lnet/minecraft/class_1304;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;ZLnet/minecraft/class_572;ZFFFLjava/lang/String;)V - ARG 1 slot - ARG 2 matrices - ARG 3 vertexConsumers - ARG 4 light - ARG 5 item - ARG 6 glint - ARG 7 armorModel - ARG 8 secondLayer - ARG 9 red - ARG 10 green - ARG 11 blue - ARG 12 suffix - METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;FFFFFFLnet/minecraft/class_1304;ILnet/minecraft/class_572;)V + METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;ZLnet/minecraft/class_572;ZFFFLjava/lang/String;)V + METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V ARG 1 matrices ARG 2 vertexConsumers - ARG 3 entity - ARG 4 limbAngle - ARG 5 limbDistance - ARG 6 tickDelta - ARG 7 customAngle - ARG 8 headYaw - ARG 9 headPitch - ARG 10 slot - ARG 11 light - ARG 12 armorModel METHOD method_4170 setVisible (Lnet/minecraft/class_572;Lnet/minecraft/class_1304;)V ARG 1 bipedModel ARG 2 slot @@ -39,10 +17,4 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 slot METHOD method_4173 usesSecondLayer (Lnet/minecraft/class_1304;)Z ARG 1 slot - METHOD method_4174 getArmorTexture (Lnet/minecraft/class_1304;Lnet/minecraft/class_1738;ZLjava/lang/String;)Lnet/minecraft/class_2960; - ARG 1 slot - ARG 2 item - ARG 3 secondLayer - ARG 4 suffix - METHOD method_4190 setInvisible (Lnet/minecraft/class_572;)V - ARG 1 bipedModel + METHOD method_4174 getArmorTexture (Lnet/minecraft/class_1738;ZLjava/lang/String;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/feature/PiglinBipedArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/PiglinBipedArmorFeatureRenderer.mapping deleted file mode 100644 index 0aedeca4b3..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/PiglinBipedArmorFeatureRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4843 net/minecraft/client/render/entity/feature/PiglinBipedArmorFeatureRenderer - FIELD field_22411 helmetModel Lnet/minecraft/class_572; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_572;)V - ARG 4 helmetModel diff --git a/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping b/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping index b400f1ce41..66e3d21659 100644 --- a/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping @@ -5,6 +5,6 @@ CLASS net/minecraft/class_2181 net/minecraft/command/arguments/DimensionArgument ARG 1 context ARG 2 builder METHOD method_9288 dimension ()Lnet/minecraft/class_2181; - METHOD method_9289 getDimensionArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_5321; + METHOD method_9289 getDimensionArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_3218; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index beebd5804c..54e343492c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -428,8 +428,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 index ARG 2 value METHOD method_5730 setOnFireFromLava ()V - METHOD method_5731 changeDimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1297; - ARG 1 newDimension + METHOD method_5731 changeDimension (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1297; METHOD method_5732 isAttackable ()Z METHOD method_5733 shouldRenderName ()Z METHOD method_5734 playSwimSound (F)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index fb1d7339c1..588125dc84 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt FIELD field_18332 positionExpireTimeLimit J FIELD field_18854 onlyRunIfChild Z FIELD field_19287 poiType Lnet/minecraft/class_4158; - FIELD field_19289 foundPositionsToExpiry Lit/unimi/dsi/fastutil/longs/Long2LongMap; - FIELD field_19290 tries I + FIELD field_19289 foundPositionsToExpiry Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_20287 targetMemoryModuleType Lnet/minecraft/class_4140; METHOD (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Z)V ARG 1 poiType diff --git a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping index 32e2d4893a..351a6af609 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping @@ -48,5 +48,4 @@ CLASS net/minecraft/class_4097 net/minecraft/entity/ai/brain/task/Task ARG 2 entity ARG 3 time METHOD method_19546 hasRequiredMemoryState (Lnet/minecraft/class_1309;)Z - ARG 1 entity CLASS class_4098 Status diff --git a/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping index ca9f00ffac..fca9ac7d0a 100644 --- a/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping @@ -11,4 +11,3 @@ CLASS net/minecraft/class_4459 net/minecraft/entity/ai/pathing/TargetPathNode ARG 0 buffer METHOD method_21664 getNearestNode ()Lnet/minecraft/class_9; METHOD method_21665 markReached ()V - METHOD method_21666 isReached ()Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 16ad33e73f..2f933ec8c4 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -44,8 +42,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 5 showParticles ARG 6 showIcon ARG 7 hiddenEffect - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 that METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping index 8073bb03b4..6897bf8788 100644 --- a/mappings/net/minecraft/entity/mob/Angerable.mapping +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable + METHOD method_29505 setAttacking (Lnet/minecraft/class_1657;)V METHOD method_29507 getAngerTime ()I METHOD method_29508 getAngryAt ()Ljava/util/UUID; METHOD method_29509 chooseRandomAngerTime ()V - METHOD method_29510 tickAngerLogic ()V + METHOD method_29510 tickAngerLogic (Lnet/minecraft/class_3218;Z)V METHOD method_29511 hasAngerTime ()Z - METHOD method_29512 angerFromTag (Lnet/minecraft/class_1937;Lnet/minecraft/class_2487;)V - ARG 1 world + METHOD method_29512 angerFromTag (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V ARG 2 tag METHOD method_29513 setAngryAt (Ljava/util/UUID;)V ARG 1 uuid diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 9c06daa135..7b245ae0ee 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -40,7 +40,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24731 drop (Lnet/minecraft/class_4836;Ljava/util/List;Lnet/minecraft/class_243;)V METHOD method_24732 create (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 piglin - METHOD method_24733 onGoldBlockBroken (Lnet/minecraft/class_1657;)V + METHOD method_24733 onGoldBlockBroken (Lnet/minecraft/class_1657;Z)V ARG 0 player METHOD method_24734 (Lnet/minecraft/class_1657;Lnet/minecraft/class_4836;)V ARG 1 piglin @@ -58,8 +58,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 0 piglin ARG 1 target METHOD method_24743 addIdleActivities (Lnet/minecraft/class_4095;)V - METHOD method_24745 (Lnet/minecraft/class_1657;Lnet/minecraft/class_4836;)Z - ARG 1 piglin METHOD method_24746 acceptsForBarter (Lnet/minecraft/class_1792;)Z ARG 0 item METHOD method_24747 makeGoToZombifiedPiglinTask ()Lnet/minecraft/class_4809; @@ -88,8 +86,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24758 rememberGroupHunting (Lnet/minecraft/class_4836;)V ARG 0 piglin METHOD method_24759 tryRevenge (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V - ARG 0 piglin - ARG 1 target METHOD method_24760 addAdmireItemActivities (Lnet/minecraft/class_4095;)V METHOD method_24761 hasPlayerHoldingWantedItemNearby (Lnet/minecraft/class_1309;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 48639f8520..8a3cb5df2e 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -40,5 +40,5 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity ARG 5 maxYDifference CLASS class_1644 ZombieData FIELD field_7439 baby Z - METHOD (Z)V + METHOD (ZZ)V ARG 1 baby diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index 7606539c98..e034035a8a 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -9,9 +9,7 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity FIELD field_23247 SADDLED Lnet/minecraft/class_2940; METHOD method_26344 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 ARG 2 spawnReason - ARG 3 pos ARG 4 random METHOD method_26345 getSpeed ()F METHOD method_26347 updateFloating ()V diff --git a/mappings/net/minecraft/entity/projectile/thrown/EnderPearlEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/EnderPearlEntity.mapping index d3049a16ca..86f5663cb3 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/EnderPearlEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/EnderPearlEntity.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1684 net/minecraft/entity/projectile/thrown/EnderPearlEntity - FIELD field_7646 owner Lnet/minecraft/class_1309; METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 7f967ba67c..7e18fe01de 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -19,9 +19,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo METHOD method_10631 write (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V ARG 0 tag ARG 1 output - METHOD method_10632 safeWrite (Lnet/minecraft/class_2487;Ljava/io/File;)V - ARG 0 tag - ARG 1 file METHOD method_10633 read (Ljava/io/File;)Lnet/minecraft/class_2487; ARG 0 file METHOD method_10634 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/OutputStream;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping index 52127fe5b4..2a64caead2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket FIELD field_12198 value F - FIELD field_12199 reason I - FIELD field_12200 REASON_MESSAGES [Ljava/lang/String; - METHOD (IF)V - ARG 1 reason + FIELD field_12199 reason Lnet/minecraft/class_2668$class_5402; + METHOD (Lnet/minecraft/class_2668$class_5402;F)V ARG 2 value - METHOD method_11491 getReason ()I + METHOD method_11491 getReason ()Lnet/minecraft/class_2668$class_5402; METHOD method_11492 getValue ()F diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping index 4b52cda8db..4dc58b915c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping @@ -7,10 +7,9 @@ CLASS net/minecraft/class_2676 net/minecraft/network/packet/s2c/play/LightUpdate FIELD field_12266 skyLightUpdates Ljava/util/List; FIELD field_16417 filledBlockLightMask I FIELD field_16418 filledSkyLightMask I - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;II)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;IIZ)V ARG 1 pos ARG 2 lightProvider - ARG 3 skyLightMask ARG 4 blockLightMask METHOD method_11554 getChunkZ ()I METHOD method_11555 getSkyLightUpdates ()Ljava/util/List; diff --git a/mappings/net/minecraft/resource/ResourceImpl.mapping b/mappings/net/minecraft/resource/ResourceImpl.mapping index 4340b41204..fb56ee3088 100644 --- a/mappings/net/minecraft/resource/ResourceImpl.mapping +++ b/mappings/net/minecraft/resource/ResourceImpl.mapping @@ -4,9 +4,7 @@ CLASS net/minecraft/class_3306 net/minecraft/resource/ResourceImpl FIELD field_14298 inputStream Ljava/io/InputStream; FIELD field_14299 id Lnet/minecraft/class_2960; FIELD field_14300 metaInputStream Ljava/io/InputStream; - FIELD field_14301 RESOURCE_IO_EXECUTOR Ljava/util/concurrent/Executor; FIELD field_14302 metadata Lcom/google/gson/JsonObject; - FIELD field_14303 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/lang/String;Lnet/minecraft/class_2960;Ljava/io/InputStream;Ljava/io/InputStream;)V ARG 1 packName ARG 2 id diff --git a/mappings/net/minecraft/server/network/SpawnLocating.mapping b/mappings/net/minecraft/server/network/SpawnLocating.mapping index 7b95683dba..76ce956b46 100644 --- a/mappings/net/minecraft/server/network/SpawnLocating.mapping +++ b/mappings/net/minecraft/server/network/SpawnLocating.mapping @@ -4,18 +4,7 @@ CLASS net/minecraft/class_5322 net/minecraft/server/network/SpawnLocating ARG 1 x ARG 2 z ARG 3 validSpawnNeeded - METHOD method_29195 findEndSpawn (Lnet/minecraft/class_3218;JII)Lnet/minecraft/class_2338; - ARG 0 world - ARG 1 seed - ARG 3 x - ARG 4 z METHOD method_29196 findServerSpawnPoint (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338; ARG 0 world ARG 1 chunkPos ARG 2 validSpawnNeeded - METHOD method_29197 findPlayerSpawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;III)Lnet/minecraft/class_2338; - ARG 0 world - ARG 1 pos - ARG 2 negativeOffset - ARG 3 xOffset - ARG 4 zOffset diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index ecdb5e996c..5453c51059 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 2 chunkStorage METHOD method_13994 getPos ()Lnet/minecraft/class_1923; METHOD method_14000 getFuture ()Ljava/util/concurrent/CompletableFuture; - METHOD method_14002 markForBlockUpdate (Lnet/minecraft/class_3215;III)V + METHOD method_14002 markForBlockUpdate (III)V METHOD method_14003 getEntityTickingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_14005 getLevel ()I METHOD method_14006 flushUpdates (Lnet/minecraft/class_2818;)V diff --git a/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping index 385ea7066d..6572c78d3f 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping @@ -10,11 +10,10 @@ CLASS net/minecraft/class_5380 net/minecraft/util/dynamic/RegistryCodec COMMENT @see RegistryOps FIELD field_25504 delegate Lcom/mojang/serialization/Codec; FIELD field_25505 registryRef Lnet/minecraft/class_5321; - FIELD field_25506 elementCodec Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)V + FIELD field_25506 elementCodec Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/MapCodec;)V ARG 1 registryRef ARG 2 lifecycle - ARG 3 elementCodec METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -22,7 +21,6 @@ CLASS net/minecraft/class_5380 net/minecraft/util/dynamic/RegistryCodec ARG 1 input ARG 2 ops ARG 3 prefix - METHOD method_29745 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5380; + METHOD method_29745 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/MapCodec;)Lnet/minecraft/class_5380; ARG 0 registryRef ARG 1 lifecycle - ARG 2 elementCodec diff --git a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping index da13a92b51..ba01f26fd4 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping @@ -11,10 +11,9 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec COMMENT @see RegistryReadingOps COMMENT @see RegistryOps FIELD field_25507 registryRef Lnet/minecraft/class_5321; - FIELD field_25508 elementCodec Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V + FIELD field_25508 elementCodec Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)V ARG 1 registryRef - ARG 2 elementCodec METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -22,6 +21,5 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec ARG 1 input ARG 2 ops ARG 3 prefix - METHOD method_29749 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5381; + METHOD method_29749 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lnet/minecraft/class_5381; ARG 0 registryRef - ARG 1 elementCodec diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping index c1b6579e85..643cf9efb8 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping @@ -11,35 +11,29 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps ARG 0 delegate ARG 1 resourceManager ARG 2 registryTracker - METHOD method_29755 loadToRegistry (Lnet/minecraft/class_2370;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; + METHOD method_29755 loadToRegistry (Lnet/minecraft/class_2370;Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/DataResult; COMMENT Loads elements into a registry just loaded from a decoder. ARG 1 registry ARG 2 registryRef - ARG 3 elementCodec - METHOD method_29759 decodeOrId (Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; + METHOD method_29759 decodeOrId (Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/DataResult; COMMENT Encode an id for a registry element than a full object if possible. COMMENT COMMENT

This method is called by casting an arbitrary dynamic ops to a registry COMMENT reading ops.

COMMENT COMMENT @see RegistryReadingOps#encodeOrId(Object, Object, RegistryKey, Codec) - ARG 1 input - ARG 2 registryRef - ARG 3 elementCodec METHOD method_29761 getValueHolder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5382$class_5383; ARG 1 registryRef - METHOD method_29763 readSupplier (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + METHOD method_29763 readSupplier (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/MapCodec;Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; COMMENT Reads a supplier for a registry element. COMMENT COMMENT

This logic is used by both {@code decodeOrId} and {@code loadToRegistry}.

ARG 1 registryRef ARG 2 registry - ARG 3 elementCodec ARG 4 elementId - METHOD method_29764 readElement (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; + METHOD method_29764 readElement (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/DataResult; COMMENT Reads the actual element. ARG 1 registryRef ARG 2 elementRef - ARG 3 elementCodec CLASS class_5383 ValueHolder FIELD field_25513 values Ljava/util/Map; diff --git a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping index a9f939c2cf..35deb3e4ae 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_5384 net/minecraft/util/dynamic/RegistryReadingOps METHOD method_29771 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5318;)Lnet/minecraft/class_5384; ARG 0 delegate ARG 1 tracker - METHOD method_29772 encodeOrId (Ljava/lang/Object;Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; + METHOD method_29772 encodeOrId (Ljava/lang/Object;Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/DataResult; COMMENT Encode an id for a registry element than a full object if possible. COMMENT COMMENT

This method is called by casting an arbitrary dynamic ops to a registry diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping index 53a37d7ce5..4076b88237 100644 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/util/registry/MutableRegistry.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry ARG 1 rawId ARG 2 key ARG 3 entry + METHOD method_29725 markLoaded (Lnet/minecraft/class_5321;)V diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 6da696d63d..b3c3cc3d2a 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -151,3 +151,4 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 1 id METHOD method_29113 getKey (Ljava/lang/Object;)Ljava/util/Optional; ARG 1 value + METHOD method_29723 isLoaded (Lnet/minecraft/class_5321;)Z diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index bd0b855955..a8ec4140b4 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -7,25 +7,10 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_25067 entriesByKey Lcom/google/common/collect/BiMap; FIELD field_25489 loadedKeys Ljava/util/Set; METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; - METHOD method_29721 createCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + METHOD method_29721 createCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 lifecycle - ARG 2 elementCodec METHOD method_29722 getEntries ()Ljava/util/Set; - METHOD method_29723 isLoaded (Lnet/minecraft/class_5321;)Z - COMMENT Returns whether an element corresponding to the key is loaded externally, - COMMENT such as from a decoder. - COMMENT - COMMENT

When an element is loaded externally, it will be encoded when the - COMMENT registry is encoded.

- ARG 1 key - METHOD method_29724 createEmptyCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + METHOD method_29724 createEmptyCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 lifecycle - ARG 2 elementCodec - METHOD method_29725 markLoaded (Lnet/minecraft/class_5321;)V - COMMENT Marks an element corresponding to the key as loaded from a decoder. - COMMENT - COMMENT

This will make the element being written by the encoder when the - COMMENT registry is encoded.

- ARG 1 key diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 3428474e10..fd37ad9b91 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -80,8 +80,6 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView METHOD method_8335 getEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 except ARG 2 box - METHOD method_8336 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Ljava/util/stream/Stream; - ARG 1 e METHOD method_8338 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z ARG 1 e METHOD method_8390 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index ca451db674..f34973b30e 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -190,8 +190,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - METHOD method_8495 getTopNonAirState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 1 pos METHOD method_8496 setThunderGradient (F)V ARG 1 thunderGradient METHOD method_8499 getEmittedRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index 610c58a9e8..3de69bec1a 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide METHOD method_15514 addLightSource (Lnet/minecraft/class_2338;I)V ARG 1 pos ARG 2 level - METHOD method_15515 setLightArray (JLnet/minecraft/class_2804;)V + METHOD method_15515 setLightArray (JLnet/minecraft/class_2804;Z)V ARG 1 pos ARG 3 lightArray METHOD method_15516 doLightUpdates (IZZ)I diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index 7b9bb2b6b9..f158eeb339 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -28,14 +28,13 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage ARG 1 pos ARG 3 empty METHOD method_15527 updateLightArrays (Lnet/minecraft/class_3558;ZZ)V - ARG 1 lightProvider ARG 2 doSkylight ARG 3 skipEdgeLightPropagation METHOD method_15528 hasLightUpdates ()Z METHOD method_15529 createLightArray (J)Lnet/minecraft/class_2804; ARG 1 pos METHOD method_15530 notifyChunkProvider ()V - METHOD method_15532 setLightArray (JLnet/minecraft/class_2804;)V + METHOD method_15532 setLightArray (JLnet/minecraft/class_2804;Z)V ARG 1 pos ARG 3 array METHOD method_15533 getLightArray (Lnet/minecraft/class_3556;J)Lnet/minecraft/class_2804; diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index e631fde697..100d7983e0 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider METHOD method_15557 setLightEnabled (Lnet/minecraft/class_1923;Z)V ARG 1 pos ARG 2 lightEnabled - METHOD method_15558 queueData (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;Lnet/minecraft/class_2804;)V + METHOD method_15558 queueData (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;Lnet/minecraft/class_2804;Z)V ARG 1 lightType ARG 2 pos ARG 3 nibbles diff --git a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping index 4c27f6196e..9b173581d6 100644 --- a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5363 net/minecraft/world/dimension/DimensionOptions - FIELD field_25411 CODEC Lcom/mojang/serialization/Codec; + FIELD field_25411 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_25412 OVERWORLD Lnet/minecraft/class_5321; FIELD field_25413 NETHER Lnet/minecraft/class_5321; FIELD field_25414 END Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 84361832f7..284ac67944 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -1,14 +1,12 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_13073 hasSkyLight Z - FIELD field_13077 suffix Ljava/lang/String; FIELD field_20658 biomeAccessType Lnet/minecraft/class_4545; FIELD field_24504 hasCeiling Z FIELD field_24505 ultrawarm Z - FIELD field_24751 REGISTRY_KEY_CODEC Lcom/mojang/serialization/Codec; FIELD field_24753 OVERWORLD_REGISTRY_KEY Lnet/minecraft/class_5321; FIELD field_24754 THE_NETHER_REGISTRY_KEY Lnet/minecraft/class_5321; FIELD field_24755 THE_END_REGISTRY_KEY Lnet/minecraft/class_5321; - FIELD field_24757 CODEC Lcom/mojang/serialization/Codec; + FIELD field_24757 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_24761 fixedTime Ljava/util/OptionalLong; FIELD field_24762 natural Z FIELD field_24763 shrunk Z @@ -17,25 +15,13 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_25407 OVERWORLD Lnet/minecraft/class_2874; FIELD field_25408 THE_NETHER Lnet/minecraft/class_2874; FIELD field_25409 THE_END Lnet/minecraft/class_2874; - METHOD (Ljava/lang/String;Ljava/util/OptionalLong;ZZZZZZLnet/minecraft/class_4545;Ljava/util/Optional;F)V - ARG 1 suffix - ARG 2 fixedTime - ARG 3 hasSkylight - ARG 4 hasCeiling - ARG 5 ultrawarm - ARG 6 natural - ARG 7 shrunk - ARG 8 hasEnderDragonFight - ARG 9 biomeAccessType - ARG 11 ambientLight - METHOD (Ljava/util/OptionalLong;ZZZZZF)V + METHOD (Ljava/util/OptionalLong;ZZZZZZZZZILnet/minecraft/class_2960;F)V ARG 1 fixedTime ARG 2 hasSkylight ARG 3 hasCeiling ARG 4 ultrawarm ARG 5 natural ARG 6 shrunk - ARG 7 ambientLight METHOD method_12488 getSaveDirectory (Lnet/minecraft/class_5321;Ljava/io/File;)Ljava/io/File; ARG 0 worldRef ARG 1 root @@ -44,10 +30,10 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_22415 getBiomeAccessType ()Lnet/minecraft/class_4545; METHOD method_27998 hasCeiling ()Z METHOD method_27999 isUltrawarm ()Z - METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5318$class_5319;)Lnet/minecraft/class_5318$class_5319; - ARG 0 registryTracker METHOD method_28517 (J)Lnet/minecraft/class_2370; ARG 0 seed + METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5318$class_5319;)Lnet/minecraft/class_5318$class_5319; + ARG 0 registryTracker METHOD method_28533 createEndGenerator (J)Lnet/minecraft/class_2794; ARG 0 seed METHOD method_28535 createNetherGenerator (J)Lnet/minecraft/class_2794; @@ -55,7 +41,4 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_28537 isNatural ()Z METHOD method_28539 isShrunk ()Z METHOD method_28540 hasEnderDragonFight ()Z - METHOD method_28541 isOverworld ()Z - METHOD method_28542 isNether ()Z - METHOD method_28543 isEnd ()Z METHOD method_29563 getOverworldDimensionType ()Lnet/minecraft/class_2874; diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index 6f1e96976b..5ab8def85d 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -48,6 +48,5 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature ARG 6 decorator METHOD method_23384 (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_27371 canReplace (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;)Z - ARG 0 world + METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index 0c4d8d2d75..206a0cb6b2 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -11,13 +11,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 2 predicate METHOD method_19118 getDistanceFromNearestOccupied (Lnet/minecraft/class_4076;)I ARG 1 pos - METHOD method_19119 getInChunkSection (Ljava/util/function/Predicate;JLnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; - ARG 1 typePredicate - ARG 2 pos - ARG 4 occupationStatus METHOD method_19123 getInChunk (Ljava/util/function/Predicate;Lnet/minecraft/class_1923;Lnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; - ARG 1 typePredicate - ARG 2 pos ARG 3 occupationStatus METHOD method_19125 getInCircle (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; ARG 1 typePredicate