From f0372ee01ceb55d9bc386f03e2aaba455cc94fe3 Mon Sep 17 00:00:00 2001 From: modmuss Date: Wed, 6 Mar 2024 21:57:57 +0000 Subject: [PATCH] Add formatMappings task (#3811) * Add formatMappings task * Fix build * Cleanup --- .github/workflows/build.yml | 3 ++ README.md | 3 ++ build.gradle | 5 +++ filament/gradle.properties | 2 +- .../task/mappingio/FormatMappingsTask.java | 41 +++++++++++++++++++ .../block/dispenser/DispenserBehavior.mapping | 34 +++++++-------- .../minecraft/client/MinecraftClient.mapping | 2 +- .../client/gui/screen/StatsScreen.mapping | 8 ++-- .../gui/screen/ingame/BeaconScreen.mapping | 14 +++---- .../MultiplayerServerListWidget.mapping | 2 +- .../minecraft/client/model/ModelPart.mapping | 26 ++++++------ .../client/option/GameOptions.mapping | 2 +- .../client/particle/DamageParticle.mapping | 8 ++-- .../particle/FireworksSparkParticle.mapping | 8 ++-- .../client/particle/FlameParticle.mapping | 8 ++-- .../client/particle/SquidInkParticle.mapping | 8 ++-- .../client/particle/SuspendParticle.mapping | 8 ++-- .../render/ChunkRenderingDataPreparer.mapping | 26 ++++++------ .../render/block/BlockModelRenderer.mapping | 40 +++++++++--------- .../client/render/chunk/ChunkBuilder.mapping | 2 +- .../model/json/JsonUnbakedModel.mapping | 30 +++++++------- .../render/model/json/ModelOverride.mapping | 16 ++++---- .../render/model/json/ModelVariantMap.mapping | 4 +- .../function/ApplyBonusLootFunction.mapping | 16 ++++---- .../network/codec/PacketCodecs.mapping | 22 +++++----- 25 files changed, 195 insertions(+), 143 deletions(-) create mode 100644 filament/src/main/java/net/fabricmc/filament/task/mappingio/FormatMappingsTask.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aed02fc074..6280560b1a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,9 @@ jobs: steps: - uses: actions/checkout@v4 - run: ./gradlew build javadocJar checkMappings --stacktrace --warning-mode fail + - run: ./gradlew formatMappings --stacktrace --warning-mode fail + - name: Check mapping format + run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi - name: Build artifacts if: ${{ matrix.java == '21-jdk' }} continue-on-error: true diff --git a/README.md b/README.md index 7b566e17bc..8e35ee26d5 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,6 @@ Downloads the client and server Minecraft jars for the current Minecraft version ### `mergeJars` Merges the client and server jars into one merged jar, located at `VERSION-merged.jar` in the mappings directory where `VERSION` is the current Minecraft version. + +### `formatMappings` +Formats and sorts the mappings, ensuring that they are in a consistent order. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 88fa692086..9b01c1e0d1 100644 --- a/build.gradle +++ b/build.gradle @@ -106,6 +106,7 @@ import net.fabricmc.filament.task.base.WithFileOutput import net.fabricmc.filament.task.enigma.MapSpecializedMethodsTask import net.fabricmc.filament.task.mappingio.CompleteMappingsTask import net.fabricmc.filament.task.mappingio.ConvertMappingsTask +import net.fabricmc.filament.task.mappingio.FormatMappingsTask import net.fabricmc.filament.task.mappingio.MergeMappingsTask import net.fabricmc.mappingio.format.MappingFormat import net.fabricmc.nameproposal.MappingNameCompleter @@ -458,6 +459,10 @@ tasks.register('decompileCFR', JavaExec) { } } +tasks.register("formatMappings", FormatMappingsTask) { + input = file("mappings") +} + javadoc { dependsOn genFakeSource group = "javadoc generation" diff --git a/filament/gradle.properties b/filament/gradle.properties index af3f073a8d..0a148a20aa 100644 --- a/filament/gradle.properties +++ b/filament/gradle.properties @@ -1 +1 @@ -filament_version=0.7.1 \ No newline at end of file +filament_version=0.8.0 \ No newline at end of file diff --git a/filament/src/main/java/net/fabricmc/filament/task/mappingio/FormatMappingsTask.java b/filament/src/main/java/net/fabricmc/filament/task/mappingio/FormatMappingsTask.java new file mode 100644 index 0000000000..ff351f5ee8 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/mappingio/FormatMappingsTask.java @@ -0,0 +1,41 @@ +package net.fabricmc.filament.task.mappingio; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.Objects; + +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.tasks.InputDirectory; +import org.gradle.api.tasks.OutputDirectory; +import org.gradle.api.tasks.TaskAction; + +import net.fabricmc.filament.task.base.FilamentTask; +import net.fabricmc.mappingio.MappingReader; +import net.fabricmc.mappingio.MappingWriter; +import net.fabricmc.mappingio.format.MappingFormat; +import net.fabricmc.mappingio.tree.MemoryMappingTree; +import net.fabricmc.mappingio.tree.VisitOrder; + +public abstract class FormatMappingsTask extends FilamentTask { + @InputDirectory + public abstract DirectoryProperty getInput(); + + @OutputDirectory + protected abstract DirectoryProperty getOutput(); + + public FormatMappingsTask() { + getOutput().set(getInput()); + } + + @TaskAction + void run() throws IOException { + Path path = getInput().get().getAsFile().toPath(); + + MappingWriter writer = MappingWriter.create(path, MappingFormat.ENIGMA_DIR); + Objects.requireNonNull(writer, "writer"); + + MemoryMappingTree tree = new MemoryMappingTree(); + MappingReader.read(path, MappingFormat.ENIGMA_DIR, tree); + tree.accept(writer, VisitOrder.createByName()); + } +} diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index d12cc6cf96..b5f1061be0 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -12,23 +12,6 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 0 pointer ARG 1 entityType ARG 2 direction - CLASS 2 - METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V - ARG 1 entity - CLASS 3 - METHOD method_27159 (Lnet/minecraft/class_1309;)Z - ARG 0 entity - CLASS 4 - METHOD method_27160 (Lnet/minecraft/class_1496;)Z - ARG 0 entity - CLASS 5 - METHOD method_27161 (Lnet/minecraft/class_1492;)Z - ARG 0 entity - CLASS 7 - METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V - ARG 1 entity - CLASS 9 - FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347; CLASS 10 FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347; CLASS 17 @@ -40,6 +23,9 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 1 pointer ARG 2 emptyBottleStack ARG 3 filledBottleStack + CLASS 2 + METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V + ARG 1 entity CLASS 22 FIELD field_38001 fallback Lnet/minecraft/class_2347; CLASS 24 @@ -59,3 +45,17 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior CLASS 1 METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity + CLASS 3 + METHOD method_27159 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + CLASS 4 + METHOD method_27160 (Lnet/minecraft/class_1496;)Z + ARG 0 entity + CLASS 5 + METHOD method_27161 (Lnet/minecraft/class_1492;)Z + ARG 0 entity + CLASS 7 + METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V + ARG 1 entity + CLASS 9 + FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 283fbf458c..27da3c02cb 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -87,9 +87,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1735 fpsCounter I FIELD field_1738 currentFps I FIELD field_1739 networkProxy 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/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index a5db5d4e81..24017e29b7 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -64,10 +64,6 @@ 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 - METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I - ARG 1 a - ARG 2 b CLASS class_4199 Entry FIELD field_33830 item Lnet/minecraft/class_1792; METHOD (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V @@ -79,6 +75,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 4 y ARG 5 white METHOD method_37307 getItem ()Lnet/minecraft/class_1792; + CLASS class_450 ItemComparator + METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I + ARG 1 a + ARG 2 b CLASS class_4202 EntityStatsListWidget FIELD field_18763 screen Lnet/minecraft/class_447; METHOD (Lnet/minecraft/class_447;Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index bd6b7c3f16..e6b180fbdb 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -20,6 +20,13 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_37076 addButton (Lnet/minecraft/class_339;)V ARG 1 button METHOD method_37078 tickButtons ()V + CLASS class_4072 IconButtonWidget + FIELD field_45445 texture Lnet/minecraft/class_2960; + METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V + ARG 1 x + ARG 2 y + ARG 3 texture + ARG 4 message CLASS class_467 CancelButtonWidget METHOD (Lnet/minecraft/class_466;II)V ARG 2 x @@ -57,13 +64,6 @@ 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_45445 texture Lnet/minecraft/class_2960; - METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V - ARG 1 x - ARG 2 y - ARG 3 texture - ARG 4 message CLASS class_6392 BeaconButtonWidget METHOD method_37080 tick (I)V ARG 1 level diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 7090def805..e016739100 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -47,7 +47,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_36889 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V ARG 1 server METHOD method_52204 onRemoved ()V - CLASS class_504 Entry CLASS class_4268 ScanningEntry FIELD field_19112 client Lnet/minecraft/class_310; CLASS class_4269 LanServerEntry @@ -89,3 +88,4 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_49300 uploadFavicon ([B)Z ARG 1 bytes METHOD method_55815 update ()V + CLASS class_504 Entry diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 7c43cef311..bd3cb66199 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -112,6 +112,19 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart METHOD method_2837 remap (FF)Lnet/minecraft/class_630$class_618; ARG 1 u ARG 2 v + CLASS class_6229 CuboidConsumer + METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V + COMMENT Accepts a cuboid from a model part. + COMMENT + COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer) + ARG 1 matrix + COMMENT the current matrix transformation from the model parts + ARG 2 path + COMMENT the path of the current model part, separated by {@code /} + ARG 3 index + COMMENT the index of the current cuboid in the current model part + ARG 4 cuboid + COMMENT the current cuboid CLASS class_628 Cuboid FIELD field_3643 minZ F FIELD field_3644 minY F @@ -144,16 +157,3 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 6 green ARG 7 blue ARG 8 alpha - CLASS class_6229 CuboidConsumer - METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V - COMMENT Accepts a cuboid from a model part. - COMMENT - COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer) - ARG 1 matrix - COMMENT the current matrix transformation from the model parts - ARG 2 path - COMMENT the path of the current model part, separated by {@code /} - ARG 3 index - COMMENT the index of the current cuboid in the current model part - ARG 4 cuboid - COMMENT the current cuboid diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 69aebe494c..92da52209c 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -90,9 +90,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions COMMENT or {@linkplain net.minecraft.block.Block#getPickStack(net.minecraft.world.WorldView, COMMENT net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) block} the player is looking at. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_MIDDLE the middle mouse button} by default. + FIELD field_1872 overrideWidth I FIELD field_18725 backgroundForChatOnly Lnet/minecraft/class_7172; FIELD field_18726 textBackgroundOpacity Lnet/minecraft/class_7172; - FIELD field_1872 overrideWidth I FIELD field_1873 autoSuggestions Lnet/minecraft/class_7172; FIELD field_1874 loadToolbarActivatorKey Lnet/minecraft/class_304; COMMENT A key binding for loading the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}. diff --git a/mappings/net/minecraft/client/particle/DamageParticle.mapping b/mappings/net/minecraft/client/particle/DamageParticle.mapping index 277046a1ee..46ce657085 100644 --- a/mappings/net/minecraft/client/particle/DamageParticle.mapping +++ b/mappings/net/minecraft/client/particle/DamageParticle.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle + 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 @@ -7,7 +11,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 ff2ab76e22..11335bf42b 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 CLASS class_679 ExplosionFactory FIELD field_17811 spriteProvider Lnet/minecraft/class_4002; @@ -60,7 +64,3 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic METHOD method_3032 explodeBurst (Lit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V ARG 3 trail ARG 4 flicker - 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/FlameParticle.mapping b/mappings/net/minecraft/client/particle/FlameParticle.mapping index 6e83c1c7a5..e6493e1bf8 100644 --- a/mappings/net/minecraft/client/particle/FlameParticle.mapping +++ b/mappings/net/minecraft/client/particle/FlameParticle.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_687 net/minecraft/client/particle/FlameParticle - CLASS class_688 Factory - FIELD field_17812 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_5613 SmallFactory FIELD field_27736 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_688 Factory + FIELD field_17812 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping index 800f5ed9f6..aa7abefcbb 100644 --- a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping +++ b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping @@ -9,11 +9,11 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle ARG 12 velocityZ ARG 14 color ARG 15 spriteProvider - CLASS class_726 Factory - FIELD field_17878 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_5788 GlowSquidInkFactory FIELD field_28460 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_726 Factory + FIELD field_17878 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 b68e57ce3f..d84ff5de2c 100644 --- a/mappings/net/minecraft/client/particle/SuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/SuspendParticle.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle + 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 @@ -11,10 +15,6 @@ 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 CLASS class_8254 EggCrackFactory FIELD field_43374 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 71cbbca858..e2c2719ae8 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,4 +1,17 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer + CLASS class_5972 ChunkInfoList + FIELD field_29620 current [Lnet/minecraft/class_8679$class_762; + METHOD (I)V + ARG 1 size + METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; + ARG 1 chunk + METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_8679$class_762;)V + ARG 1 chunk + ARG 2 info + CLASS class_6600 RenderableChunks + FIELD field_34819 chunks Ljava/util/LinkedHashSet; + METHOD (I)V + ARG 1 chunkCount CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; @@ -20,16 +33,3 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 1 ordinal METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V ARG 1 direction - CLASS class_5972 ChunkInfoList - FIELD field_29620 current [Lnet/minecraft/class_8679$class_762; - METHOD (I)V - ARG 1 size - METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; - ARG 1 chunk - METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_8679$class_762;)V - ARG 1 chunk - ARG 2 info - CLASS class_6600 RenderableChunks - FIELD field_34819 chunks Ljava/util/LinkedHashSet; - METHOD (I)V - ARG 1 chunkCount diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 87f167adaa..599a619e86 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -105,6 +105,26 @@ 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 2 world + 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 1 + METHOD rehash (I)V + ARG 1 newN + CLASS 2 + METHOD rehash (I)V + ARG 1 newN CLASS class_779 NeighborData FIELD field_4189 nonCubicWeight Z FIELD field_4190 VALUES [Lnet/minecraft/class_778$class_779; @@ -149,23 +169,3 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender METHOD (Ljava/lang/String;ILnet/minecraft/class_2350;Z)V ARG 3 direction ARG 4 flip - 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 2 world - 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 1 - METHOD rehash (I)V - ARG 1 newN - CLASS 2 - METHOD rehash (I)V - ARG 1 newN diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 83c1274eb7..6cf3426913 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -48,6 +48,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_38555 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future METHOD method_39132 pollTask ()Lnet/minecraft/class_846$class_851$class_4577; + 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; @@ -171,4 +172,3 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 2 throwable METHOD method_22790 (Ljava/lang/Void;)Lnet/minecraft/class_846$class_4690; ARG 0 v - 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 af50e878fa..dd90fefa39 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -63,6 +63,21 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked METHOD method_35789 needsResolution ()Z METHOD method_45786 (Ljava/util/function/Function;Lnet/minecraft/class_799;)V ARG 2 override + CLASS class_4751 GuiLight + FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; + COMMENT The model will be shaded from the front, like a basic item + FIELD field_21859 BLOCK 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 byName (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; + ARG 0 value + CLASS class_6246 UncheckedModelException + COMMENT An unused unchecked exception. Probably related to unbaked models. + METHOD (Ljava/lang/String;)V + ARG 1 message CLASS class_795 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 element @@ -83,18 +98,3 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 2 object METHOD method_3453 ambientOcclusionFromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Boolean; ARG 1 json - CLASS class_4751 GuiLight - FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; - COMMENT The model will be shaded from the front, like a basic item - FIELD field_21859 BLOCK 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 byName (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; - ARG 0 value - CLASS class_6246 UncheckedModelException - COMMENT An unused unchecked exception. Probably related to unbaked models. - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping index f623cbb50e..f40af007a7 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping @@ -6,6 +6,14 @@ CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverri ARG 2 conditions METHOD method_33690 streamConditions ()Ljava/util/stream/Stream; METHOD method_3472 getModelId ()Lnet/minecraft/class_2960; + CLASS class_5826 Condition + FIELD field_28790 type Lnet/minecraft/class_2960; + FIELD field_28791 threshold F + METHOD (Lnet/minecraft/class_2960;F)V + ARG 1 type + ARG 2 threshold + METHOD method_33692 getType ()Lnet/minecraft/class_2960; + METHOD method_33693 getThreshold ()F CLASS class_800 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson @@ -15,11 +23,3 @@ CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverri ARG 0 entry METHOD method_3474 deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/List; ARG 1 object - CLASS class_5826 Condition - FIELD field_28790 type Lnet/minecraft/class_2960; - FIELD field_28791 threshold F - METHOD (Lnet/minecraft/class_2960;F)V - ARG 1 type - ARG 2 threshold - METHOD method_33692 getType ()Lnet/minecraft/class_2960; - METHOD method_33693 getThreshold ()F diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index 36fe96dcdf..9b5ba410ab 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -33,6 +33,8 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_45787 fromJson (Lnet/minecraft/class_790$class_791;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_790; ARG 0 context ARG 1 json + CLASS class_6247 VariantAbsentException + COMMENT An unchecked exception indicating a variant is not found with a string key. CLASS class_791 DeserializationContext FIELD field_4242 stateFactory Lnet/minecraft/class_2689; FIELD field_4243 gson Lcom/google/gson/Gson; @@ -50,5 +52,3 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_3429 variantsFromJson (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map; ARG 1 context ARG 2 object - CLASS class_6247 VariantAbsentException - COMMENT An unchecked exception indicating a variant is not found with a string key. diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 1d2efae857..8b096928f3 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -36,6 +36,14 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction ARG 0 instance METHOD method_53302 (Lnet/minecraft/class_94;)Lnet/minecraft/class_6880; ARG 0 function + CLASS class_100 UniformBonusCount + FIELD field_45813 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45814 TYPE Lnet/minecraft/class_94$class_8752; + METHOD (I)V + ARG 1 bonusMultiplier + METHOD method_53308 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_8752 Type CLASS class_95 BinomialWithBonusCount FIELD comp_1848 extra I FIELD field_1013 TYPE Lnet/minecraft/class_94$class_8752; @@ -55,11 +63,3 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction CLASS class_98 OreDrops FIELD field_1015 TYPE Lnet/minecraft/class_94$class_8752; FIELD field_45812 CODEC Lcom/mojang/serialization/Codec; - CLASS class_100 UniformBonusCount - FIELD field_45813 CODEC Lcom/mojang/serialization/Codec; - FIELD field_45814 TYPE Lnet/minecraft/class_94$class_8752; - METHOD (I)V - ARG 1 bonusMultiplier - METHOD method_53308 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - CLASS class_8752 Type diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index fa4bb5d08e..0cb28a5bf3 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -289,17 +289,6 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 registryRef METHOD method_58002 unlimitedRegistryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; ARG 0 codec - CLASS 2 - METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B - ARG 1 buf - METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buf - ARG 2 value - CLASS 5 - METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; - ARG 1 error - METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; - ARG 1 error CLASS 10 CLASS 11 METHOD method_58007 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V @@ -330,9 +319,20 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 1 signature METHOD method_58017 (Lio/netty/buffer/ByteBuf;)Ljava/lang/String; ARG 0 buf2 + CLASS 2 + METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B + ARG 1 buf + METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V + ARG 1 buf + ARG 2 value CLASS 27 METHOD method_56407 read (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf METHOD method_56408 write (Lio/netty/buffer/ByteBuf;[B)V ARG 1 buf ARG 2 bytes + CLASS 5 + METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error