From ac93736c28c162864084d55afc188c4409516ba7 Mon Sep 17 00:00:00 2001 From: turtton Date: Sat, 15 Feb 2025 15:02:22 +0900 Subject: [PATCH 1/2] Format mappings --- .../minecraft/client/MinecraftClient.mapping | 2 +- .../client/gui/screen/PresetsScreen.mapping | 6 ++--- .../client/gui/screen/StatsScreen.mapping | 2 +- .../gui/screen/ingame/BeaconScreen.mapping | 16 ++++++------ .../MultiplayerServerListWidget.mapping | 2 +- .../client/options/GameOptions.mapping | 2 +- .../minecraft/client/options/Option.mapping | 2 +- .../client/particle/BlockLeakParticle.mapping | 16 ++++++------ .../client/particle/DamageParticle.mapping | 8 +++--- .../particle/FireworksSparkParticle.mapping | 8 +++--- .../client/particle/SuspendParticle.mapping | 8 +++--- .../client/render/WorldRenderer.mapping | 2 +- .../render/block/BlockModelRenderer.mapping | 26 +++++++++---------- .../client/render/chunk/ChunkBuilder.mapping | 2 +- .../model/json/JsonUnbakedModel.mapping | 22 ++++++++-------- .../minecraft/entity/EyeOfEnderEntity.mapping | 1 - .../entity/passive/WolfEntity.mapping | 1 - .../loot/entry/LootPoolEntry.mapping | 14 +++++----- .../function/ApplyBonusLootFunction.mapping | 16 ++++++------ .../gen/chunk/NoiseChunkGenerator.mapping | 4 +-- 20 files changed, 79 insertions(+), 81 deletions(-) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 60bc3bdc9..564fac646 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -53,9 +53,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1737 heldItemRenderer Lnet/minecraft/class_759; FIELD field_1738 currentFps I FIELD field_1739 netProxy Ljava/net/Proxy; + FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_17404 renderTaskQueue Ljava/util/Queue; FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference; - FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_1741 pausedTickDelta F FIELD field_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index f737fdaec..81ad31572 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -13,12 +13,12 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen METHOD method_2195 addPreset (Lnet/minecraft/class_2561;Lnet/minecraft/class_1935;Lnet/minecraft/class_5321;Ljava/util/List;ZZZ[Lnet/minecraft/class_3229;)V ARG 1 icon ARG 3 structures + CLASS class_4196 SuperflatPresetsListWidget + CLASS class_432 SuperflatPresetEntry + METHOD method_19389 setPreset ()V CLASS class_431 SuperflatPreset FIELD field_2527 icon Lnet/minecraft/class_1792; FIELD field_2528 name Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2561;Ljava/util/function/Function;)V ARG 1 icon METHOD method_27571 getName ()Lnet/minecraft/class_2561; - CLASS class_4196 SuperflatPresetsListWidget - CLASS class_432 SuperflatPresetEntry - METHOD method_19389 setPreset ()V diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 64fb2cddd..4012d076e 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -42,9 +42,9 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 1 statType METHOD method_19410 getStatType (I)Lnet/minecraft/class_3448; ARG 1 headerColumn - CLASS class_450 ItemComparator CLASS class_4199 Entry METHOD method_19405 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_3445;IIZ)V + CLASS class_450 ItemComparator CLASS class_4202 EntityStatsListWidget CLASS class_4201 Entry FIELD field_18762 entityType Lnet/minecraft/class_1299; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 18e88d24d..c35317fc7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -8,6 +8,14 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree ARG 1 handler ARG 2 inventory ARG 3 title + CLASS class_4072 IconButtonWidget + FIELD field_18224 u I + FIELD field_18225 v I + METHOD (IIII)V + ARG 1 x + ARG 2 y + ARG 3 u + ARG 4 v CLASS class_467 CancelButtonWidget METHOD (Lnet/minecraft/class_466;II)V ARG 2 x @@ -34,11 +42,3 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_2401 setDisabled (Z)V ARG 1 disabled METHOD method_2402 isDisabled ()Z - CLASS class_4072 IconButtonWidget - FIELD field_18224 u I - FIELD field_18225 v I - METHOD (IIII)V - ARG 1 x - ARG 2 y - ARG 3 u - ARG 4 v diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index bb356d6a4..8dcd32bd1 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -20,7 +20,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_20126 setLanServers (Ljava/util/List;)V ARG 1 lanServers METHOD method_20131 updateEntries ()V - CLASS class_504 Entry CLASS class_4268 ScanningEntry FIELD field_19112 client Lnet/minecraft/class_310; CLASS class_4269 LanServerEntry @@ -48,3 +47,4 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_22110 swapEntries (II)V ARG 1 i ARG 2 j + CLASS class_504 Entry diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index c67ebc2be..94bfabd31 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -49,9 +49,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions FIELD field_1869 keyDrop Lnet/minecraft/class_304; FIELD field_1870 viewDistance I FIELD field_1871 keyPickItem Lnet/minecraft/class_304; + FIELD field_1872 overrideWidth I FIELD field_18725 backgroundForChatOnly Z FIELD field_18726 textBackgroundOpacity D - FIELD field_1872 overrideWidth I FIELD field_1873 autoSuggestions Z FIELD field_1874 keyLoadToolbarActivator Lnet/minecraft/class_304; FIELD field_1875 tutorialStep Lnet/minecraft/class_1157; diff --git a/mappings/net/minecraft/client/options/Option.mapping b/mappings/net/minecraft/client/options/Option.mapping index 4626874ee..80f7e5e36 100644 --- a/mappings/net/minecraft/client/options/Option.mapping +++ b/mappings/net/minecraft/client/options/Option.mapping @@ -20,8 +20,8 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option FIELD field_1921 CHAT_OPACITY Lnet/minecraft/class_4067; FIELD field_1922 GUI_SCALE Lnet/minecraft/class_4064; FIELD field_1923 VISIBILITY Lnet/minecraft/class_4064; - FIELD field_19243 DISCRETE_MOUSE_SCROLL Lnet/minecraft/class_4062; FIELD field_1924 AO Lnet/minecraft/class_4064; + FIELD field_19243 DISCRETE_MOUSE_SCROLL Lnet/minecraft/class_4062; FIELD field_1925 CHAT_LINKS_PROMPT Lnet/minecraft/class_4062; FIELD field_1926 SNOOPER Lnet/minecraft/class_4062; FIELD field_1927 VSYNC Lnet/minecraft/class_4062; diff --git a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping index 9e02fbcf9..a256a8884 100644 --- a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping @@ -9,14 +9,6 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 8 fluid METHOD method_18821 updateAge ()V METHOD method_18822 updateVelocity ()V - CLASS class_664 DrippingLavaFactory - FIELD field_18295 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_665 FallingWaterFactory - FIELD field_18297 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_4082 DrippingLava METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V ARG 2 x @@ -101,3 +93,11 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle FIELD field_22440 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_664 DrippingLavaFactory + FIELD field_18295 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider + CLASS class_665 FallingWaterFactory + FIELD field_18297 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/DamageParticle.mapping b/mappings/net/minecraft/client/particle/DamageParticle.mapping index a9df229d6..3f9b0111f 100644 --- a/mappings/net/minecraft/client/particle/DamageParticle.mapping +++ b/mappings/net/minecraft/client/particle/DamageParticle.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle ARG 2 x ARG 4 y ARG 6 z + CLASS class_3939 Factory + FIELD field_18291 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_658 DefaultFactory FIELD field_17790 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -12,7 +16,3 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle FIELD field_17791 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_3939 Factory - FIELD field_18291 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping index 4c764eb0b..0f58345d1 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkParticle + CLASS class_3997 FlashFactory + FIELD field_17810 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_678 Flash METHOD (Lnet/minecraft/class_638;DDD)V ARG 1 world @@ -74,7 +78,3 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic ARG 2 fadeColors ARG 3 trail ARG 4 flocker - CLASS class_3997 FlashFactory - FIELD field_17810 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SuspendParticle.mapping b/mappings/net/minecraft/client/particle/SuspendParticle.mapping index f9f3d5986..eaa22a41f 100644 --- a/mappings/net/minecraft/client/particle/SuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/SuspendParticle.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ + CLASS class_3991 Factory + FIELD field_17880 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_730 DolphinFactory FIELD field_17881 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -19,7 +23,3 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle FIELD field_17883 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_3991 Factory - FIELD field_17880 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index cf3c70a77..6aaeebeed 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -332,6 +332,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 x ARG 2 y ARG 3 z + CLASS class_5347 ShaderException CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; @@ -347,4 +348,3 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3299 updateCullingState (BLnet/minecraft/class_2350;)V ARG 1 parentCullingState ARG 2 from - CLASS class_5347 ShaderException diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 074daad7f..d68ac712d 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -83,6 +83,19 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender ARG 8 random ARG 9 seed ARG 11 overlay + CLASS class_4303 BrightnessCache + FIELD field_19320 enabled Z + FIELD field_19321 intCache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; + FIELD field_19322 floatCache Lit/unimi/dsi/fastutil/longs/Long2FloatLinkedOpenHashMap; + METHOD method_20548 enable ()V + METHOD method_20549 getInt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I + ARG 1 state + ARG 3 pos + METHOD method_20550 disable ()V + METHOD method_20551 getFloat (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)F + ARG 1 state + ARG 2 blockView + ARG 3 pos CLASS class_779 NeighborData FIELD field_4189 nonCubicWeight Z FIELD field_4191 faces [Lnet/minecraft/class_2350; @@ -113,16 +126,3 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender METHOD method_3394 getTranslations (Lnet/minecraft/class_2350;)Lnet/minecraft/class_778$class_781; CLASS class_782 NeighborOrientation FIELD field_4222 shape I - CLASS class_4303 BrightnessCache - FIELD field_19320 enabled Z - FIELD field_19321 intCache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; - FIELD field_19322 floatCache Lit/unimi/dsi/fastutil/longs/Long2FloatLinkedOpenHashMap; - METHOD method_20548 enable ()V - METHOD method_20549 getInt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I - ARG 1 state - ARG 3 pos - METHOD method_20550 disable ()V - METHOD method_20551 getFloat (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)F - ARG 1 state - ARG 2 blockView - ARG 3 pos diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index d2c955ec5..53ce43719 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_3635 scheduleUpload (Lnet/minecraft/class_287;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; ARG 1 buffer ARG 2 glBuffer + CLASS class_4690 Result CLASS class_849 ChunkData FIELD field_4450 nonEmptyLayers Ljava/util/Set; FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; @@ -119,4 +120,3 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 3 blockEntity CLASS class_4579 SortTask FIELD field_20841 data Lnet/minecraft/class_846$class_849; - CLASS class_4690 Result diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index dd7d7ce10..67d949409 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -56,6 +56,17 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 3 side ARG 4 settings ARG 5 id + CLASS class_4751 GuiLight + FIELD field_21858 Lnet/minecraft/class_793$class_4751; + COMMENT the model will be shaded from the front, like a basic item + FIELD field_21859 Lnet/minecraft/class_793$class_4751; + COMMENT the model will be shaded from the side, like a block. + FIELD field_21860 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_24299 isSide ()Z + METHOD method_24300 deserialize (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; + ARG 0 value CLASS class_795 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 element @@ -76,14 +87,3 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 2 object METHOD method_3453 deserializeAmbientOcclusion (Lcom/google/gson/JsonObject;)Z ARG 1 json - CLASS class_4751 GuiLight - FIELD field_21858 Lnet/minecraft/class_793$class_4751; - COMMENT the model will be shaded from the front, like a basic item - FIELD field_21859 Lnet/minecraft/class_793$class_4751; - COMMENT the model will be shaded from the side, like a block. - FIELD field_21860 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name - METHOD method_24299 isSide ()Z - METHOD method_24300 deserialize (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; - ARG 0 value diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping index 9f47bf63a..1a4724767 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping @@ -18,6 +18,5 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V COMMENT Sets where the eye will fly towards. COMMENT If close enough, it will fly directly towards it, otherwise, it will fly upwards, in the direction of the BlockPos. - COMMENT ARG 1 pos COMMENT the block the eye of ender is drawn towards diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index a0913ae95..318de1abb 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity COMMENT Returns this wolf's brightness multiplier based on the fur wetness. COMMENT

COMMENT the brightness multiplier represents how much darker the wolf gets while its fur is wet. The multiplier changes (from 0.75 to 1.0 incrementally) when a wolf shakes. - COMMENT ARG 1 tickDelta COMMENT progress for linearly interpolating between the previous and current game state. COMMENT @return Brightness as a float value between 0.75 and 1.0. diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping index 0f79dfa5e..55cbef152 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping @@ -8,13 +8,6 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry ARG 1 context METHOD method_415 validate (Lnet/minecraft/class_58;)V ARG 1 reporter - CLASS class_80 Builder - FIELD field_990 conditions Ljava/util/List; - METHOD method_417 alternatively (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_65$class_66; - ARG 1 builder - METHOD method_418 getThisBuilder ()Lnet/minecraft/class_79$class_80; - METHOD method_419 build ()Lnet/minecraft/class_79; - METHOD method_420 getConditions ()[Lnet/minecraft/class_5341; CLASS class_5337 Serializer METHOD method_422 addEntryFields (Lcom/google/gson/JsonObject;Lnet/minecraft/class_79;Lcom/google/gson/JsonSerializationContext;)V ARG 1 json @@ -24,3 +17,10 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry ARG 1 json ARG 2 context ARG 3 conditions + CLASS class_80 Builder + FIELD field_990 conditions Ljava/util/List; + METHOD method_417 alternatively (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_65$class_66; + ARG 1 builder + METHOD method_418 getThisBuilder ()Lnet/minecraft/class_79$class_80; + METHOD method_419 build ()Lnet/minecraft/class_79; + METHOD method_420 getConditions ()[Lnet/minecraft/class_5341; diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 9c1579911..e404f6a04 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -25,6 +25,14 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction ARG 0 enchantment ARG 1 probability ARG 2 extra + CLASS class_100 UniformBonusCount + FIELD field_1016 ID Lnet/minecraft/class_2960; + FIELD field_1017 bonusMultiplier I + METHOD (I)V + ARG 1 bonusMultiplier + METHOD method_471 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; + ARG 0 json + ARG 1 context CLASS class_95 BinomialWithBonusCount FIELD field_1012 probability F FIELD field_1013 ID Lnet/minecraft/class_2960; @@ -54,11 +62,3 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction ARG 0 json ARG 1 context CLASS class_99 Serializer - CLASS class_100 UniformBonusCount - FIELD field_1016 ID Lnet/minecraft/class_2960; - FIELD field_1017 bonusMultiplier I - METHOD (I)V - ARG 1 bonusMultiplier - METHOD method_471 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 0 json - ARG 1 context diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index cce60acbb..407189553 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -67,11 +67,11 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 4 predicate METHOD method_26983 (Lnet/minecraft/class_1923;Lit/unimi/dsi/fastutil/objects/ObjectList;IILit/unimi/dsi/fastutil/objects/ObjectList;Lnet/minecraft/class_3449;)V ARG 5 start - METHOD method_28551 ([F)V - ARG 0 array METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z ARG 1 seed ARG 3 settingsKey + METHOD method_28551 ([F)V + ARG 0 array METHOD method_28553 getRandomDensityAt (II)D ARG 1 x ARG 2 z From 1069771947eaed4c1c3c718a21b7d321a82f8051 Mon Sep 17 00:00:00 2001 From: turtton Date: Sat, 15 Feb 2025 15:07:35 +0900 Subject: [PATCH 2/2] Add test related mappings --- mappings/net/minecraft/test/GameTest.mapping | 6 ++++++ .../minecraft/test/PositionedException.mapping | 1 + .../minecraft/test/StructureTestUtil.mapping | 17 ++++++++++++++++- .../net/minecraft/test/TestFunction.mapping | 2 ++ .../net/minecraft/test/TestFunctions.mapping | 4 ++++ mappings/net/minecraft/test/TestRunner.mapping | 8 ++++++++ mappings/net/minecraft/test/TestSet.mapping | 3 +++ mappings/net/minecraft/test/TestUtil.mapping | 1 + 8 files changed, 41 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTest.mapping index 35834c637..f9cdca78d 100644 --- a/mappings/net/minecraft/test/GameTest.mapping +++ b/mappings/net/minecraft/test/GameTest.mapping @@ -7,8 +7,12 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest FIELD field_20565 started Z FIELD field_20567 completed Z FIELD field_20569 throwable Ljava/lang/Throwable; + FIELD field_21452 timedTaskRunners Ljava/util/Collection; + FIELD field_21453 ticksByRunnables Lit/unimi/dsi/fastutil/objects/Object2LongMap; FIELD field_21454 expectedStopTime J + FIELD field_21455 tick J FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; + FIELD field_25301 rotation Lnet/minecraft/class_2470; METHOD method_22165 tick ()V METHOD method_22166 init (Lnet/minecraft/class_2338;I)V METHOD method_22167 addListener (Lnet/minecraft/class_4518;)V @@ -31,3 +35,5 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest METHOD method_23638 getStructureName ()Ljava/lang/String; METHOD method_23639 start ()V METHOD method_23640 complete ()V + METHOD method_29402 getRotation ()Lnet/minecraft/class_2470; + METHOD method_29403 getTestfunction ()Lnet/minecraft/class_4529; diff --git a/mappings/net/minecraft/test/PositionedException.mapping b/mappings/net/minecraft/test/PositionedException.mapping index bd6803ccf..29e463bb7 100644 --- a/mappings/net/minecraft/test/PositionedException.mapping +++ b/mappings/net/minecraft/test/PositionedException.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4513 net/minecraft/test/PositionedException FIELD field_20541 pos Lnet/minecraft/class_2338; FIELD field_20542 relativePos Lnet/minecraft/class_2338; + FIELD field_21449 tick J METHOD method_22150 getDebugMessage ()Ljava/lang/String; METHOD method_22151 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 556563ec3..7a82d202a 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -14,6 +14,14 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 1 pos ARG 2 world METHOD method_22248 placeStartButton (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V + ARG 0 pos + ARG 1 relativePos + ARG 2 rotation + ARG 3 world + METHOD method_22250 createStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;ILnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; + ARG 0 structureName + ARG 1 pos + ARG 2 rotation METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 0 structure ARG 1 pos @@ -35,10 +43,17 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 pos ARG 1 radius ARG 2 world - METHOD method_22368 (ILnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V + METHOD method_22368 resetBlock (ILnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V ARG 0 altitude ARG 1 pos ARG 2 world METHOD method_22369 createStructure (Ljava/lang/String;Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499; ARG 0 structureId ARG 1 world + METHOD method_29408 getRotation (I)Lnet/minecraft/class_2470; + ARG 0 steps + METHOD method_29409 getStructureBlockBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341; + ARG 0 pos + ARG 1 relativePos + ARG 2 rotation + METHOD method_29410 getStructureBlockBox (Lnet/minecraft/class_2633;)Lnet/minecraft/class_3341; diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index 91ca4c7a3..525467a49 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction FIELD field_20587 starter Ljava/util/function/Consumer; FIELD field_20588 tickLimit I FIELD field_21460 duration J + FIELD field_25306 rotation Lnet/minecraft/class_2470; METHOD method_22296 getStructurePath ()Ljava/lang/String; METHOD method_22297 start (Lnet/minecraft/class_4516;)V METHOD method_22298 getStructureName ()Ljava/lang/String; @@ -13,3 +14,4 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction METHOD method_22300 isRequired ()Z METHOD method_22301 getBatchId ()Ljava/lang/String; METHOD method_23649 getDuration ()J + METHOD method_29424 getRotation ()Lnet/minecraft/class_2470; diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index 46bef9dc5..760f6f637 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions FIELD field_20570 TEST_FUNCTIONS Ljava/util/Collection; FIELD field_20571 testClasses Ljava/util/Set; FIELD field_20572 WORLD_SETTERS Ljava/util/Map; + FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Collection; METHOD method_22191 getTestFunctions ()Ljava/util/Collection; METHOD method_22192 isInClass (Lnet/minecraft/class_4529;Ljava/lang/String;)Z ARG 0 testFunction @@ -17,3 +18,6 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions ARG 0 structurePath METHOD method_22200 getTestFunctionOrThrow (Ljava/lang/String;)Lnet/minecraft/class_4529; ARG 0 structurePath + METHOD method_29404 addFailedTestFunction (Lnet/minecraft/class_4529;)V + METHOD method_29405 getFailedTestFunctions ()Ljava/util/Collection; + METHOD method_29406 clearFailedTestFunctions ()V diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping index d09294a7b..cc183f894 100644 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ b/mappings/net/minecraft/test/TestRunner.mapping @@ -9,11 +9,19 @@ CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner FIELD field_20554 currentBatchIndex I FIELD field_20555 reusablePos Lnet/minecraft/class_2338$class_2339; FIELD field_20556 sizeZ I + FIELD field_25300 testPositions Ljava/util/Map; METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)V + ARG 1 batches ARG 2 pos + ARG 3 rotation + ARG 4 world + ARG 5 testManager + ARG 6 sizeZ METHOD method_22155 getTests ()Ljava/util/List; METHOD method_22156 runBatch (I)V ARG 1 index METHOD method_22159 onTestCompleted (Lnet/minecraft/class_4517;)V ARG 1 test METHOD method_22160 run ()V + METHOD method_29401 initTests (Ljava/util/Collection;)V + ARG 1 gameTests diff --git a/mappings/net/minecraft/test/TestSet.mapping b/mappings/net/minecraft/test/TestSet.mapping index e83dbae5e..9a2e14716 100644 --- a/mappings/net/minecraft/test/TestSet.mapping +++ b/mappings/net/minecraft/test/TestSet.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4524 net/minecraft/test/TestSet FIELD field_20577 tests Ljava/util/Collection; + FIELD field_25303 lisnteners Ljava/util/Collection; METHOD (Ljava/util/Collection;)V ARG 1 tests METHOD method_22229 getFailedRequiredTestCount ()I @@ -14,3 +15,5 @@ CLASS net/minecraft/class_4524 net/minecraft/test/TestSet METHOD method_22238 getTestCount ()I METHOD method_22239 isDone ()Z METHOD method_22240 getResultString ()Ljava/lang/String; + METHOD method_29407 addListener (Ljava/util/function/Consumer;)V + ARG 1 onFailed diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index e67c842f9..e47d82036 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil + FIELD field_20573 FAILURE_LOGGER Lnet/minecraft/class_4531; METHOD method_22203 startTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;)V METHOD method_22207 createBook (Ljava/lang/String;ZLjava/lang/String;)Lnet/minecraft/class_1799; ARG 0 structureName