From 717cdeca7accb81d01f4d29f9af3b041e443b537 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 24 Jan 2024 16:09:45 +0000 Subject: [PATCH] 24w04a --- build.gradle | 2 +- .../client/gui/ParentElement.mapping | 2 -- .../minecraft/client/gui/hud/DebugHud.mapping | 2 -- .../client/gui/hud/debug/DebugChart.mapping | 2 -- .../ClientCommonNetworkHandler.mapping | 4 --- .../ClientConfigurationNetworkHandler.mapping | 2 -- .../network/ClientPlayNetworkHandler.mapping | 1 + .../minecraft/entity/SpawnRestriction.mapping | 19 ++++++------- .../entity/passive/ArmadilloEntity.mapping | 1 - .../network/NetworkStateBuilder.mapping | 2 ++ .../network/message/MessageType.mapping | 26 ++--------------- .../config/DynamicRegistriesS2CPacket.mapping | 7 ----- .../s2c/play/ChatMessageS2CPacket.mapping | 9 ++---- .../s2c/play/CommonPlayerSpawnInfo.mapping | 5 +--- .../s2c/play/EntityDamageS2CPacket.mapping | 6 +--- .../packet/s2c/play/GameJoinS2CPacket.mapping | 5 +--- .../s2c/play/PlayerRespawnS2CPacket.mapping | 5 +--- .../ProfilelessChatMessageS2CPacket.mapping | 4 --- .../minecraft/registry/RegistryCodecs.mapping | 24 ---------------- .../minecraft/registry/RegistryLoader.mapping | 28 +++---------------- .../registry/SerializableRegistries.mapping | 28 ------------------- .../minecraft/registry/SimpleRegistry.mapping | 10 ------- .../registry/tag/TagPacketSerializer.mapping | 1 - mappings/net/minecraft/server/Main.mapping | 2 +- .../minecraft/server/MinecraftServer.mapping | 2 -- .../util/collection/PriorityIterator.mapping | 3 -- .../util/profiler/PerformanceLog.mapping | 2 +- .../net/minecraft/world/SpawnHelper.mapping | 5 ---- .../minecraft/world/StructureLocator.mapping | 5 +--- mappings/net/minecraft/world/World.mapping | 2 -- .../world/gen/StructureAccessor.mapping | 3 +- .../world/storage/ChunkStreamVersion.mapping | 4 +-- .../storage/EntityChunkDataAccess.mapping | 10 ------- .../world/storage/RegionFile.mapping | 1 - .../SerializingRegionBasedStorage.mapping | 16 +---------- .../storage/VersionedChunkStorage.mapping | 2 +- .../world/updater/WorldUpdater.mapping | 7 +---- 37 files changed, 35 insertions(+), 224 deletions(-) diff --git a/build.gradle b/build.gradle index 8b7033cc5a..880261474a 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w03b" +def minecraft_version = "24w04a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/gui/ParentElement.mapping b/mappings/net/minecraft/client/gui/ParentElement.mapping index 95ff0d49a9..dd438490fa 100644 --- a/mappings/net/minecraft/client/gui/ParentElement.mapping +++ b/mappings/net/minecraft/client/gui/ParentElement.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_4069 net/minecraft/client/gui/ParentElement ARG 8 element METHOD method_20083 (DDILnet/minecraft/class_364;)Z ARG 5 element - METHOD method_20086 focusOn (Lnet/minecraft/class_364;)V - ARG 1 element METHOD method_25395 setFocused (Lnet/minecraft/class_364;)V ARG 1 focused METHOD method_25396 children ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 788c33b68c..e0543b0374 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -69,8 +69,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 3 left METHOD method_53534 pushToFrameLog (J)V ARG 1 value - METHOD method_53535 pushToTickLog (J)V - ARG 1 value METHOD method_53536 shouldShowDebugHud ()Z METHOD method_53537 shouldShowRenderingChart ()Z METHOD method_53538 shouldShowPacketSizeAndPingCharts ()Z diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping index c7a95b22aa..3fb038b0c4 100644 --- a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping +++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping @@ -9,9 +9,7 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart ARG 1 value METHOD method_53469 getColor (DDIDIDI)I ARG 1 value - ARG 3 min ARG 5 minColor - ARG 6 median ARG 8 medianColor ARG 9 max ARG 11 maxColor diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping index 38214623d7..3c00307dbc 100644 --- a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping @@ -16,10 +16,6 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH ARG 3 connectionState METHOD method_11152 onCustomPayload (Lnet/minecraft/class_8710;)V ARG 1 payload - METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455$class_6890; - METHOD method_52771 handleSynchronizedTagGroup (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V - ARG 1 registryRef - ARG 2 tags METHOD method_52773 getParsedResourcePackUrl (Ljava/lang/String;)Ljava/net/URL; ARG 0 url METHOD method_52778 getPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping index 9d4428fa32..77cd1a161e 100644 --- a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping @@ -3,7 +3,5 @@ CLASS net/minecraft/class_8674 net/minecraft/client/network/ClientConfigurationN FIELD field_45597 profile Lcom/mojang/authlib/GameProfile; FIELD field_45598 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_45599 enabledFeatures Lnet/minecraft/class_7699; - METHOD method_52793 (Lnet/minecraft/class_5455$class_6892;)V - ARG 0 entry METHOD method_52797 handleCustomPayload (Lnet/minecraft/class_8710;)V ARG 1 payload diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index f807a20bb2..ccebfc71ed 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -59,6 +59,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2880 getPlayerList ()Ljava/util/Collection; METHOD method_2886 getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_2890 getWorld ()Lnet/minecraft/class_638; + METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455$class_6890; METHOD method_29356 getWorldKeys ()Ljava/util/Set; METHOD method_31363 getPlayerUuids ()Ljava/util/Collection; METHOD method_34007 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping index 3f2cb9368e..37197a551b 100644 --- a/mappings/net/minecraft/entity/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction FIELD field_6313 RESTRICTIONS Ljava/util/Map; - METHOD method_20637 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V + METHOD method_20637 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_9168;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V ARG 0 type ARG 1 location ARG 2 heightmapType @@ -11,22 +11,21 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1317$class_1319; + METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_9168; ARG 0 type METHOD method_6160 getHeightmapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903; ARG 0 type CLASS class_1318 Entry - FIELD field_19349 predicate Lnet/minecraft/class_1317$class_4306; - FIELD field_6314 heightmapType Lnet/minecraft/class_2902$class_2903; - FIELD field_6315 location Lnet/minecraft/class_1317$class_1319; - METHOD (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_1317$class_4306;)V + FIELD comp_2253 heightmapType Lnet/minecraft/class_2902$class_2903; + FIELD comp_2254 location Lnet/minecraft/class_9168; + FIELD comp_2255 predicate Lnet/minecraft/class_1317$class_4306; + METHOD (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_9168;Lnet/minecraft/class_1317$class_4306;)V ARG 1 heightmapType ARG 2 location ARG 3 predicate - CLASS class_1319 Location - METHOD (Ljava/lang/String;I)V - ARG 1 name - ARG 2 id + METHOD comp_2253 heightmapType ()Lnet/minecraft/class_2902$class_2903; + METHOD comp_2254 location ()Lnet/minecraft/class_9168; + METHOD comp_2255 predicate ()Lnet/minecraft/class_1317$class_4306; CLASS class_4306 SpawnPredicate METHOD test (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 1 type diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 934f9f8334..97a776f562 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity METHOD method_55719 getNextScuteShedCooldown ()I METHOD method_55720 updateAnimationStates ()V METHOD method_55721 isEntityThreatening (Lnet/minecraft/class_1309;)Z - ARG 1 entity METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55723 isNotIdle ()Z METHOD method_55724 unroll ()V diff --git a/mappings/net/minecraft/network/NetworkStateBuilder.mapping b/mappings/net/minecraft/network/NetworkStateBuilder.mapping index a9dbe02f34..5609d4eabf 100644 --- a/mappings/net/minecraft/network/NetworkStateBuilder.mapping +++ b/mappings/net/minecraft/network/NetworkStateBuilder.mapping @@ -50,3 +50,5 @@ CLASS net/minecraft/class_9147 net/minecraft/network/NetworkStateBuilder ARG 1 builder ARG 2 bufUpgrader CLASS class_9149 NetworkStateImpl + FIELD comp_2235 side Lnet/minecraft/class_2598; + FIELD comp_2237 bundleHandler Lnet/minecraft/class_8039; diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping index c512ee47b6..e456d18910 100644 --- a/mappings/net/minecraft/network/message/MessageType.mapping +++ b/mappings/net/minecraft/network/message/MessageType.mapping @@ -79,18 +79,12 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType ARG 0 typeKey ARG 1 registryManager ARG 2 name - METHOD method_44835 params (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2556$class_7602; - ARG 1 name CLASS class_7602 Parameters COMMENT A record holding the message type and the decoration parameters. - FIELD comp_919 type Lnet/minecraft/class_2556; - METHOD (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;)V - ARG 1 type + FIELD comp_919 type Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_2561;)V ARG 2 name - METHOD comp_919 type ()Lnet/minecraft/class_2556; - METHOD method_44836 toSerialized (Lnet/minecraft/class_5455;)Lnet/minecraft/class_2556$class_7603; - COMMENT {@return a serialized version of this instance used in packets} - ARG 1 registryManager + METHOD comp_919 type ()Lnet/minecraft/class_6880; METHOD method_44837 applyChatDecoration (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 content METHOD method_44838 applyNarrationDecoration (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; @@ -102,17 +96,3 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType COMMENT net.minecraft.server.command.TeamMsgCommand} and as the recipient name in {@link COMMENT net.minecraft.server.command.MessageCommand}. ARG 1 targetName - CLASS class_7603 Serialized - COMMENT The serialized version of {@link MessageType.Parameters} that is used in packets. - FIELD comp_922 typeId I - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD comp_922 typeId ()I - METHOD method_44840 toParameters (Lnet/minecraft/class_5455;)Ljava/util/Optional; - COMMENT {@return a deserialized version of this instance, or {@link Optional#empty} if - COMMENT {@link #typeId} is unknown to the client} - ARG 1 registryManager - METHOD method_44841 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_45038 (Lnet/minecraft/class_2556;)Lnet/minecraft/class_2556$class_7602; - ARG 1 type diff --git a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping index fb57a118c6..4fdaf7ded4 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping @@ -1,9 +1,2 @@ CLASS net/minecraft/class_8734 net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket - FIELD comp_1724 registryManager Lnet/minecraft/class_5455$class_6890; - FIELD field_45713 VANILLA_REGISTRY_OPS Lnet/minecraft/class_6903; FIELD field_48692 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD comp_1724 registryManager ()Lnet/minecraft/class_5455$class_6890; - METHOD method_56508 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index 0d68b0234d..4e2bf779da 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -19,10 +19,7 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage COMMENT COMMENT @see net.minecraft.server.network.ServerPlayerEntity#sendChatMessage COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage - FIELD comp_943 serializedParameters Lnet/minecraft/class_2556$class_7603; + FIELD comp_943 serializedParameters Lnet/minecraft/class_2556$class_7602; FIELD field_47949 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7603; - METHOD method_55898 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7602; + METHOD method_55898 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping index 4e10504a59..a2ca21a81f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_8589 net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo FIELD comp_1556 gameMode Lnet/minecraft/class_1934; FIELD comp_1557 prevGameMode Lnet/minecraft/class_1934; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD comp_1556 gameMode ()Lnet/minecraft/class_1934; METHOD comp_1557 prevGameMode ()Lnet/minecraft/class_1934; - METHOD method_52274 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_52274 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping index 4289118255..76f2fb2a62 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping @@ -3,10 +3,7 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V ARG 1 entity ARG 2 damageSource - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_49071 createDamageSource (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1282; - ARG 1 world METHOD method_49072 writeOffsetVarInt (Lnet/minecraft/class_2540;I)V ARG 0 buf ARG 1 value @@ -17,5 +14,4 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag ARG 0 buf METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243; ARG 0 pos - METHOD method_55873 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_55873 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 35d62c1849..4092d0ef45 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD field_47937 CODEC Lnet/minecraft/class_9139; METHOD (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;Z)V ARG 1 playerEntityId - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD comp_100 showDeathScreen ()Z METHOD comp_88 playerEntityId ()I METHOD comp_89 hardcore ()Z @@ -20,5 +18,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD comp_99 reducedDebugInfo ()Z METHOD method_34135 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321; ARG 0 b - METHOD method_55887 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_55887 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 1850a80235..48a7c709ec 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -4,10 +4,7 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa FIELD field_41731 KEEP_TRACKED_DATA B FIELD field_41732 KEEP_ALL B FIELD field_47962 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD comp_1729 flag ()B METHOD method_48016 hasFlag (B)Z ARG 1 flag - METHOD method_55909 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_55909 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping index a4fa429ac9..3908c96088 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_7827 net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket FIELD field_47923 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_55875 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/registry/RegistryCodecs.mapping b/mappings/net/minecraft/registry/RegistryCodecs.mapping index 0fd59d682f..44018e98b7 100644 --- a/mappings/net/minecraft/registry/RegistryCodecs.mapping +++ b/mappings/net/minecraft/registry/RegistryCodecs.mapping @@ -11,24 +11,11 @@ CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs ARG 2 alwaysSerializeAsList COMMENT whether to always serialize the list as a list COMMENT instead of serializing as one entry if the length is {@code 0} - METHOD method_40344 createRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 0 registryRef - ARG 1 lifecycle - ARG 2 elementCodec - METHOD method_40345 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/List;)Lnet/minecraft/class_2378; - ARG 2 entries - METHOD method_40347 managerEntry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; - ARG 0 registryRef - ARG 1 elementCodec - METHOD method_40348 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 2 instance METHOD method_40349 entryList (Lnet/minecraft/class_5321;Z)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 alwaysSerializeAsList COMMENT whether to always serialize the list as a list COMMENT instead of serializing as one entry if the length is {@code 0} - METHOD method_40350 (Lnet/minecraft/class_2378;)Ljava/util/List; - ARG 0 registry METHOD method_45944 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_2378; ARG 2 entries METHOD method_45945 (Lnet/minecraft/class_2378;)Ljava/util/Map; @@ -40,14 +27,3 @@ CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs ARG 0 registryRef ARG 1 lifecycle ARG 2 elementCodec - CLASS class_5501 RegistryManagerEntry - FIELD comp_290 key Lnet/minecraft/class_5321; - FIELD comp_291 rawId I - FIELD comp_292 value Ljava/lang/Object; - METHOD (Lnet/minecraft/class_5321;ILjava/lang/Object;)V - ARG 1 key - ARG 2 rawId - ARG 3 value - METHOD comp_290 key ()Lnet/minecraft/class_5321; - METHOD comp_291 rawId ()I - METHOD comp_292 value ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping index 49e45ef7b4..7e0142637e 100644 --- a/mappings/net/minecraft/registry/RegistryLoader.mapping +++ b/mappings/net/minecraft/registry/RegistryLoader.mapping @@ -4,19 +4,10 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader FIELD field_39970 LOGGER Lorg/slf4j/Logger; METHOD method_45119 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String; ARG 0 id - METHOD method_45120 (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lcom/mojang/datafixers/util/Pair;)V - ARG 2 loader - METHOD method_45121 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890; - ARG 0 resourceManager + METHOD method_45121 load (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890; ARG 1 baseRegistryManager ARG 2 entries - METHOD method_45122 load (Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_3300;Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V - ARG 0 registryInfoGetter - ARG 1 resourceManager - ARG 2 registryRef - ARG 3 newRegistry - ARG 4 decoder - ARG 5 exceptions + METHOD method_45122 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V METHOD method_45123 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V ARG 1 entry METHOD method_45124 (Ljava/lang/String;)V @@ -25,10 +16,8 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader ARG 0 entry METHOD method_45126 writeLoadingError (Ljava/util/Map;)V ARG 0 exceptions - METHOD method_45127 (Ljava/util/Map;Lnet/minecraft/class_7655$class_7657;)Lcom/mojang/datafixers/util/Pair; + METHOD method_45127 (Ljava/util/Map;Lnet/minecraft/class_7655$class_7657;)Lnet/minecraft/class_7655$class_9158; ARG 1 entry - METHOD method_45128 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 loader METHOD method_45129 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V ARG 1 elementEntry METHOD method_45130 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960; @@ -40,20 +29,11 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader ARG 1 additionalRegistries METHOD method_46620 createInfo (Lnet/minecraft/class_2385;)Lnet/minecraft/class_6903$class_7862; ARG 0 registry - METHOD method_46621 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 pair METHOD method_46622 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V ARG 1 entry CLASS class_7656 RegistryLoadable - METHOD load (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V - ARG 1 resourceManager - ARG 2 registryInfoGetter CLASS class_7657 Entry - METHOD method_45131 getLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lcom/mojang/datafixers/util/Pair; + METHOD method_45131 getLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_7655$class_9158; ARG 1 lifecycle - ARG 2 exceptions - METHOD method_45132 (Lnet/minecraft/class_2385;Ljava/util/Map;Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V - ARG 3 resourceManager - ARG 4 registryInfoGetter METHOD method_54920 addToCloner (Ljava/util/function/BiConsumer;)V ARG 1 callback diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping index 16b9345041..cf196d5a57 100644 --- a/mappings/net/minecraft/registry/SerializableRegistries.mapping +++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping @@ -1,35 +1,7 @@ CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries - FIELD field_40587 CODEC Lcom/mojang/serialization/Codec; - FIELD field_40588 REGISTRIES Ljava/util/Map; - METHOD method_45948 createCodec ()Lcom/mojang/serialization/Codec; - METHOD method_45949 getNetworkCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - ARG 0 registryRef - METHOD method_45950 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 1 codec - METHOD method_45951 add (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V - ARG 0 builder - ARG 1 key - ARG 2 networkCodec - METHOD method_45952 createDynamicRegistryManagerCodec (Lcom/mojang/serialization/codecs/UnboundedMapCodec;)Lcom/mojang/serialization/Codec; - ARG 0 networkCodec METHOD method_45953 streamRegistryManagerEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream; ARG 0 combinedRegistries - METHOD method_45954 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/DataResult; - ARG 0 registry - METHOD method_45955 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_2378; - ARG 0 entry METHOD method_45956 stream (Lnet/minecraft/class_5455;)Ljava/util/stream/Stream; ARG 0 dynamicRegistryManager - METHOD method_45957 (Lnet/minecraft/class_7782$class_7783;)Lcom/mojang/serialization/Codec; - ARG 0 info - METHOD method_45959 (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - ARG 0 registryRef - METHOD method_45960 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_5321; - ARG 0 entry - METHOD method_45961 (Lnet/minecraft/class_5455;)Ljava/util/Map; - ARG 0 registryManager - METHOD method_45963 (Lnet/minecraft/class_5455$class_6892;)Z - ARG 0 entry METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream; ARG 0 combinedRegistries - CLASS class_7783 Info diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index 5b3beee8fe..99cd184cf1 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry COMMENT COMMENT @see Registry FIELD field_11107 idToEntry Ljava/util/Map; - FIELD field_11109 nextId I FIELD field_25067 keyToEntry Ljava/util/Map; FIELD field_26682 rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList; FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Reference2IntMap; @@ -13,7 +12,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry FIELD field_36461 valueToEntry Ljava/util/Map; FIELD field_36462 tagToEntryList Ljava/util/Map; FIELD field_36463 frozen Z - FIELD field_36634 cachedEntries Ljava/util/List; FIELD field_36635 LOGGER Lorg/slf4j/Logger; FIELD field_40584 intrusiveValueToEntry Ljava/util/Map; FIELD field_41126 key Lnet/minecraft/class_5321; @@ -49,9 +47,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry ARG 1 valuex METHOD method_40274 assertNotFrozen (Lnet/minecraft/class_5321;)V ARG 1 key - METHOD method_40277 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; - ARG 1 key - METHOD method_40561 getEntries ()Ljava/util/List; METHOD method_40562 createNamedEntryList (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888; ARG 1 tag METHOD method_40563 (Lnet/minecraft/class_6862;)Ljava/lang/String; @@ -64,9 +59,4 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry ARG 0 value ARG 1 entry METHOD method_45939 assertNotFrozen ()V - METHOD method_46744 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883; - ARG 1 rawId - ARG 2 key - ARG 3 value - ARG 4 lifecycle CLASS 1 diff --git a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping index e69730835d..2c622bf89e 100644 --- a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping +++ b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping @@ -31,7 +31,6 @@ CLASS net/minecraft/class_6864 net/minecraft/registry/tag/TagPacketSerializer ARG 1 buf METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6864$class_5748; ARG 0 buf - METHOD method_40108 isEmpty ()Z CLASS class_6865 Loader METHOD accept (Lnet/minecraft/class_6862;Ljava/util/List;)V ARG 1 tag diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index 962def5a8c..381128cb46 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/server/Main FIELD field_24625 LOGGER Lorg/slf4j/Logger; METHOD main ([Ljava/lang/String;)V ARG 0 args - METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;)V + METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;Z)V ARG 0 session ARG 1 dataFixer ARG 2 eraseCache diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index c1ca9732ff..363e4ddb92 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -440,8 +440,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_52344 shouldLogIps ()Z METHOD method_53501 (Lnet/minecraft/class_3222;)V ARG 0 player - METHOD method_53620 tickTickLog (J)V - ARG 1 nanos METHOD method_5387 isMainThread ()Z METHOD method_54809 isPaused ()Z METHOD method_54831 updateAutosaveTicks ()V diff --git a/mappings/net/minecraft/util/collection/PriorityIterator.mapping b/mappings/net/minecraft/util/collection/PriorityIterator.mapping index 3038509df5..bcc4af8b13 100644 --- a/mappings/net/minecraft/util/collection/PriorityIterator.mapping +++ b/mappings/net/minecraft/util/collection/PriorityIterator.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_8917 net/minecraft/util/collection/PriorityIterator - FIELD field_46956 entries Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_54723 (I)Ljava/util/Deque; ARG 0 p - METHOD method_54725 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap$Entry;)Z - ARG 0 entry METHOD method_54726 enqueue (Ljava/lang/Object;I)V ARG 1 value ARG 2 priority diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping index 6f202db271..7d4decd7fa 100644 --- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping +++ b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog FIELD field_45719 SIZE I - FIELD field_45720 data [J + FIELD field_45720 data [[J FIELD field_45721 currentIndex I FIELD field_45722 maxIndex I METHOD method_53064 size ()I diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index ea7eb6f107..6240adabe7 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -87,11 +87,6 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 3 spawnGroup ARG 4 spawnEntry ARG 5 pos - METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z - ARG 0 location - ARG 1 world - ARG 2 pos - ARG 3 entityType METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_6880;Lnet/minecraft/class_1923;Lnet/minecraft/class_5819;)V ARG 0 world ARG 1 biomeEntry diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index ec9aabc161..75faffbdc9 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator FIELD field_36226 START_NOT_PRESENT_REFERENCE I FIELD field_36227 chunkIoWorker Lnet/minecraft/class_6830; FIELD field_36228 registryManager Lnet/minecraft/class_5455; - FIELD field_36229 biomeRegistry Lnet/minecraft/class_2378; FIELD field_36230 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_36231 worldKey Lnet/minecraft/class_5321; FIELD field_36232 chunkGenerator Lnet/minecraft/class_2794; @@ -13,7 +12,6 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator FIELD field_36236 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_36237 cachedStructuresByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_36238 generationPossibilityByStructure Ljava/util/Map; - FIELD field_36418 structureRegistry Lnet/minecraft/class_2378; FIELD field_37750 noiseConfig Lnet/minecraft/class_7138; METHOD (Lnet/minecraft/class_6830;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_5321;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Lnet/minecraft/class_5539;Lnet/minecraft/class_1966;JLcom/mojang/datafixers/DataFixer;)V ARG 1 chunkIoWorker @@ -40,10 +38,9 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)V ARG 1 pos ARG 2 structure - METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; + METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833; ARG 1 pos ARG 2 type - ARG 3 skipReferencedStructures METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;ZJ)Lnet/minecraft/class_6833; ARG 1 pos ARG 2 structure diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index dedc396945..308f9f6c55 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -28,7 +28,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9235 rainGradient F FIELD field_9236 isClient Z FIELD field_9238 lcgBlockSeedIncrement I - FIELD field_9247 dimension Lnet/minecraft/class_5321; FIELD field_9249 iteratingTickingBlockEntities Z FIELD field_9251 thunderGradientPrev F FIELD field_9253 rainGradientPrev F @@ -167,7 +166,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 4 category ARG 5 volume ARG 6 pitch - METHOD method_44013 getDimensionKey ()Lnet/minecraft/class_5321; METHOD method_45445 playSound (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V ARG 1 source ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index 874c17b252..9fff8bc5a5 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -40,10 +40,9 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor COMMENT child piece of it. ARG 1 pos ARG 2 structure - METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; + METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833; ARG 1 chunkPos ARG 2 structure - ARG 3 skipExistingChunk METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V ARG 1 structureStart METHOD method_41032 acceptStructureStarts (Lnet/minecraft/class_3195;Lit/unimi/dsi/fastutil/longs/LongSet;Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping b/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping index 62c3ad5d6b..cda10fa13c 100644 --- a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping +++ b/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping @@ -6,10 +6,8 @@ CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkStreamVersion FIELD field_20446 id I FIELD field_20447 inputStreamWrapper Lnet/minecraft/class_4486$class_4487; FIELD field_20448 outputStreamWrapper Lnet/minecraft/class_4486$class_4487; - METHOD (ILnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V + METHOD (ILjava/lang/String;Lnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V ARG 1 id - ARG 2 inputStreamWrapper - ARG 3 outputStreamWrapper METHOD method_21882 getId ()I METHOD method_21883 get (I)Lnet/minecraft/class_4486; ARG 0 id diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index 62f6f65e3f..fad2699158 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -1,18 +1,10 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess - FIELD field_27231 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_27232 LOGGER Lorg/slf4j/Logger; FIELD field_27233 world Lnet/minecraft/class_3218; - FIELD field_27234 dataLoadWorker Lnet/minecraft/class_4698; FIELD field_27235 emptyChunks Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_31414 ENTITIES_KEY Ljava/lang/String; FIELD field_31415 POSITION_KEY Ljava/lang/String; FIELD field_34056 taskExecutor Lnet/minecraft/class_3846; - METHOD (Lnet/minecraft/class_3218;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V - ARG 1 world - ARG 2 path - ARG 3 dataFixer - ARG 4 dsync - ARG 5 executor METHOD method_31730 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void; ARG 1 ex METHOD method_31731 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_5566; @@ -26,5 +18,3 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess ARG 0 pos METHOD method_31736 getChunkPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1923; ARG 0 chunkNbt - METHOD method_31737 fixChunkData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 chunkNbt diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 6213b68631..c572dbb7ae 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V ARG 1 file ARG 2 directory - ARG 3 outputChunkStreamVersion ARG 4 dsync METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V ARG 1 file diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index c5dc160e4f..910935218a 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -3,22 +3,10 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase FIELD field_18692 loadedElements Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_18693 unsavedElements Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; FIELD field_18695 factory Ljava/util/function/Function; - FIELD field_19228 dataFixer Lcom/mojang/datafixers/DataFixer; - FIELD field_19229 dataFixTypes Lnet/minecraft/class_4284; - FIELD field_21505 worker Lnet/minecraft/class_4698; FIELD field_24750 codecFactory Ljava/util/function/Function; FIELD field_27240 world Lnet/minecraft/class_5539; FIELD field_31427 SECTIONS_KEY Ljava/lang/String; FIELD field_39315 dynamicRegistryManager Lnet/minecraft/class_5455; - METHOD (Ljava/nio/file/Path;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V - ARG 1 path - ARG 2 codecFactory - ARG 3 factory - ARG 4 dataFixer - ARG 5 dataFixTypes - ARG 6 dsync - ARG 7 dynamicRegistryManager - ARG 8 world METHOD method_19288 onUpdate (J)V ARG 1 pos METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V @@ -40,10 +28,8 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase METHOD method_20367 serialize (Lnet/minecraft/class_1923;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; ARG 1 chunkPos ARG 2 ops - METHOD method_20368 update (Lnet/minecraft/class_1923;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)V + METHOD method_20368 update (Lnet/minecraft/class_1923;Lnet/minecraft/class_6903;Lnet/minecraft/class_2487;)V ARG 1 pos - ARG 2 ops - ARG 3 data METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I ARG 0 dynamic METHOD method_20370 save (Lnet/minecraft/class_1923;)V diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index b4399b0010..ae8e6373f2 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage ARG 4 generatorCodecKey METHOD method_17908 getDataVersion (Lnet/minecraft/class_2487;)I ARG 0 nbt - METHOD method_17910 setNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V + METHOD method_17910 setNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos ARG 2 nbt METHOD method_23696 getNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 141db53088..11179311d1 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -17,16 +17,11 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5766 upgradedChunkCount I FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I - METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;Z)V + METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;ZZ)V ARG 1 session ARG 2 dataFixer ARG 3 dimensionOptionsRegistry ARG 4 eraseCache - METHOD method_17829 (Ljava/io/File;Ljava/lang/String;)Z - ARG 0 directory - ARG 1 name - METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List; - ARG 1 world METHOD method_28304 getWorlds ()Ljava/util/Set; METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F ARG 1 world