From d47df5b5959a3ad31b7b46c055360496d87ade0a Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 14 Apr 2026 20:23:11 -0400 Subject: [PATCH 01/14] filament: Improve ItemKeys name proposals --- .../nameproposal/NameProposalConfig.java | 42 +++++++++++-------- .../ModifyingFieldNameProvider.java | 30 +++++++++++++ 2 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java index c730005cfb..ff1bd22974 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java @@ -17,18 +17,28 @@ package net.fabricmc.filament.nameproposal; import java.util.List; +import java.util.Set; -import net.fabricmc.filament.nameproposal.field.nameprovider.ConditionalFieldNameProvider; -import net.fabricmc.filament.nameproposal.field.nameprovider.ConstantFieldNameProvider; -import net.fabricmc.filament.nameproposal.field.nameprovider.FieldNameProvider; -import net.fabricmc.filament.nameproposal.field.nameprovider.RecursiveArgumentFieldNameProvider; -import net.fabricmc.filament.nameproposal.field.nameprovider.SequenceFieldNameProvider; -import net.fabricmc.filament.nameproposal.field.nameprovider.StringArgumentFieldNameProvider; +import net.fabricmc.filament.nameproposal.field.nameprovider.*; import net.fabricmc.filament.nameproposal.field.predicate.DescriptorFieldPredicate; import net.fabricmc.filament.nameproposal.field.predicate.InternalInitFieldPredicate; +import net.fabricmc.filament.nameproposal.field.predicate.MethodNameFieldPredicate; import net.fabricmc.filament.nameproposal.field.predicate.StaticFieldPredicate; public record NameProposalConfig(FieldNameProvider fieldNameProvider) { + // trusted owners, currently for most IDs + private static final Set TRUSTED_ID_OWNERS = Set.of( + "net/minecraft/class_3612", + "net/minecraft/class_9796", + "net/minecraft/class_1_779", + "net/minecraft/class_1_780", + "net/minecraft/class_1_781", + "net/minecraft/class_1_786", + "net/minecraft/class_1_789", + "net/minecraft/class_1_793", + "net/minecraft/class_1_819" + ); + public static final NameProposalConfig DEFAULT = new NameProposalConfig(new SequenceFieldNameProvider(List.of( new ConditionalFieldNameProvider( StringArgumentFieldNameProvider.INSTANCE, @@ -37,22 +47,18 @@ public record NameProposalConfig(FieldNameProvider fieldNameProvider) { InternalInitFieldPredicate.INSTANCE ) ), - new ConditionalFieldNameProvider( - new RecursiveArgumentFieldNameProvider(owner -> { - // trusted owners, currently for most IDs - return owner.equals("net/minecraft/class_1_779") - || owner.equals("net/minecraft/class_1_780") - || owner.equals("net/minecraft/class_1_781") - || owner.equals("net/minecraft/class_1_786") - || owner.equals("net/minecraft/class_1_789") - || owner.equals("net/minecraft/class_1_793") - || owner.equals("net/minecraft/class_1_819") - || owner.equals("net/minecraft/class_3612"); - }), + new ModifyingFieldNameProvider(new ConditionalFieldNameProvider( + new RecursiveArgumentFieldNameProvider(TRUSTED_ID_OWNERS::contains), List.of( new StaticFieldPredicate(true), InternalInitFieldPredicate.INSTANCE ) + ), (name, field) -> + switch (field.methodName()) { + case "method_1_4735" -> name + "_SPAWN_EGG"; + case "method_1_4732" -> "MUSIC_DISC" + name; + default -> name; + } ), new ConditionalFieldNameProvider( new ConstantFieldNameProvider("CODEC"), diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java new file mode 100644 index 0000000000..e8c20a1e02 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java @@ -0,0 +1,30 @@ +package net.fabricmc.filament.nameproposal.field.nameprovider; + +import net.fabricmc.filament.nameproposal.field.FieldData; + +import java.util.function.BiFunction; +import java.util.function.UnaryOperator; + +/** + * A field name provider that delegates to another provider and modifies + * the returned name. + */ +public record ModifyingFieldNameProvider(FieldNameProvider delegate, BiFunction modifier) implements FieldNameProvider { + public ModifyingFieldNameProvider(FieldNameProvider delegate, UnaryOperator modifier) { + this(delegate, (name, data) -> modifier.apply(name)); + } + + public static ModifyingFieldNameProvider prefixing(FieldNameProvider delegate, String prefix) { + return new ModifyingFieldNameProvider(delegate, name -> prefix + name); + } + + public static ModifyingFieldNameProvider suffixing(FieldNameProvider delegate, String suffix) { + return new ModifyingFieldNameProvider(delegate, name -> name + suffix); + } + + @Override + public String getName(FieldData field) { + String delegateName = delegate.getName(field); + return delegateName == null ? null : modifier.apply(delegateName, field); + } +} From d0c1338d9bedfa92842d44e70eac83327e72b100 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 14 Apr 2026 20:23:46 -0400 Subject: [PATCH 02/14] Start mapping 26.2-snapshot-3 --- mappings/net/minecraft/class_1_786.mapping | 3 + .../minecraft/entity/EntityTypeKeys.mapping | 3 + .../net/minecraft/fluid/FluidKeys.mapping | 3 + mappings/net/minecraft/fluid/Fluids.mapping | 3 + mappings/net/minecraft/item/ItemKeys.mapping | 63 +++++++++++++++++++ .../minecraft/registry/RegistryKey.mapping | 6 ++ .../registry/tag/BlockItemTagKey.mapping | 9 +++ .../registry/tag/BlockItemTags.mapping | 1 + mappings/net/minecraft/util/ColorMap.mapping | 36 ++++++++++- 9 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/class_1_786.mapping create mode 100644 mappings/net/minecraft/entity/EntityTypeKeys.mapping create mode 100644 mappings/net/minecraft/fluid/FluidKeys.mapping create mode 100644 mappings/net/minecraft/item/ItemKeys.mapping create mode 100644 mappings/net/minecraft/registry/tag/BlockItemTagKey.mapping create mode 100644 mappings/net/minecraft/registry/tag/BlockItemTags.mapping diff --git a/mappings/net/minecraft/class_1_786.mapping b/mappings/net/minecraft/class_1_786.mapping new file mode 100644 index 0000000000..eb04176a25 --- /dev/null +++ b/mappings/net/minecraft/class_1_786.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_786 + METHOD method_1_4761 (Ljava/lang/String;)Lnet/minecraft/class_1_727; + ARG 0 suffix diff --git a/mappings/net/minecraft/entity/EntityTypeKeys.mapping b/mappings/net/minecraft/entity/EntityTypeKeys.mapping new file mode 100644 index 0000000000..3000a1ce40 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityTypeKeys.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_789 net/minecraft/entity/EntityTypeKeys + METHOD method_1_4811 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path diff --git a/mappings/net/minecraft/fluid/FluidKeys.mapping b/mappings/net/minecraft/fluid/FluidKeys.mapping new file mode 100644 index 0000000000..1afb483d83 --- /dev/null +++ b/mappings/net/minecraft/fluid/FluidKeys.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_3612 net/minecraft/fluid/FluidKeys + METHOD method_1_4870 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path diff --git a/mappings/net/minecraft/fluid/Fluids.mapping b/mappings/net/minecraft/fluid/Fluids.mapping index a79cad3768..0e77c5dc02 100644 --- a/mappings/net/minecraft/fluid/Fluids.mapping +++ b/mappings/net/minecraft/fluid/Fluids.mapping @@ -3,3 +3,6 @@ CLASS net/minecraft/class_1_792 net/minecraft/fluid/Fluids FIELD field_1_5607 FLOWING_WATER Lnet/minecraft/class_3609; FIELD field_1_5608 LAVA Lnet/minecraft/class_3609; FIELD field_1_5609 WATER Lnet/minecraft/class_3609; + METHOD method_1_4828 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_3611;)Lnet/minecraft/class_3611; + ARG 0 key + ARG 1 fluid diff --git a/mappings/net/minecraft/item/ItemKeys.mapping b/mappings/net/minecraft/item/ItemKeys.mapping new file mode 100644 index 0000000000..39480b9caa --- /dev/null +++ b/mappings/net/minecraft/item/ItemKeys.mapping @@ -0,0 +1,63 @@ +CLASS net/minecraft/class_1_779 net/minecraft/item/ItemKeys + FIELD field_1_3875 ANGLER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_3877 ARCHER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_3881 ARMS_UP_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_3895 BLADE_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_3901 BOLT_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_3911 BREWER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_3917 BURN_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_3937 COAST_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_3971 DANGER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_3994 DUNE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_3995 BUNDLES Lnet/minecraft/class_1_727; + FIELD field_1_3996 DYES Lnet/minecraft/class_1_727; + FIELD field_1_4012 EXPLORER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4013 EYE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4025 FLOW_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4027 FLOW_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4029 FRIEND_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4062 GUSTER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4064 HARNESSES Lnet/minecraft/class_1_727; + FIELD field_1_4065 HEARTBREAK_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4067 HEART_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4073 HOST_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4074 HOWL_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4116 MINER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4119 MOURNER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4122 MUSIC_DISC_11 Lnet/minecraft/class_5321; + FIELD field_1_4123 MUSIC_DISC_13 Lnet/minecraft/class_5321; + FIELD field_1_4124 MUSIC_DISC_5 Lnet/minecraft/class_5321; + FIELD field_1_4183 PLENTY_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4191 PRIZE_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4202 RAISER_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4209 RIB_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4215 SCRAPE_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4216 SENTRY_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4217 SHAPER_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4218 SHEAF_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4221 SHELTER_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4225 SILENCE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4230 SKULL_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4233 SMITHING_TEMPLATE_SUFFIX Ljava/lang/String; + FIELD field_1_4235 SNORT_POTTERY_SHERD Lnet/minecraft/class_5321; + FIELD field_1_4236 SNOUT_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4242 SPIRE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4263 TIDE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4276 VEX_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4282 WARD_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4285 WAYFINDER_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + FIELD field_1_4287 WILD_SMITHING_TEMPLATE Lnet/minecraft/class_5321; + METHOD method_1_4730 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path + METHOD method_1_4731 ofSmithingTemplate (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 pattern + METHOD method_1_4732 ofMusicDisc (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 song + METHOD method_1_4733 ofPotterySherd (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 pattern + METHOD method_1_4734 ofColors (Ljava/lang/String;)Lnet/minecraft/class_1_727; + ARG 0 suffix + METHOD method_1_4735 ofSpawnEgg (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 entityType + METHOD method_1_4736 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path diff --git a/mappings/net/minecraft/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping index 58150af9e5..1279aada22 100644 --- a/mappings/net/minecraft/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/registry/RegistryKey.mapping @@ -13,6 +13,12 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V ARG 1 registry ARG 2 value + METHOD method_1_4751 adapt (Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 1 registry + ARG 2 suffix + METHOD method_1_4752 adapt (Lnet/minecraft/class_5321;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_5321; + ARG 1 registry + ARG 2 pathFunction METHOD method_29177 getValue ()Lnet/minecraft/class_2960; METHOD method_29179 of (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; COMMENT Creates a registry key for a value in a registry with a registry key for diff --git a/mappings/net/minecraft/registry/tag/BlockItemTagKey.mapping b/mappings/net/minecraft/registry/tag/BlockItemTagKey.mapping new file mode 100644 index 0000000000..5d98799d4b --- /dev/null +++ b/mappings/net/minecraft/registry/tag/BlockItemTagKey.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_1_782 net/minecraft/registry/tag/BlockItemTagKey + METHOD method_1_4739 ofVanilla (Ljava/lang/String;)Lnet/minecraft/class_1_782; + ARG 0 path + METHOD method_1_4740 ofVanilla (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_1_782; + ARG 0 blockPath + ARG 1 itemPath + METHOD method_1_4741 of (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1_782; + ARG 0 blockId + ARG 1 itemId diff --git a/mappings/net/minecraft/registry/tag/BlockItemTags.mapping b/mappings/net/minecraft/registry/tag/BlockItemTags.mapping new file mode 100644 index 0000000000..0357fad518 --- /dev/null +++ b/mappings/net/minecraft/registry/tag/BlockItemTags.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1_780 net/minecraft/registry/tag/BlockItemTags diff --git a/mappings/net/minecraft/util/ColorMap.mapping b/mappings/net/minecraft/util/ColorMap.mapping index 3cd2cb38e8..4db9e6abeb 100644 --- a/mappings/net/minecraft/util/ColorMap.mapping +++ b/mappings/net/minecraft/util/ColorMap.mapping @@ -1,18 +1,48 @@ CLASS net/minecraft/class_1_727 net/minecraft/util/ColorMap + FIELD field_1_5716 IDS Lnet/minecraft/class_1_727; + FIELD field_1_5717 COLORS Lnet/minecraft/class_1_727; METHOD method_1_4393 values ()Ljava/util/List; METHOD method_1_4394 forEach (Ljava/util/function/Consumer;)V ARG 1 callback + METHOD method_1_4395 (Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lnet/minecraft/class_1767;Ljava/lang/Object;)Lnet/minecraft/class_2248; + ARG 3 color + ARG 4 id METHOD method_1_4396 (Ljava/util/function/BiFunction;Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; ARG 2 settings - METHOD method_1_4399 fromFunction (Ljava/util/function/Function;)Lnet/minecraft/class_1_727; + METHOD method_1_4399 map (Ljava/util/function/Function;)Lnet/minecraft/class_1_727; + ARG 1 function METHOD method_1_4400 get (Lnet/minecraft/class_1767;)Ljava/lang/Object; ARG 1 color METHOD method_1_4401 forBlocks (Lnet/minecraft/class_1_727;Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Lnet/minecraft/class_1_727; + ARG 0 ids + ARG 1 registrar ARG 2 blockFactory ARG 3 settingsFactory - METHOD method_1_4402 forItems (Lnet/minecraft/class_1_727;Lnet/minecraft/class_1_727;Lorg/apache/commons/lang3/function/TriFunction;)Lnet/minecraft/class_1_727; - METHOD method_1_4403 forBlockItems (Lnet/minecraft/class_1_727;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_727; + METHOD method_1_4402 forBlockItems (Lnet/minecraft/class_1_727;Lnet/minecraft/class_1_727;Lorg/apache/commons/lang3/function/TriFunction;)Lnet/minecraft/class_1_727; + ARG 0 ids + ARG 1 blocks + ARG 2 itemFactory + METHOD method_1_4403 forItems (Lnet/minecraft/class_1_727;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_727; + ARG 0 ids ARG 1 itemFactory METHOD method_1_4404 forEachZipped (Lnet/minecraft/class_1_727;Lnet/minecraft/class_1_727;Ljava/util/function/BiConsumer;)V ARG 0 first ARG 1 second + ARG 2 callback + METHOD method_1_4916 constant (Ljava/lang/Object;)Lnet/minecraft/class_1_727; + ARG 0 value + METHOD method_1_4917 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 color + ARG 1 suffix + METHOD method_1_4918 (Lorg/apache/commons/lang3/function/TriFunction;Lnet/minecraft/class_1_727;Lnet/minecraft/class_1767;Ljava/lang/Object;)Lnet/minecraft/class_1792; + ARG 2 color + ARG 3 id + METHOD method_1_4919 (Ljava/util/function/BiFunction;Lnet/minecraft/class_1767;Ljava/lang/Object;)Lnet/minecraft/class_1792; + ARG 1 color + ARG 2 id + METHOD method_1_4920 prefixWithColors (Lnet/minecraft/class_1_727;)Lnet/minecraft/class_1_727; + ARG 0 suffixes + METHOD method_1_4921 mapZipped (Lnet/minecraft/class_1_727;Lnet/minecraft/class_1_727;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_727; + ARG 0 first + ARG 1 second + ARG 2 function From 9a59c7ffd7001989b195a733dcccc6f36b8c2ec7 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 14 Apr 2026 20:30:37 -0400 Subject: [PATCH 03/14] Format Java source --- .../filament/nameproposal/NameProposalConfig.java | 9 +++++++-- .../field/nameprovider/ModifyingFieldNameProvider.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java index ff1bd22974..0d9b6924eb 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java @@ -19,10 +19,15 @@ import java.util.List; import java.util.Set; -import net.fabricmc.filament.nameproposal.field.nameprovider.*; +import net.fabricmc.filament.nameproposal.field.nameprovider.ConditionalFieldNameProvider; +import net.fabricmc.filament.nameproposal.field.nameprovider.ConstantFieldNameProvider; +import net.fabricmc.filament.nameproposal.field.nameprovider.FieldNameProvider; +import net.fabricmc.filament.nameproposal.field.nameprovider.ModifyingFieldNameProvider; +import net.fabricmc.filament.nameproposal.field.nameprovider.RecursiveArgumentFieldNameProvider; +import net.fabricmc.filament.nameproposal.field.nameprovider.SequenceFieldNameProvider; +import net.fabricmc.filament.nameproposal.field.nameprovider.StringArgumentFieldNameProvider; import net.fabricmc.filament.nameproposal.field.predicate.DescriptorFieldPredicate; import net.fabricmc.filament.nameproposal.field.predicate.InternalInitFieldPredicate; -import net.fabricmc.filament.nameproposal.field.predicate.MethodNameFieldPredicate; import net.fabricmc.filament.nameproposal.field.predicate.StaticFieldPredicate; public record NameProposalConfig(FieldNameProvider fieldNameProvider) { diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java index e8c20a1e02..2fdd2c4b20 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java @@ -2,8 +2,8 @@ import net.fabricmc.filament.nameproposal.field.FieldData; -import java.util.function.BiFunction; import java.util.function.UnaryOperator; +import java.util.function.BiFunction; /** * A field name provider that delegates to another provider and modifies From a0792eb8d92086ca0160b80ca0306e84a573d509 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 14 Apr 2026 22:15:39 -0400 Subject: [PATCH 04/14] Try to name propose BlockItemTags.X.method() calls --- .../nameproposal/NameProposalConfig.java | 21 ++++++++++++------- .../ModifyingFieldNameProvider.java | 4 ++-- .../RecursiveArgumentFieldNameProvider.java | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java index 0d9b6924eb..4c3132e0ad 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java @@ -28,6 +28,7 @@ import net.fabricmc.filament.nameproposal.field.nameprovider.StringArgumentFieldNameProvider; import net.fabricmc.filament.nameproposal.field.predicate.DescriptorFieldPredicate; import net.fabricmc.filament.nameproposal.field.predicate.InternalInitFieldPredicate; +import net.fabricmc.filament.nameproposal.field.predicate.MethodOwnerFieldPredicate; import net.fabricmc.filament.nameproposal.field.predicate.StaticFieldPredicate; public record NameProposalConfig(FieldNameProvider fieldNameProvider) { @@ -56,14 +57,20 @@ public record NameProposalConfig(FieldNameProvider fieldNameProvider) { new RecursiveArgumentFieldNameProvider(TRUSTED_ID_OWNERS::contains), List.of( new StaticFieldPredicate(true), - InternalInitFieldPredicate.INSTANCE + InternalInitFieldPredicate.INSTANCE + ) + ), (name, field) -> switch (field.methodName()) { + case "method_1_4735" -> name + "_SPAWN_EGG"; + case "method_1_4732" -> "MUSIC_DISC" + name; + default -> name; + }), + // Results of BlockItemTagKey#{block, item} + new ConditionalFieldNameProvider( + new RecursiveArgumentFieldNameProvider("net/minecraft/class_1_780"::equals), + List.of( + new StaticFieldPredicate(false), + new MethodOwnerFieldPredicate("net/minecraft/class_1_782") ) - ), (name, field) -> - switch (field.methodName()) { - case "method_1_4735" -> name + "_SPAWN_EGG"; - case "method_1_4732" -> "MUSIC_DISC" + name; - default -> name; - } ), new ConditionalFieldNameProvider( new ConstantFieldNameProvider("CODEC"), diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java index 2fdd2c4b20..475884cf02 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/ModifyingFieldNameProvider.java @@ -1,10 +1,10 @@ package net.fabricmc.filament.nameproposal.field.nameprovider; -import net.fabricmc.filament.nameproposal.field.FieldData; - import java.util.function.UnaryOperator; import java.util.function.BiFunction; +import net.fabricmc.filament.nameproposal.field.FieldData; + /** * A field name provider that delegates to another provider and modifies * the returned name. diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java index 7478b9d150..323991d038 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java @@ -18,7 +18,7 @@ public String getName(FieldData field) { if (arg == null) return null; if (!this.trustedOwnerPredicate().test(arg.owner)) return null; - + if (!field.isStatic()) System.out.println(field); return field.proposedFieldNames().get(new MappingEntry(arg.owner, arg.name, arg.desc)); } From 09827a45a4c2689d21760a1efb025918cd48ca5f Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 14 Apr 2026 22:58:51 -0400 Subject: [PATCH 05/14] Add more mappings --- .../nameproposal/FieldNameFinder.java | 2 +- .../nameproposal/NameProposalConfig.java | 2 +- .../blaze3d/shaders/BindGroupLayout.mapping | 35 +++++++++ .../mojang/blaze3d/systems/DeviceType.mapping | 1 + .../net/minecraft/block/BlockItemKey.mapping | 9 +++ .../net/minecraft/block/BlockItemKeys.mapping | 19 +++++ .../net/minecraft/block/BlockKeys.mapping | 7 ++ .../net/minecraft/block/OxidationMap.mapping | 72 +++++++++++++++++++ mappings/net/minecraft/class_1_786.mapping | 3 - mappings/net/minecraft/class_1_790.mapping | 9 +++ mappings/net/minecraft/class_1_794.mapping | 7 -- mappings/net/minecraft/class_1_797.mapping | 13 ++++ mappings/net/minecraft/class_1_801.mapping | 5 ++ .../minecraft/client/gl/GlDeviceInfo.mapping | 5 ++ .../client/gl/GlShaderProgram.mapping | 2 + .../debug/SystemSpecsDebugHudEntry.mapping | 2 + .../client/render/BindGroupLayouts.mapping | 21 ++++++ .../client/render/RenderPipelines.mapping | 14 ++-- .../vulkan/VulkanPhysicalDevice.mapping | 1 + .../datafixer/schema/Schema4885.mapping | 1 + .../net/minecraft/entity/EntityTypes.mapping | 26 +++++++ .../net/minecraft/potion/PotionKeys.mapping | 3 + .../ConfiguredFeatureTags.mapping | 2 +- mappings/net/minecraft/util/ColorMap.mapping | 2 +- 24 files changed, 244 insertions(+), 19 deletions(-) create mode 100644 mappings/com/mojang/blaze3d/shaders/BindGroupLayout.mapping create mode 100644 mappings/com/mojang/blaze3d/systems/DeviceType.mapping create mode 100644 mappings/net/minecraft/block/BlockItemKey.mapping create mode 100644 mappings/net/minecraft/block/BlockItemKeys.mapping create mode 100644 mappings/net/minecraft/block/BlockKeys.mapping delete mode 100644 mappings/net/minecraft/class_1_786.mapping create mode 100644 mappings/net/minecraft/class_1_790.mapping delete mode 100644 mappings/net/minecraft/class_1_794.mapping create mode 100644 mappings/net/minecraft/class_1_801.mapping create mode 100644 mappings/net/minecraft/client/render/BindGroupLayouts.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema4885.mapping create mode 100644 mappings/net/minecraft/entity/EntityTypes.mapping create mode 100644 mappings/net/minecraft/potion/PotionKeys.mapping rename mappings/net/minecraft/registry/{tags => tag}/ConfiguredFeatureTags.mapping (50%) diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/FieldNameFinder.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/FieldNameFinder.java index 6aced18a3e..e10489985d 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/FieldNameFinder.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/FieldNameFinder.java @@ -103,7 +103,7 @@ private boolean findMethodNames(FieldNameProvider nameProvider, Analyzer (Ljava/util/List;Ljava/util/List;)V + ARG 1 samplers + ARG 2 buffers + METHOD method_1_4832 builder ()Lnet/minecraft/class_1_794$class_1_795; + METHOD method_1_4833 validate (Ljava/util/List;)V + ARG 0 layouts + METHOD method_1_4834 getSamplers (Ljava/util/List;)Ljava/util/List; + ARG 0 layouts + METHOD method_1_4835 getBuffers (Ljava/util/List;)Ljava/util/List; + ARG 0 layouts + METHOD method_1_4836 getSamplers ()Ljava/util/List; + METHOD method_1_4837 getBuffers ()Ljava/util/List; + CLASS class_1_795 Builder + FIELD field_1_5659 samplers Ljava/util/List; + FIELD field_1_5660 buffers Ljava/util/List; + METHOD method_1_4838 build ()Lnet/minecraft/class_1_794; + METHOD method_1_4839 sampler (Ljava/lang/String;)Lnet/minecraft/class_1_794$class_1_795; + ARG 1 name + METHOD method_1_4840 buffer (Ljava/lang/String;Lnet/minecraft/class_10789;)Lnet/minecraft/class_1_794$class_1_795; + ARG 1 name + ARG 2 type + METHOD method_1_4841 buffer (Ljava/lang/String;Lnet/minecraft/class_10789;Lnet/minecraft/class_1_658;)Lnet/minecraft/class_1_794$class_1_795; + ARG 1 name + ARG 2 type + ARG 3 texelFormat + CLASS class_1_796 BufferBinding + METHOD (Ljava/lang/String;Lnet/minecraft/class_1_658;)V + ARG 1 name + ARG 2 gpuFormat + METHOD (Ljava/lang/String;Lnet/minecraft/class_10789;)V + ARG 1 name + ARG 2 type diff --git a/mappings/com/mojang/blaze3d/systems/DeviceType.mapping b/mappings/com/mojang/blaze3d/systems/DeviceType.mapping new file mode 100644 index 0000000000..30a9f7c2c7 --- /dev/null +++ b/mappings/com/mojang/blaze3d/systems/DeviceType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1_785 com/mojang/blaze3d/systems/DeviceType diff --git a/mappings/net/minecraft/block/BlockItemKey.mapping b/mappings/net/minecraft/block/BlockItemKey.mapping new file mode 100644 index 0000000000..addba2d5bd --- /dev/null +++ b/mappings/net/minecraft/block/BlockItemKey.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_1_784 net/minecraft/block/BlockItemKey + METHOD method_1_4757 ofVanilla (Ljava/lang/String;)Lnet/minecraft/class_1_784; + ARG 0 path + METHOD method_1_4758 ofVanilla (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_1_784; + ARG 0 blockPath + ARG 1 itemPath + METHOD method_1_4759 of (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1_784; + ARG 0 blockId + ARG 1 itemId diff --git a/mappings/net/minecraft/block/BlockItemKeys.mapping b/mappings/net/minecraft/block/BlockItemKeys.mapping new file mode 100644 index 0000000000..1a3dc0da8a --- /dev/null +++ b/mappings/net/minecraft/block/BlockItemKeys.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_1_786 net/minecraft/block/BlockItemKeys + FIELD field_1_4550 BANNERS Lnet/minecraft/class_1_727; + FIELD field_1_4555 BEDS Lnet/minecraft/class_1_727; + FIELD field_1_4609 CARPETS Lnet/minecraft/class_1_727; + FIELD field_1_4675 CONCRETES Lnet/minecraft/class_1_727; + FIELD field_1_4676 CONCRETE_POWDERS Lnet/minecraft/class_1_727; + FIELD field_1_4679 COPPER_BLOCKS Lnet/minecraft/class_1_758; + FIELD field_1_4680 COPPER_BLOCK_SEQ Lnet/minecraft/class_1_758$class_1_821; + FIELD field_1_4798 DYED_CANDLES Lnet/minecraft/class_1_727; + FIELD field_1_4799 DYED_SHULKER_BOXES Lnet/minecraft/class_1_727; + FIELD field_1_4800 DYED_TERRACOTTAS Lnet/minecraft/class_1_727; + FIELD field_1_4827 GLAZED_TERRACOTTAS Lnet/minecraft/class_1_727; + FIELD field_1_5164 STAINED_GLASSES Lnet/minecraft/class_1_727; + FIELD field_1_5165 STAINED_GLASS_PANES Lnet/minecraft/class_1_727; + FIELD field_1_5272 WOOLS Lnet/minecraft/class_1_727; + METHOD method_1_4761 ofColors (Ljava/lang/String;)Lnet/minecraft/class_1_727; + ARG 0 suffix + METHOD method_1_4762 ofOxidations (Ljava/lang/String;)Lnet/minecraft/class_1_758; + ARG 0 suffix diff --git a/mappings/net/minecraft/block/BlockKeys.mapping b/mappings/net/minecraft/block/BlockKeys.mapping new file mode 100644 index 0000000000..a64bb749fb --- /dev/null +++ b/mappings/net/minecraft/block/BlockKeys.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_1_781 net/minecraft/block/BlockKeys + FIELD field_1_4414 CANDLE_CAKES Lnet/minecraft/class_1_727; + FIELD field_1_4486 WALL_BANNERS Lnet/minecraft/class_1_727; + METHOD method_1_4737 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path + METHOD method_1_4738 ofColors (Ljava/lang/String;)Lnet/minecraft/class_1_727; + ARG 0 suffix diff --git a/mappings/net/minecraft/block/OxidationMap.mapping b/mappings/net/minecraft/block/OxidationMap.mapping index 6274f0bb09..2ab06d61b1 100644 --- a/mappings/net/minecraft/block/OxidationMap.mapping +++ b/mappings/net/minecraft/block/OxidationMap.mapping @@ -1,12 +1,84 @@ CLASS net/minecraft/class_1_758 net/minecraft/block/OxidationMap + FIELD field_1_5919 PREFIXES Lnet/minecraft/class_1_758; + FIELD field_1_5920 SEQ_SELF Lnet/minecraft/class_1_758$class_1_821; METHOD method_1_4591 values ()Ljava/util/List; METHOD method_1_4592 ofBlockFamilies (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_758; ARG 0 waxedFactory ARG 1 weatheringFactory METHOD method_1_4593 forEach (Ljava/util/function/Consumer;)V ARG 1 callback + METHOD method_1_4594 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 prefix + ARG 1 suffix METHOD method_1_4598 ofBlocks (Lnet/minecraft/class_1_758;Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Lnet/minecraft/class_1_758; + ARG 0 ids ARG 1 registrar + ARG 2 waxedBlockFactory + ARG 3 weatheringBlockFactory ARG 4 settingsFactory METHOD method_1_4600 ofBlockItems (Lnet/minecraft/class_1_758;Lnet/minecraft/class_1_758;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_758; + ARG 0 ids ARG 1 block + ARG 2 itemFactory + METHOD method_1_5059 mapSequences (Ljava/util/function/Function;)Lnet/minecraft/class_1_758; + ARG 1 function + METHOD method_1_5060 mapSequences (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_1_758; + ARG 1 weatheringFunction + ARG 2 waxedFunction + METHOD method_1_5061 constant (Ljava/lang/String;)Lnet/minecraft/class_1_758; + ARG 0 id + METHOD method_1_5062 (Ljava/util/function/BiFunction;Lnet/minecraft/class_1_758$class_1_821;)Lnet/minecraft/class_1_758$class_1_821; + ARG 1 prefixes + METHOD method_1_5063 (Ljava/util/function/BiFunction;Lnet/minecraft/class_1_758$class_1_821;)Lnet/minecraft/class_1_758$class_1_821; + ARG 1 prefixes + METHOD method_1_5064 (Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lnet/minecraft/class_1_758$class_1_821;)Lnet/minecraft/class_1_758$class_1_821; + ARG 3 ids1 + METHOD method_1_5065 (Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lnet/minecraft/class_5955$class_5811;Ljava/lang/Object;)Lnet/minecraft/class_2248; + ARG 3 oxidation + ARG 4 id + METHOD method_1_5066 (Ljava/util/function/BiFunction;Lnet/minecraft/class_5955$class_5811;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 2 settings + METHOD method_1_5067 (Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lnet/minecraft/class_1_758$class_1_821;)Lnet/minecraft/class_1_758$class_1_821; + ARG 3 ids1 + METHOD method_1_5068 (Lorg/apache/commons/lang3/function/TriFunction;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lnet/minecraft/class_5955$class_5811;Ljava/lang/Object;)Lnet/minecraft/class_2248; + ARG 3 oxidation + ARG 4 id + METHOD method_1_5069 (Ljava/util/function/BiFunction;Lnet/minecraft/class_5955$class_5811;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 2 settings + METHOD method_1_5070 map (Ljava/util/function/Function;)Lnet/minecraft/class_1_758; + ARG 1 function + METHOD method_1_5071 addPrefixes (Lnet/minecraft/class_1_758;)Lnet/minecraft/class_1_758; + ARG 0 suffixes + METHOD method_1_5072 forAdjacent (Ljava/util/function/BiConsumer;)V + ARG 1 callback + METHOD method_1_5073 waxInvariant (Lnet/minecraft/class_1_758$class_1_821;)Lnet/minecraft/class_1_758; + ARG 0 sequence + METHOD method_1_5074 forEachZipped (Lnet/minecraft/class_1_758$class_1_821;Lnet/minecraft/class_1_758$class_1_821;Ljava/util/function/BiConsumer;)V + ARG 0 first + ARG 1 second + ARG 2 function + METHOD method_1_5075 forEachZipped (Lnet/minecraft/class_1_758;Lnet/minecraft/class_1_758;Ljava/util/function/BiConsumer;)V + ARG 0 first + ARG 1 second + ARG 2 callback + METHOD method_1_5076 mapZipped (Lnet/minecraft/class_1_758$class_1_821;Lnet/minecraft/class_1_758$class_1_821;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_758$class_1_821; + ARG 0 first + ARG 1 second + ARG 2 function + METHOD method_1_5077 mapZipped (Lnet/minecraft/class_1_758;Lnet/minecraft/class_1_758;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_758; + ARG 0 first + ARG 1 second + ARG 2 function + METHOD method_1_5078 forWeatheringWaxedPairs (Ljava/util/function/BiConsumer;)V + ARG 1 callback + CLASS class_1_821 Sequence + METHOD method_1_5079 constant (Ljava/lang/Object;)Lnet/minecraft/class_1_758$class_1_821; + ARG 0 value + METHOD method_1_5080 forEach (Ljava/util/function/Consumer;)V + ARG 1 callback + METHOD method_1_5081 map (Ljava/util/function/Function;)Lnet/minecraft/class_1_758$class_1_821; + ARG 1 function + METHOD method_1_5082 get (Lnet/minecraft/class_5955$class_5811;)Ljava/lang/Object; + ARG 1 oxidation + METHOD method_1_5083 forAdjacent (Ljava/util/function/BiConsumer;)V + ARG 1 callback diff --git a/mappings/net/minecraft/class_1_786.mapping b/mappings/net/minecraft/class_1_786.mapping deleted file mode 100644 index eb04176a25..0000000000 --- a/mappings/net/minecraft/class_1_786.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1_786 - METHOD method_1_4761 (Ljava/lang/String;)Lnet/minecraft/class_1_727; - ARG 0 suffix diff --git a/mappings/net/minecraft/class_1_790.mapping b/mappings/net/minecraft/class_1_790.mapping new file mode 100644 index 0000000000..41888acb9b --- /dev/null +++ b/mappings/net/minecraft/class_1_790.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_1_790 + METHOD (Lnet/minecraft/class_5539;I)V + ARG 1 world + METHOD method_1_4812 (Lnet/minecraft/class_638;J)Z + ARG 1 world + ARG 2 sectionPos + METHOD method_1_4814 (Lnet/minecraft/class_638;J)Z + ARG 1 world + ARG 2 sectionPos diff --git a/mappings/net/minecraft/class_1_794.mapping b/mappings/net/minecraft/class_1_794.mapping deleted file mode 100644 index 8543d109e7..0000000000 --- a/mappings/net/minecraft/class_1_794.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_1_794 - CLASS class_1_796 - METHOD (Ljava/lang/String;Lnet/minecraft/class_1_658;)V - ARG 1 name - METHOD (Ljava/lang/String;Lnet/minecraft/class_10789;)V - ARG 1 name - ARG 2 type diff --git a/mappings/net/minecraft/class_1_797.mapping b/mappings/net/minecraft/class_1_797.mapping index 9933b66230..3498a6622b 100644 --- a/mappings/net/minecraft/class_1_797.mapping +++ b/mappings/net/minecraft/class_1_797.mapping @@ -1,4 +1,17 @@ CLASS net/minecraft/class_1_797 + FIELD field_1_5661 DUMMY Lnet/minecraft/class_4076; + METHOD method_1_4844 (III)Z + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + METHOD method_1_4846 (III)Lnet/minecraft/class_1_797$class_1_799; + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + METHOD method_1_4847 (J)Lnet/minecraft/class_1_797$class_1_799; + ARG 1 sectionPos + METHOD method_1_4853 (Lnet/minecraft/class_4076;)Z + ARG 1 pos CLASS class_1_799 METHOD method_62973 setSectionPos (J)V METHOD method_62975 getSectionPos ()J diff --git a/mappings/net/minecraft/class_1_801.mapping b/mappings/net/minecraft/class_1_801.mapping new file mode 100644 index 0000000000..e4ff225e4b --- /dev/null +++ b/mappings/net/minecraft/class_1_801.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1_801 + METHOD method_1_4880 (Lnet/minecraft/class_1_727;)Lnet/minecraft/class_1_801; + ARG 1 keys + METHOD method_1_4881 (Lnet/minecraft/class_1_758;)Lnet/minecraft/class_1_801; + ARG 1 keys diff --git a/mappings/net/minecraft/client/gl/GlDeviceInfo.mapping b/mappings/net/minecraft/client/gl/GlDeviceInfo.mapping index dfa83bb415..25059bd21a 100644 --- a/mappings/net/minecraft/client/gl/GlDeviceInfo.mapping +++ b/mappings/net/minecraft/client/gl/GlDeviceInfo.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_11541 net/minecraft/client/gl/GlDeviceInfo FIELD field_1_3852 LOGGER Lorg/slf4j/Logger; + FIELD field_1_5274 CPU_DEVICES Ljava/util/List; + FIELD field_1_5275 VIRTUAL_DEVICES Ljava/util/List; FIELD field_63062 writeToBufferIsSlow Z FIELD field_64657 anisotropyHasKnownIssue Z METHOD (Ljava/lang/String;)V @@ -9,6 +11,9 @@ CLASS net/minecraft/class_11541 net/minecraft/client/gl/GlDeviceInfo ARG 2 maxAnisotropy ARG 3 underlyingExtensions METHOD method_1_4680 getMaxTextureSize ()I + METHOD method_1_4763 getDeviceType (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_1_785; + ARG 1 renderer + ARG 2 vendor METHOD method_74912 writeToBufferIsSlow ()Z METHOD method_74913 shouldDisableArbDirectAccess (Ljava/lang/String;)Z ARG 0 glRenderer diff --git a/mappings/net/minecraft/client/gl/GlShaderProgram.mapping b/mappings/net/minecraft/client/gl/GlShaderProgram.mapping index bc213d7d56..8b90312378 100644 --- a/mappings/net/minecraft/client/gl/GlShaderProgram.mapping +++ b/mappings/net/minecraft/client/gl/GlShaderProgram.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/GlShaderProgram METHOD (ILjava/lang/String;)V ARG 1 glRef ARG 2 debugLabel + METHOD method_1_4748 (Ljava/util/List;)V + ARG 1 layouts METHOD method_1270 getGlRef ()I METHOD method_34582 getUniform (Ljava/lang/String;)Lnet/minecraft/class_284; ARG 1 name diff --git a/mappings/net/minecraft/client/gui/hud/debug/SystemSpecsDebugHudEntry.mapping b/mappings/net/minecraft/client/gui/hud/debug/SystemSpecsDebugHudEntry.mapping index 54353678ba..aa183407da 100644 --- a/mappings/net/minecraft/client/gui/hud/debug/SystemSpecsDebugHudEntry.mapping +++ b/mappings/net/minecraft/client/gui/hud/debug/SystemSpecsDebugHudEntry.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_11627 net/minecraft/client/gui/hud/debug/SystemSpecsDebugHudEntry FIELD field_61552 SECTION_ID Lnet/minecraft/class_2960; + METHOD method_1_5111 describeDeviceType (Lnet/minecraft/class_1_785;)Ljava/lang/String; + ARG 1 type diff --git a/mappings/net/minecraft/client/render/BindGroupLayouts.mapping b/mappings/net/minecraft/client/render/BindGroupLayouts.mapping new file mode 100644 index 0000000000..36b672800a --- /dev/null +++ b/mappings/net/minecraft/client/render/BindGroupLayouts.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_1_804 net/minecraft/client/render/BindGroupLayouts + FIELD field_1_5689 CHUNK_SECTION Lnet/minecraft/class_1_794; + FIELD field_1_5690 CLOUD Lnet/minecraft/class_1_794; + FIELD field_1_5691 CURRENT_AND_NEXT_SPRITE Lnet/minecraft/class_1_794; + FIELD field_1_5692 DISSOLVE_MASK_SAMPLER Lnet/minecraft/class_1_794; + FIELD field_1_5693 DYNAMIC_TRANSFORMS Lnet/minecraft/class_1_794; + FIELD field_1_5694 FOG Lnet/minecraft/class_1_794; + FIELD field_1_5695 GLOBALS Lnet/minecraft/class_1_794; + FIELD field_1_5696 IN_SAMPLER Lnet/minecraft/class_1_794; + FIELD field_1_5697 LIGHTING Lnet/minecraft/class_1_794; + FIELD field_1_5698 LIGHTMAP_INFO Lnet/minecraft/class_1_794; + FIELD field_1_5699 DYNAMIC_TRANSFORMS_AND_PROJECTION Lnet/minecraft/class_1_794; + FIELD field_1_5700 PROJECTION Lnet/minecraft/class_1_794; + FIELD field_1_5701 SAMPLER_0 Lnet/minecraft/class_1_794; + FIELD field_1_5702 SAMPLER_01 Lnet/minecraft/class_1_794; + FIELD field_1_5703 SAMPLER_012 Lnet/minecraft/class_1_794; + FIELD field_1_5704 SAMPLER_02 Lnet/minecraft/class_1_794; + FIELD field_1_5705 SAMPLER_1 Lnet/minecraft/class_1_794; + FIELD field_1_5706 SAMPLER_2 Lnet/minecraft/class_1_794; + FIELD field_1_5707 SPRITE Lnet/minecraft/class_1_794; + FIELD field_1_5708 SPRITE_ANIMATION_INFO Lnet/minecraft/class_1_794; diff --git a/mappings/net/minecraft/client/render/RenderPipelines.mapping b/mappings/net/minecraft/client/render/RenderPipelines.mapping index 5ebff29c38..27d9172a70 100644 --- a/mappings/net/minecraft/client/render/RenderPipelines.mapping +++ b/mappings/net/minecraft/client/render/RenderPipelines.mapping @@ -8,16 +8,20 @@ CLASS net/minecraft/class_10799 net/minecraft/client/render/RenderPipelines FIELD field_1_1479 ITEM_TRANSLUCENT Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_1_2466 BANNER_PATTERN Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_1_2467 TRANSLUCENT_BLOCK Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_1_3651 GUI_TEXT_GRAYSCALE Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_1_3652 TEXT_GRAYSCALE Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_1_3653 TEXT_GRAYSCALE_SEE_THROUGH Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_1_3654 TEXT_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; FIELD field_56812 BEACON_BEAM_TRANSLUCENT Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56814 RENDERTYPE_LEASH Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56815 RENDERTYPE_WATER_MASK Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56816 GLINT Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56817 RENDERTYPE_CRUMBLING Lcom/mojang/blaze3d/pipeline/RenderPipeline; - FIELD field_56818 RENDERTYPE_TEXT Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_56818 TEXT Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56819 RENDERTYPE_TEXT_BG Lcom/mojang/blaze3d/pipeline/RenderPipeline; - FIELD field_56821 RENDERTYPE_TEXT_POLYGON_OFFSET Lcom/mojang/blaze3d/pipeline/RenderPipeline; - FIELD field_56822 RENDERTYPE_TEXT_SEETHROUGH Lcom/mojang/blaze3d/pipeline/RenderPipeline; - FIELD field_56823 RENDERTYPE_TEXT_BG_SEETHROUGH Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_56821 TEXT_POLYGON_OFFSET Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_56822 TEXT_SEETHROUGH Lcom/mojang/blaze3d/pipeline/RenderPipeline; + FIELD field_56823 TEXT_BG_SEETHROUGH Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56825 RENDERTYPE_LIGHTNING Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56826 RENDERTYPE_LIGHTNING_DRAGON_RAYS Lcom/mojang/blaze3d/pipeline/RenderPipeline; FIELD field_56828 END_PORTAL Lcom/mojang/blaze3d/pipeline/RenderPipeline; @@ -38,7 +42,7 @@ CLASS net/minecraft/class_10799 net/minecraft/client/render/RenderPipelines FIELD field_56853 TERRAIN_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; FIELD field_56854 ENTITY_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; FIELD field_56855 RENDERTYPE_BEACON_BEAM_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; - FIELD field_56856 TEXT_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; + FIELD field_56856 BASE_TEXT_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; FIELD field_56857 RENDERTYPE_END_PORTAL_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; FIELD field_56858 RENDERTYPE_CLOUDS_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; FIELD field_56859 RENDERTYPE_LINES_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; diff --git a/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping b/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping index 3f2da78b90..eddb4b4a47 100644 --- a/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping @@ -28,3 +28,4 @@ CLASS net/minecraft/class_1_717 net/minecraft/client/vulkan/VulkanPhysicalDevice METHOD method_1_4291 getPhysicalDevice ()Lorg/lwjgl/vulkan/VkPhysicalDevice; METHOD method_1_4292 getDriverProperties ()Lorg/lwjgl/vulkan/VkPhysicalDeviceDriverProperties; METHOD method_1_4293 getDeviceProperties ()Lorg/lwjgl/vulkan/VkPhysicalDeviceProperties; + METHOD method_1_4893 getType ()Lnet/minecraft/class_1_785; diff --git a/mappings/net/minecraft/datafixer/schema/Schema4885.mapping b/mappings/net/minecraft/datafixer/schema/Schema4885.mapping new file mode 100644 index 0000000000..e6777f4ab4 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema4885.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1_788 net/minecraft/datafixer/schema/Schema4885 diff --git a/mappings/net/minecraft/entity/EntityTypes.mapping b/mappings/net/minecraft/entity/EntityTypes.mapping new file mode 100644 index 0000000000..fcb96dd511 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityTypes.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_1_787 net/minecraft/entity/EntityTypes + FIELD field_1_5362 MOUNT_WIDTH F + FIELD field_1_5376 CAN_POTENTIALLY_EXECUTE_COMMANDS Ljava/util/Set; + METHOD method_1_4772 boat (Ljava/util/function/Supplier;)Lnet/minecraft/class_1299$class_4049; + ARG 0 itemSupplier + METHOD method_1_4773 chestBoat (Ljava/util/function/Supplier;)Lnet/minecraft/class_1299$class_4049; + ARG 0 itemSupplier + METHOD method_1_4774 chestRaft (Ljava/util/function/Supplier;)Lnet/minecraft/class_1299$class_4049; + ARG 0 itemSupplier + METHOD method_1_4775 (Ljava/util/function/Supplier;Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_1690; + ARG 1 type + ARG 2 world + METHOD method_1_4776 (Ljava/util/function/Supplier;Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_7264; + ARG 1 type + ARG 2 world + METHOD method_1_4777 (Ljava/util/function/Supplier;Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_10257; + ARG 1 type + ARG 2 world + METHOD method_1_4778 (Ljava/util/function/Supplier;Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_10258; + ARG 1 type + ARG 2 world + METHOD method_1_4799 raft (Ljava/util/function/Supplier;)Lnet/minecraft/class_1299$class_4049; + ARG 0 itemSupplier + METHOD method_1_4800 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1299$class_1300;)Lnet/minecraft/class_1299; + ARG 0 key + ARG 1 builder diff --git a/mappings/net/minecraft/potion/PotionKeys.mapping b/mappings/net/minecraft/potion/PotionKeys.mapping new file mode 100644 index 0000000000..c0d8feb707 --- /dev/null +++ b/mappings/net/minecraft/potion/PotionKeys.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_793 net/minecraft/potion/PotionKeys + METHOD method_1_4831 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path diff --git a/mappings/net/minecraft/registry/tags/ConfiguredFeatureTags.mapping b/mappings/net/minecraft/registry/tag/ConfiguredFeatureTags.mapping similarity index 50% rename from mappings/net/minecraft/registry/tags/ConfiguredFeatureTags.mapping rename to mappings/net/minecraft/registry/tag/ConfiguredFeatureTags.mapping index 55e39f4001..98da949513 100644 --- a/mappings/net/minecraft/registry/tags/ConfiguredFeatureTags.mapping +++ b/mappings/net/minecraft/registry/tag/ConfiguredFeatureTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_1_463 net/minecraft/registry/tags/ConfiguredFeatureTags +CLASS net/minecraft/class_1_463 net/minecraft/registry/tag/ConfiguredFeatureTags METHOD method_1_2916 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 path diff --git a/mappings/net/minecraft/util/ColorMap.mapping b/mappings/net/minecraft/util/ColorMap.mapping index 4db9e6abeb..eac0b16f9b 100644 --- a/mappings/net/minecraft/util/ColorMap.mapping +++ b/mappings/net/minecraft/util/ColorMap.mapping @@ -40,7 +40,7 @@ CLASS net/minecraft/class_1_727 net/minecraft/util/ColorMap METHOD method_1_4919 (Ljava/util/function/BiFunction;Lnet/minecraft/class_1767;Ljava/lang/Object;)Lnet/minecraft/class_1792; ARG 1 color ARG 2 id - METHOD method_1_4920 prefixWithColors (Lnet/minecraft/class_1_727;)Lnet/minecraft/class_1_727; + METHOD method_1_4920 addPrefixes (Lnet/minecraft/class_1_727;)Lnet/minecraft/class_1_727; ARG 0 suffixes METHOD method_1_4921 mapZipped (Lnet/minecraft/class_1_727;Lnet/minecraft/class_1_727;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_727; ARG 0 first From e2c473b5d256b41661b6a673ae97ab2732d44444 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 08:58:39 -0400 Subject: [PATCH 06/14] Add more mappings --- .../nameproposal/NameProposalConfig.java | 2 +- .../blaze3d/buffers}/BufferAllocator.mapping | 4 +- .../blaze3d/textures/TexelFormat.mapping | 3 + .../blaze3d/vertex/VertexFormat.mapping | 12 +++ mappings/net/minecraft/block/Blocks.mapping | 10 ++ .../block/PointedDripstoneBlock.mapping | 10 ++ .../minecraft/block/SpeleothemBlock.mapping | 102 ++++++++++++++++++ .../minecraft/block/SulfurSpikeBlock.mapping | 5 + .../block/entity/BlockEntityType.mapping | 8 ++ .../block/entity/BlockEntityTypeKeys.mapping | 3 + .../block/entity/BlockEntityTypes.mapping | 11 ++ mappings/net/minecraft/class_1_790.mapping | 25 ++++- mappings/net/minecraft/class_1_797.mapping | 17 --- mappings/net/minecraft/class_1_801.mapping | 5 - mappings/net/minecraft/class_1_802.mapping | 2 - mappings/net/minecraft/class_1_805.mapping | 2 - mappings/net/minecraft/class_1_807.mapping | 69 ++++++++++++ mappings/net/minecraft/class_1_816.mapping | 81 ++++++++++++++ .../minecraft/client/MinecraftClient.mapping | 3 +- mappings/net/minecraft/client/RunArgs.mapping | 6 ++ .../network/ClientPlayNetworkHandler.mapping | 3 +- .../client/option/GameOptions.mapping | 22 +++- .../client/option/SimpleOption.mapping | 26 ++++- .../render/BufferBuilderStorage.mapping | 1 + .../client/render/BuiltBuffer.mapping | 14 +++ .../client/render/BuiltChunkStorage.mapping | 11 -- .../minecraft/client/render/Camera.mapping | 1 + .../render/ChunkRenderingDataPreparer.mapping | 14 +++ .../minecraft/client/render/Frustum.mapping | 2 + .../client/render/GameRenderer.mapping | 3 + .../client/render/OptionsRenderState.mapping | 3 + ...yRendering.mapping => SkyRenderer.mapping} | 2 +- .../render/VertexConsumerProvider.mapping | 7 ++ ...dering.mapping => WeatherRenderer.mapping} | 3 +- ...ng.mapping => WorldBorderRenderer.mapping} | 2 +- .../client/render/WorldRenderer.mapping | 42 +++++++- .../render/chunk/BuiltChunkStorage.mapping | 31 ++++++ .../render/chunk/VisibleChunkStorage.mapping | 51 +++++++++ .../render/state/CameraRenderState.mapping | 2 + .../render/state/WorldRenderState.mapping | 4 + .../world/ClientChunkLoadProgress.mapping | 6 ++ .../client/world/ClientChunkManager.mapping | 1 + .../client/world/ClientWorld.mapping | 16 ++- .../data/BlockItemTagProvider.mapping | 20 ++++ .../tag/BlockItemProvidedTagBuilder.mapping | 12 +++ .../data/tag/ProvidedTagBuilder.mapping | 3 + .../minecraft/data/tag/TagProvider.mapping | 7 ++ .../entity/ComponentsSubPredicate.mapping | 2 + .../entity/CompositeSubPredicate.mapping | 2 + ...redicate.mapping => DistanceCheck.mapping} | 2 +- .../entity/DistanceSubPredicate.mapping | 2 + .../entity/EffectsSubPredicate.mapping | 2 + ...ng => EntityEquipmentSubPredicate.mapping} | 2 +- ...apping => EntityFlagsSubPredicate.mapping} | 2 +- .../predicate/entity/EntityPredicate.mapping | 42 ++++++++ .../entity/EntitySubPredicate.mapping | 11 ++ .../entity/EntityTagsSubPredicate.mapping | 1 + ...mapping => EntityTypeSubPredicate.mapping} | 2 +- ...apping => FishingHookSubPredicate.mapping} | 2 +- ...ping => LightningBoltSubPredicate.mapping} | 2 +- .../entity/LocationSubPredicate.mapping | 2 + .../MovementAffectedBySubPredicate.mapping | 2 + ...e.mapping => MovementSubPredicate.mapping} | 2 +- .../predicate/entity/NBtSubPredicate.mapping | 2 + .../entity/PassengerSubPredicate.mapping | 2 + .../entity/PeriodicTickSubPredicate.mapping | 2 + ...ate.mapping => PlayerSubPredicate.mapping} | 2 +- ...ate.mapping => RaiderSubPredicate.mapping} | 2 +- ...cate.mapping => SheepSubPredicate.mapping} | 2 +- ...cate.mapping => SlimeSubPredicate.mapping} | 2 +- .../entity/SlotsSubPredicate.mapping | 2 + .../entity/SteppingOnSubPredicate.mapping | 2 + .../entity/TargetedEntitySubPredicate.mapping | 2 + .../predicate/entity/TeamSubPredicate.mapping | 2 + .../entity/VehicleSubPredicate.mapping | 2 + .../SynchronousResourceReloader.mapping | 3 +- .../dedicated/DedicatedServerWatchdog.mapping | 1 + mappings/net/minecraft/util/Util.mapping | 14 ++- .../net/minecraft/world/LightUtil.mapping | 8 ++ .../net/minecraft/world/biome/Biome.mapping | 6 +- .../chunk/light/LightingProvider.mapping | 9 +- 81 files changed, 753 insertions(+), 81 deletions(-) rename mappings/{net/minecraft/client/util => com/mojang/blaze3d/buffers}/BufferAllocator.mapping (91%) create mode 100644 mappings/net/minecraft/block/SpeleothemBlock.mapping create mode 100644 mappings/net/minecraft/block/SulfurSpikeBlock.mapping create mode 100644 mappings/net/minecraft/block/entity/BlockEntityTypeKeys.mapping create mode 100644 mappings/net/minecraft/block/entity/BlockEntityTypes.mapping delete mode 100644 mappings/net/minecraft/class_1_797.mapping delete mode 100644 mappings/net/minecraft/class_1_801.mapping delete mode 100644 mappings/net/minecraft/class_1_802.mapping delete mode 100644 mappings/net/minecraft/class_1_805.mapping create mode 100644 mappings/net/minecraft/class_1_807.mapping create mode 100644 mappings/net/minecraft/class_1_816.mapping delete mode 100644 mappings/net/minecraft/client/render/BuiltChunkStorage.mapping rename mappings/net/minecraft/client/render/{SkyRendering.mapping => SkyRenderer.mapping} (99%) rename mappings/net/minecraft/client/render/{WeatherRendering.mapping => WeatherRenderer.mapping} (98%) rename mappings/net/minecraft/client/render/{WorldBorderRendering.mapping => WorldBorderRenderer.mapping} (98%) create mode 100644 mappings/net/minecraft/client/render/chunk/BuiltChunkStorage.mapping create mode 100644 mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping create mode 100644 mappings/net/minecraft/data/BlockItemTagProvider.mapping create mode 100644 mappings/net/minecraft/data/tag/BlockItemProvidedTagBuilder.mapping create mode 100644 mappings/net/minecraft/predicate/entity/ComponentsSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/CompositeSubPredicate.mapping rename mappings/net/minecraft/predicate/entity/{DistancePredicate.mapping => DistanceCheck.mapping} (98%) create mode 100644 mappings/net/minecraft/predicate/entity/DistanceSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/EffectsSubPredicate.mapping rename mappings/net/minecraft/predicate/entity/{EntityEquipmentPredicate.mapping => EntityEquipmentSubPredicate.mapping} (98%) rename mappings/net/minecraft/predicate/entity/{EntityFlagsPredicate.mapping => EntityFlagsSubPredicate.mapping} (98%) create mode 100644 mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping rename mappings/net/minecraft/predicate/entity/{EntityTypePredicate.mapping => EntityTypeSubPredicate.mapping} (95%) rename mappings/net/minecraft/predicate/entity/{FishingHookPredicate.mapping => FishingHookSubPredicate.mapping} (94%) rename mappings/net/minecraft/predicate/entity/{LightningBoltPredicate.mapping => LightningBoltSubPredicate.mapping} (96%) create mode 100644 mappings/net/minecraft/predicate/entity/LocationSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/MovementAffectedBySubPredicate.mapping rename mappings/net/minecraft/predicate/entity/{MovementPredicate.mapping => MovementSubPredicate.mapping} (97%) create mode 100644 mappings/net/minecraft/predicate/entity/NBtSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/PassengerSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/PeriodicTickSubPredicate.mapping rename mappings/net/minecraft/predicate/entity/{PlayerPredicate.mapping => PlayerSubPredicate.mapping} (99%) rename mappings/net/minecraft/predicate/entity/{RaiderPredicate.mapping => RaiderSubPredicate.mapping} (95%) rename mappings/net/minecraft/predicate/entity/{SheepPredicate.mapping => SheepSubPredicate.mapping} (94%) rename mappings/net/minecraft/predicate/entity/{SlimePredicate.mapping => SlimeSubPredicate.mapping} (96%) create mode 100644 mappings/net/minecraft/predicate/entity/SlotsSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/SteppingOnSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/TargetedEntitySubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/TeamSubPredicate.mapping create mode 100644 mappings/net/minecraft/predicate/entity/VehicleSubPredicate.mapping diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java index e03ec85035..4006464489 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java @@ -68,7 +68,7 @@ public record NameProposalConfig(FieldNameProvider fieldNameProvider) { new ConditionalFieldNameProvider( new RecursiveArgumentFieldNameProvider("net/minecraft/class_1_780"::equals), List.of( -// new StaticFieldPredicate(false), + new StaticFieldPredicate(true), new MethodOwnerFieldPredicate("net/minecraft/class_1_782") ) ), diff --git a/mappings/net/minecraft/client/util/BufferAllocator.mapping b/mappings/com/mojang/blaze3d/buffers/BufferAllocator.mapping similarity index 91% rename from mappings/net/minecraft/client/util/BufferAllocator.mapping rename to mappings/com/mojang/blaze3d/buffers/BufferAllocator.mapping index aa0b92002c..4b939835d0 100644 --- a/mappings/net/minecraft/client/util/BufferAllocator.mapping +++ b/mappings/com/mojang/blaze3d/buffers/BufferAllocator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9799 net/minecraft/client/util/BufferAllocator +CLASS net/minecraft/class_9799 com/mojang/blaze3d/buffers/BufferAllocator FIELD field_52078 LOGGER Lorg/slf4j/Logger; FIELD field_52079 ALLOCATOR Lorg/lwjgl/system/MemoryUtil$MemoryAllocator; FIELD field_52080 MIN_GROWTH I @@ -40,5 +40,7 @@ CLASS net/minecraft/class_9799 net/minecraft/client/util/BufferAllocator FIELD field_52092 closed Z METHOD (Lnet/minecraft/class_9799;JII)V ARG 2 offset + ARG 4 size ARG 5 clearCount + METHOD method_1_4842 getSize ()I METHOD method_60817 getBuffer ()Ljava/nio/ByteBuffer; diff --git a/mappings/com/mojang/blaze3d/textures/TexelFormat.mapping b/mappings/com/mojang/blaze3d/textures/TexelFormat.mapping index c267f4b944..cd8ca3dafa 100644 --- a/mappings/com/mojang/blaze3d/textures/TexelFormat.mapping +++ b/mappings/com/mojang/blaze3d/textures/TexelFormat.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_1_658 com/mojang/blaze3d/textures/TexelFormat FIELD field_1_3259 size I + FIELD field_1_3866 alignment I METHOD (Ljava/lang/String;III)V ARG 3 size + ARG 4 alignment METHOD method_1_3886 isColor ()Z METHOD method_1_3887 hasDepth ()Z METHOD method_1_3888 hasStencil ()Z METHOD method_1_3889 getSize ()I + METHOD method_1_4721 getAlignment ()I diff --git a/mappings/com/mojang/blaze3d/vertex/VertexFormat.mapping b/mappings/com/mojang/blaze3d/vertex/VertexFormat.mapping index 6867956e9d..f1af0ee34c 100644 --- a/mappings/com/mojang/blaze3d/vertex/VertexFormat.mapping +++ b/mappings/com/mojang/blaze3d/vertex/VertexFormat.mapping @@ -1,6 +1,17 @@ CLASS com/mojang/blaze3d/vertex/VertexFormat + METHOD (Ljava/util/List;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;I)V + ARG 1 elements + ARG 2 names + ARG 3 offsets + ARG 4 vertexSize + METHOD contains (Lcom/mojang/blaze3d/vertex/VertexFormatElement;)Z + ARG 1 element METHOD equals (Ljava/lang/Object;)Z ARG 1 other + METHOD getElementName (Lcom/mojang/blaze3d/vertex/VertexFormatElement;)Ljava/lang/String; + ARG 1 element + METHOD getOffset (Lcom/mojang/blaze3d/vertex/VertexFormatElement;)I + ARG 1 element METHOD lambda$new$0 (II)I ARG 0 a ARG 1 b @@ -15,6 +26,7 @@ CLASS com/mojang/blaze3d/vertex/VertexFormat METHOD (Ljava/lang/String;II)V ARG 3 size METHOD method_31972 smallestFor (I)Lcom/mojang/blaze3d/vertex/VertexFormat$class_5595; + ARG 0 indexCount CLASS class_5596 DrawMode FIELD field_27384 firstVertexCount I COMMENT The number of vertices needed to form a first shape. diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 70e2f7630e..cbbe399b85 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -205,10 +205,17 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks METHOD method_1_4135 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4970$class_2251; ARG 0 color METHOD method_1_4136 registerSlabBlock (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; + ARG 0 key ARG 1 base METHOD method_1_4137 registerWallBlock (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; + ARG 0 key ARG 1 base + METHOD method_1_4804 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_1_4805 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings METHOD method_9492 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 key ARG 1 settings METHOD method_24419 (Lnet/minecraft/class_2680;)I ARG 0 state @@ -337,6 +344,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks METHOD method_55132 (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_55133 registerOldStairsBlock (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; + ARG 0 key ARG 1 base METHOD method_56717 (Lnet/minecraft/class_2680;)I ARG 0 state @@ -386,6 +394,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks METHOD method_63062 (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 2 state METHOD method_63064 register (Lnet/minecraft/class_1_784;Ljava/util/function/Function;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 key ARG 1 factory ARG 2 settings METHOD method_63065 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; @@ -468,6 +477,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks METHOD method_63121 createNetherStemSettings (Lnet/minecraft/class_3620;)Lnet/minecraft/class_4970$class_2251; ARG 0 mapColor METHOD method_63123 registerStairsBlock (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; + ARG 0 key ARG 1 base METHOD method_63144 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; ARG 0 settings diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping index dc8c422d85..29c2bb261e 100644 --- a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping +++ b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping @@ -1,9 +1,19 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock FIELD field_31203 DOWN_TIP_Y D + FIELD field_31209 DRIP_PARTICLE_CHANCE F FIELD field_31211 WATER_DRIP_CHANCE F FIELD field_31212 LAVA_DRIP_CHANCE F FIELD field_36340 DRIP_COLLISION_SHAPE Lnet/minecraft/class_265; FIELD field_46413 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_1_5029 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 2 p + ARG 3 st + METHOD method_1_5030 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z + ARG 1 st + METHOD method_1_5031 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_1_5032 (Lnet/minecraft/class_5689;)Lnet/minecraft/class_2680; + ARG 0 block METHOD method_32767 getDripPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/SpeleothemBlock.mapping b/mappings/net/minecraft/block/SpeleothemBlock.mapping new file mode 100644 index 0000000000..6920ab4d10 --- /dev/null +++ b/mappings/net/minecraft/block/SpeleothemBlock.mapping @@ -0,0 +1,102 @@ +CLASS net/minecraft/class_1_805 net/minecraft/block/SpeleothemBlock + FIELD field_1_5720 GROWTH_ON_RANDOM_TICK_CHANCE F + FIELD field_1_5722 MAX_HORIZONTAL_MODEL_OFFSET F + FIELD field_1_5726 BASE_SHAPE Lnet/minecraft/class_265; + FIELD field_1_5727 FRUSTUM_SHAPE Lnet/minecraft/class_265; + FIELD field_1_5728 MIDDLE_SHAPE Lnet/minecraft/class_265; + FIELD field_1_5729 TIP_DOWN_SHAPE Lnet/minecraft/class_265; + FIELD field_1_5730 TIP_MERGE_SHAPE Lnet/minecraft/class_265; + FIELD field_1_5731 TIP_UP_SHAPE Lnet/minecraft/class_265; + FIELD field_1_5734 THICKNESS Lnet/minecraft/class_2754; + FIELD field_1_5735 DIRECTION Lnet/minecraft/class_2754; + FIELD field_1_5736 WATERLOGGED Lnet/minecraft/class_2746; + FIELD field_1_5737 growsOn Lnet/minecraft/class_2680; + METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_2251;)V + ARG 1 growsOn + ARG 2 settings + METHOD method_1_4922 isDrippingObstructed (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 1 world + ARG 2 pos + ARG 3 state + METHOD method_1_4923 getThickness (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)Lnet/minecraft/class_5691; + ARG 1 world + ARG 2 pos + ARG 3 direction + ARG 4 tipMerge + METHOD method_1_4924 getPlacementDirection (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; + ARG 1 world + ARG 2 pos + ARG 3 direction + METHOD method_1_4925 canGrowInto (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 state + ARG 2 world + ARG 3 pos + METHOD method_1_4926 mergeTips (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V + ARG 1 state + ARG 2 world + ARG 3 pos + METHOD method_1_4927 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_5691;)V + ARG 1 world + ARG 2 pos + ARG 3 direction + ARG 4 thickness + METHOD method_1_4928 searchForTip (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2352;Ljava/util/function/BiPredicate;Ljava/util/function/Predicate;I)Ljava/util/Optional; + ARG 0 world + ARG 1 pos + ARG 2 direction + ARG 3 columnPredicate + ARG 4 tipPredicate + ARG 5 searchLimit + METHOD method_1_4929 getTipPos (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; + ARG 0 state + ARG 1 world + ARG 2 pos + ARG 3 searchLimit + ARG 4 allowMerged + METHOD method_1_4930 extend (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V + ARG 1 world + ARG 2 pos + ARG 3 direction + METHOD method_1_4931 tryGrow (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 random + METHOD method_1_4932 growStalagmite (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos + METHOD method_1_4933 isGrowableTip (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_1_4934 isSpeleothemInDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z + ARG 0 state + ARG 1 direction + METHOD method_1_4935 isStalactite (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_1_4936 isStalactiteBase (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 0 state + ARG 1 world + ARG 2 pos + METHOD method_1_4937 isStalagmite (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_1_4938 isTip (Lnet/minecraft/class_2680;Z)Z + ARG 0 state + ARG 1 allowMerge + METHOD method_1_4939 isSpeleothemOfSelf (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z + ARG 1 state + ARG 2 direction + METHOD method_1_4940 canPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 world + ARG 2 pos + ARG 3 direction + METHOD method_1_4941 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 2 p + ARG 3 st + METHOD method_1_4942 (ZLnet/minecraft/class_2680;)Z + ARG 1 st + METHOD method_1_4943 createFallingStalactites (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 0 state + ARG 1 world + ARG 2 pos + METHOD method_36371 canGrow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/block/SulfurSpikeBlock.mapping b/mappings/net/minecraft/block/SulfurSpikeBlock.mapping new file mode 100644 index 0000000000..3122c97c61 --- /dev/null +++ b/mappings/net/minecraft/block/SulfurSpikeBlock.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1_812 net/minecraft/block/SulfurSpikeBlock + METHOD method_1_4974 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_1_4975 (Lnet/minecraft/class_1_812;)Lnet/minecraft/class_2680; + ARG 0 block diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping index 6a4f95c8f1..2eef8916c2 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping @@ -16,20 +16,28 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType FIELD field_11892 factory Lnet/minecraft/class_2591$class_5559; FIELD field_19315 blocks Ljava/util/Set; FIELD field_45786 registryEntry Lnet/minecraft/class_6880$class_6883; + METHOD (Lnet/minecraft/class_2591$class_5559;Ljava/util/Set;)V + ARG 1 factory + ARG 2 blocks METHOD method_11032 instantiate (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2586; COMMENT {@return a new instance of the block entity} COMMENT COMMENT @see BlockEntityType.BlockEntityFactory + ARG 1 pos + ARG 2 state METHOD method_20526 supports (Lnet/minecraft/class_2680;)Z COMMENT {@return whether the block entity type supports {@code state}} COMMENT COMMENT

The block, not the block state, determines the corresponding block entity type; COMMENT therefore, for states of the same block, the return value is the same. + ARG 1 state METHOD method_24182 get (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; COMMENT {@return the block entity instance of this type at {@code pos}, or {@code null} if COMMENT no such block entity exists} COMMENT COMMENT @see BlockView#getBlockEntity + ARG 1 world + ARG 2 concat METHOD method_53254 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_65166 canPotentiallyExecuteCommands ()Z CLASS class_5559 BlockEntityFactory diff --git a/mappings/net/minecraft/block/entity/BlockEntityTypeKeys.mapping b/mappings/net/minecraft/block/entity/BlockEntityTypeKeys.mapping new file mode 100644 index 0000000000..f9d9d950c7 --- /dev/null +++ b/mappings/net/minecraft/block/entity/BlockEntityTypeKeys.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_819 net/minecraft/block/entity/BlockEntityTypeKeys + METHOD method_1_5058 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path diff --git a/mappings/net/minecraft/block/entity/BlockEntityTypes.mapping b/mappings/net/minecraft/block/entity/BlockEntityTypes.mapping new file mode 100644 index 0000000000..c10832073b --- /dev/null +++ b/mappings/net/minecraft/block/entity/BlockEntityTypes.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_1_817 net/minecraft/block/entity/BlockEntityTypes + FIELD field_1_5840 LOGGER Lorg/slf4j/Logger; + FIELD field_1_5842 CAN_POTENTIALLY_EXECUTE_COMMANDS Ljava/util/Set; + METHOD method_1_5038 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_2591$class_5559;Ljava/util/List;)Lnet/minecraft/class_2591; + ARG 0 key + ARG 1 blockEntityFactory + ARG 2 blocks + METHOD method_1_5039 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_2591$class_5559;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_2591; + ARG 0 key + ARG 1 blockEntityFactory + ARG 2 blocks diff --git a/mappings/net/minecraft/class_1_790.mapping b/mappings/net/minecraft/class_1_790.mapping index 41888acb9b..6ac6cb802c 100644 --- a/mappings/net/minecraft/class_1_790.mapping +++ b/mappings/net/minecraft/class_1_790.mapping @@ -1,9 +1,30 @@ CLASS net/minecraft/class_1_790 + FIELD field_1_5600 storage Lnet/minecraft/class_1_797; METHOD (Lnet/minecraft/class_5539;I)V ARG 1 world - METHOD method_1_4812 (Lnet/minecraft/class_638;J)Z + ARG 2 viewDistance + METHOD method_1_4812 isLightingEnabledInChunk (Lnet/minecraft/class_638;J)Z ARG 1 world ARG 2 sectionPos - METHOD method_1_4814 (Lnet/minecraft/class_638;J)Z + METHOD method_1_4813 getRenderedChunk (J)Lnet/minecraft/class_1_790$class_1_791; + ARG 1 sectionPos + METHOD method_1_4814 isLightingEnabledAround (Lnet/minecraft/class_638;J)Z ARG 1 world ARG 2 sectionPos + METHOD method_1_4815 (IJ)Lnet/minecraft/class_1_790$class_1_791; + ARG 0 index + ARG 1 sectionPos + METHOD method_1_4816 setOrigin (Lnet/minecraft/class_4076;)V + ARG 1 sectionPos + METHOD method_1_4817 updateSection (IIIZ)V + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + ARG 4 redrawOnMainThread + METHOD method_1_4818 getSectionCount ()I + CLASS class_1_791 Section + FIELD field_1_5603 sectionPos J + METHOD (ZZJ)V + ARG 3 sectionPos + METHOD method_1_4821 update (Z)V + ARG 1 redrawOnMainThread diff --git a/mappings/net/minecraft/class_1_797.mapping b/mappings/net/minecraft/class_1_797.mapping deleted file mode 100644 index 3498a6622b..0000000000 --- a/mappings/net/minecraft/class_1_797.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_1_797 - FIELD field_1_5661 DUMMY Lnet/minecraft/class_4076; - METHOD method_1_4844 (III)Z - ARG 1 sectionX - ARG 2 sectionY - ARG 3 sectionZ - METHOD method_1_4846 (III)Lnet/minecraft/class_1_797$class_1_799; - ARG 1 sectionX - ARG 2 sectionY - ARG 3 sectionZ - METHOD method_1_4847 (J)Lnet/minecraft/class_1_797$class_1_799; - ARG 1 sectionPos - METHOD method_1_4853 (Lnet/minecraft/class_4076;)Z - ARG 1 pos - CLASS class_1_799 - METHOD method_62973 setSectionPos (J)V - METHOD method_62975 getSectionPos ()J diff --git a/mappings/net/minecraft/class_1_801.mapping b/mappings/net/minecraft/class_1_801.mapping deleted file mode 100644 index e4ff225e4b..0000000000 --- a/mappings/net/minecraft/class_1_801.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_1_801 - METHOD method_1_4880 (Lnet/minecraft/class_1_727;)Lnet/minecraft/class_1_801; - ARG 1 keys - METHOD method_1_4881 (Lnet/minecraft/class_1_758;)Lnet/minecraft/class_1_801; - ARG 1 keys diff --git a/mappings/net/minecraft/class_1_802.mapping b/mappings/net/minecraft/class_1_802.mapping deleted file mode 100644 index 61439c9295..0000000000 --- a/mappings/net/minecraft/class_1_802.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1_802 - METHOD method_71549 configure ()V diff --git a/mappings/net/minecraft/class_1_805.mapping b/mappings/net/minecraft/class_1_805.mapping deleted file mode 100644 index b796cf1fc7..0000000000 --- a/mappings/net/minecraft/class_1_805.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1_805 - METHOD method_36371 canGrow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/class_1_807.mapping b/mappings/net/minecraft/class_1_807.mapping new file mode 100644 index 0000000000..f297056086 --- /dev/null +++ b/mappings/net/minecraft/class_1_807.mapping @@ -0,0 +1,69 @@ +CLASS net/minecraft/class_1_807 + FIELD field_1_5738 uploadedIndices Lcom/mojang/blaze3d/buffers/GpuBuffer; + FIELD field_1_5739 uploadedVertices Lcom/mojang/blaze3d/buffers/GpuBuffer; + FIELD field_1_5741 index Lnet/minecraft/class_1_807$class_1_810; + FIELD field_1_5744 allocator Lnet/minecraft/class_9799; + FIELD field_1_5745 staging Lnet/minecraft/class_1_807$class_1_810; + FIELD field_1_5746 vertex Lnet/minecraft/class_1_807$class_1_810; + METHOD (Ljava/util/function/Supplier;I)V + ARG 1 labelGetter + ARG 2 maxSize + METHOD method_1_4944 appendDraw (Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$class_5596;)Lnet/minecraft/class_1_807$class_1_808; + ARG 1 vertexFormat + ARG 2 drawMode + METHOD method_1_4945 appendDraw (Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$class_5596;Lnet/minecraft/class_8251;)Lnet/minecraft/class_1_807$class_1_808; + ARG 1 vertexFormat + ARG 2 drawMode + ARG 3 vertexSorter + METHOD method_1_4946 collectCentroids (Lnet/minecraft/class_1_807$class_1_808;)Lnet/minecraft/class_11899; + METHOD method_1_4948 finish ()V + METHOD method_1_4950 execute (Lnet/minecraft/class_1_807$class_1_808;)Lnet/minecraft/class_1_807$class_1_809; + METHOD method_1_4951 appendDraw (Lnet/minecraft/class_1_807$class_1_808;)Lnet/minecraft/class_4588; + METHOD method_1_4955 upload ()V + METHOD method_1_4956 upload (Lcom/mojang/blaze3d/systems/GpuDevice;Ljava/util/List;Lcom/mojang/blaze3d/buffers/GpuBuffer;Lcom/mojang/blaze3d/buffers/GpuBuffer;II)V + ARG 1 device + ARG 3 vertexBuffer + ARG 4 indexBuffer + ARG 5 vertexOffset + ARG 6 indexOffset + CLASS class_1_808 + FIELD field_1_5748 vertexFormat Lcom/mojang/blaze3d/vertex/VertexFormat; + FIELD field_1_5749 totalIndexCount I + FIELD field_1_5750 indexOffset I + FIELD field_1_5751 drawMode Lcom/mojang/blaze3d/vertex/VertexFormat$class_5596; + FIELD field_1_5752 vertexSorter Lnet/minecraft/class_8251; + FIELD field_1_5753 totalVertexSize I + FIELD field_1_5754 segments Ljava/util/List; + FIELD field_1_5755 totalVertexCount I + FIELD field_1_5756 vertexOffset I + METHOD (Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$class_5596;Lnet/minecraft/class_8251;)V + ARG 1 vertexFormat + ARG 2 drawMode + ARG 3 vertexSorter + METHOD method_1_4957 add (Lnet/minecraft/class_9801;)V + ARG 1 buffer + METHOD method_1_4958 clear ()V + METHOD method_1_4959 getIndexType ()Lcom/mojang/blaze3d/vertex/VertexFormat$class_5595; + METHOD method_1_4960 isEmpty ()Z + CLASS class_1_810 BufferPool + FIELD field_1_5759 usableBuffers Ljava/util/List; + FIELD field_1_5760 labelGetter Ljava/util/function/Supplier; + FIELD field_1_5761 waitingBuffers Ljava/util/List; + FIELD field_1_5762 usage I + FIELD field_1_5763 allocatedBuffers Ljava/util/List; + METHOD (Ljava/util/function/Supplier;I)V + ARG 1 labelGetter + ARG 2 usage + METHOD method_1_4961 allocate (Lcom/mojang/blaze3d/systems/GpuDevice;I)Lcom/mojang/blaze3d/buffers/GpuBuffer; + ARG 1 device + ARG 2 size + METHOD method_1_4962 finish (Lcom/mojang/blaze3d/systems/GpuDevice;)V + ARG 1 device + METHOD method_1_4963 (Lnet/minecraft/class_1_807$class_1_810$class_1_811;)Z + ARG 1 waitingBuffer + METHOD method_1_4964 getSuitableBuffer (II)Lcom/mojang/blaze3d/buffers/GpuBuffer; + ARG 1 minSize + ARG 2 maxSize + METHOD method_1_4965 claimReadyBuffers ()V + CLASS class_1_811 WaitingBuffer + METHOD method_1_4966 getIfReady ()Ljava/util/List; diff --git a/mappings/net/minecraft/class_1_816.mapping b/mappings/net/minecraft/class_1_816.mapping new file mode 100644 index 0000000000..523454d467 --- /dev/null +++ b/mappings/net/minecraft/class_1_816.mapping @@ -0,0 +1,81 @@ +CLASS net/minecraft/class_1_816 + FIELD field_1_5786 debugRenderer Lnet/minecraft/class_863; + FIELD field_1_5787 gameTestDebugRenderer Lnet/minecraft/class_4503; + FIELD field_1_5788 viewDistance I + FIELD field_1_5789 world Lnet/minecraft/class_638; + FIELD field_1_5790 worldRenderState Lnet/minecraft/class_11658; + FIELD field_1_5791 worldRenderer Lnet/minecraft/class_761; + FIELD field_1_5792 gizmos Lnet/minecraft/class_12185; + FIELD field_1_5793 client Lnet/minecraft/class_310; + FIELD field_1_5794 pitchd2 D + FIELD field_1_5795 yawd2 D + FIELD field_1_5797 rebuildChunks Z + FIELD field_1_5798 recreateTerrainSampler Z + FIELD field_1_5799 clearWorldRenderer Z + FIELD field_1_5800 scheduledReload Z + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_11658;Lnet/minecraft/class_761;)V + ARG 1 client + ARG 2 worldRenderState + ARG 3 worldRenderer + METHOD method_1_4996 reload ()V + METHOD method_1_4997 applyFrustum (Lnet/minecraft/class_4604;)V + ARG 1 frustum + METHOD method_1_4998 updateListeners (Lnet/minecraft/class_2338;I)V + ARG 1 pos + ARG 2 flags + METHOD method_1_4999 startGizmos ()Lnet/minecraft/class_12180$class_12181; + METHOD method_1_5002 render (Lnet/minecraft/class_9779;Lnet/minecraft/class_4184;F)V + ARG 1 tickCounter + ARG 2 camera + ARG 3 tickProgress + METHOD method_1_5005 (Lnet/minecraft/class_1297;F)Lnet/minecraft/class_10017; + ARG 1 entity + ARG 2 tickProgress + METHOD method_1_5006 renderGizmos ()V + METHOD method_1_5007 (Lnet/minecraft/class_4184;FLnet/minecraft/class_11658;)V + ARG 1 camera + ARG 3 worldRenderState + METHOD method_1_5008 (Lnet/minecraft/class_4184;Lnet/minecraft/class_4604;Lnet/minecraft/class_9779;Lnet/minecraft/class_11658;)V + ARG 1 camera + ARG 2 frustum + ARG 3 tickCounter + ARG 4 worldRenderState + METHOD method_1_5010 recreateTerrainSampler ()V + METHOD method_1_5012 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 from + ARG 3 to + METHOD method_1_5013 updateBlock (Lnet/minecraft/class_2338;Z)V + ARG 1 pos + ARG 2 redrawOnMainThread + METHOD method_1_5014 updateBlocks (IIIIII)V + ARG 1 minX + ARG 2 minY + ARG 3 minZ + ARG 4 maxX + ARG 5 maxY + ARG 6 maxZ + METHOD method_1_5015 setWorld (Lnet/minecraft/class_638;)V + ARG 1 world + METHOD method_1_5016 updateSection (III)V + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + METHOD method_1_5017 updateSection (IIIZ)V + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + ARG 4 redrawOnMainThread + METHOD method_1_5018 scheduleChunkRenders (III)V + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + METHOD method_1_5019 scheduleChunkRenders (IIIIII)V + ARG 1 minSectionX + ARG 2 minSectionY + ARG 3 minSectionZ + ARG 4 maxSectionX + ARG 5 maxSectionY + ARG 6 maxSectionZ + METHOD method_1_5020 shouldDrawEntityOutlines (Lnet/minecraft/class_4184;)Z + ARG 1 camera diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 3cefb435c9..83109ae195 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -188,6 +188,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 runDir ARG 1 crashReport METHOD method_1_3940 getGpuSurface ()Lnet/minecraft/class_1_665; + METHOD method_1_4728 getRecorder ()Lnet/minecraft/class_5962; METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_1479 getResourcePackDir ()Ljava/nio/file/Path; METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V @@ -485,5 +486,5 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 world METHOD method_76797 disconnectWithProgressScreen (Z)V ARG 1 stopSounds - CLASS 1 1 + CLASS 1 FIELD field_52756 closed Z diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index 51324bddb7..28cdfc3994 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 4 assetIndex METHOD method_45701 getAssetDir ()Ljava/nio/file/Path; CLASS class_545 Game + FIELD field_1_3398 vulkanValidation Z + FIELD field_1_3843 graphicsApiOption Lnet/minecraft/class_1_698; FIELD field_3291 versionType Ljava/lang/String; FIELD field_3292 demo Z FIELD field_3293 version Ljava/lang/String; @@ -37,12 +39,16 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 4 multiplayerDisabled ARG 5 onlineChatDisabled ARG 6 tracyEnabled + ARG 7 vulkanValidation + ARG 8 renderDebugLabels + ARG 9 graphicsApiOption ARG 10 offlineDeveloperMode CLASS class_547 Network FIELD field_3296 netProxy Ljava/net/Proxy; FIELD field_3299 session Lnet/minecraft/class_320; METHOD (Lnet/minecraft/class_320;Ljava/net/Proxy;)V ARG 1 session + ARG 2 netProxy CLASS class_8495 QuickPlay METHOD method_51257 isEnabled ()Z CLASS class_11392 DisabledQuickPlay diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 2f8ba7e74e..4bced86602 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -63,6 +63,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 button METHOD method_1_1525 showDemoStartDialog (Lnet/minecraft/class_315;)V ARG 1 options + METHOD method_1_5028 getSectionReadyCallback ()Ljava/lang/Runnable; METHOD method_2869 getAdvancementHandler ()Lnet/minecraft/class_632; METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;Z)V ARG 1 chunkX @@ -220,7 +221,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_76760 isLoaded ()Z METHOD method_76761 setLoaded (Z)V ARG 1 loaded - CLASS 1 1 + CLASS 1 METHOD method_71930 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context CLASS class_11503 CommandRunResult diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 25e3443049..7bff54faf9 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -311,6 +311,12 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 optionText ARG 1 value METHOD method_1_3895 getGraphicsApi ()Lnet/minecraft/class_7172; + METHOD method_1_4722 (Ljava/lang/Integer;)V + ARG 1 renderDistance + METHOD method_1_4723 (Ljava/lang/Boolean;)V + ARG 1 cutoutLeaves + METHOD method_1_4725 (Ljava/lang/Integer;)V + ARG 1 maxAnisotropy METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_1627 addResourcePackProfilesToManager (Lnet/minecraft/class_3283;)V @@ -611,20 +617,30 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_74034 getAllowCursorChanges ()Lnet/minecraft/class_7172; METHOD method_74035 (Ljava/lang/Boolean;)V ARG 0 value + METHOD method_75316 (Lnet/minecraft/class_4063;)V + ARG 1 renderClouds METHOD method_75317 applyGraphicsMode (Lnet/minecraft/class_5365;)V ARG 1 mode + METHOD method_75319 (Ljava/lang/Integer;)V + ARG 1 simulationDistance METHOD method_75320 (Lnet/minecraft/class_2561;Lnet/minecraft/class_5365;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value METHOD method_75321 onChangeGraphicsOption ()V + METHOD method_75327 (Ljava/lang/Integer;)V + ARG 1 mipmapLevels METHOD method_75328 (Lnet/minecraft/class_2561;Ljava/lang/Integer;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value METHOD method_75329 getPreset ()Lnet/minecraft/class_7172; + METHOD method_75331 (Ljava/lang/Integer;)V + ARG 1 weatherRadius METHOD method_75333 getWeatherRadius ()Lnet/minecraft/class_7172; METHOD method_75334 getCutoutLeaves ()Lnet/minecraft/class_7172; METHOD method_75335 getVignette ()Lnet/minecraft/class_7172; METHOD method_75337 getImprovedTransparency ()Lnet/minecraft/class_7172; + METHOD method_75341 (Ljava/lang/Double;)V + ARG 1 entityDistanceScaling METHOD method_76247 getMaxAnisotropy ()Lnet/minecraft/class_7172; METHOD method_76248 getEffectiveAnisotropy ()I METHOD method_76249 (I)Ljava/lang/Double; @@ -678,14 +694,16 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 mode METHOD method_76779 refreshWorldRenderer (Ljava/util/function/Consumer;)V ARG 0 refresher + METHOD method_76784 (Ljava/lang/Integer;)V + ARG 1 renderCloudsDistance METHOD method_76786 (Ljava/lang/Boolean;)V ARG 1 value - CLASS 2 2 + CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key METHOD method_42571 (Ljava/lang/String;Lnet/minecraft/class_7172;Lcom/mojang/serialization/DataResult$Error;)V ARG 2 error - CLASS 3 3 + CLASS 3 METHOD method_33677 print (Ljava/lang/String;)V ARG 1 key METHOD method_42573 (Ljava/lang/String;Ljava/io/PrintWriter;Lcom/google/gson/JsonElement;)V diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping index 9b0e590d54..7f5acfa726 100644 --- a/mappings/net/minecraft/client/option/SimpleOption.mapping +++ b/mappings/net/minecraft/client/option/SimpleOption.mapping @@ -61,6 +61,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT Options can also have a tooltip, specified by passing {@code tooltipFactoryGetter}. If the COMMENT option has no tooltips, you can pass {@link #emptyTooltip()}, and if the option always COMMENT uses one tooltip, you can pass {@link #constantTooltip(Text)}. + FIELD field_1_4495 DUMMY_CHANGE_CALLBACK Lnet/minecraft/class_7172$class_1_783; FIELD field_37862 LOGGER Lorg/slf4j/Logger; FIELD field_37863 tooltipFactory Lnet/minecraft/class_7172$class_7277; FIELD field_37864 textGetter Ljava/util/function/Function; @@ -83,12 +84,16 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption ARG 4 callbacks ARG 5 codec ARG 6 defaultValue + ARG 7 changeCallback METHOD (Ljava/lang/String;Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172$class_7303;Lnet/minecraft/class_7172$class_7178;Ljava/lang/Object;Lnet/minecraft/class_7172$class_1_783;)V ARG 1 key ARG 2 tooltipFactory ARG 3 valueTextGetter ARG 4 callbacks ARG 5 defaultValue + ARG 6 changeCallback + METHOD method_1_4749 (Ljava/lang/Object;)V + ARG 0 value METHOD method_18520 createWidget (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339; ARG 1 options ARG 2 x @@ -113,10 +118,12 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption ARG 0 key ARG 1 tooltipFactory ARG 2 defaultValue + ARG 3 changeCallback METHOD method_41751 ofBoolean (Ljava/lang/String;ZLnet/minecraft/class_7172$class_1_783;)Lnet/minecraft/class_7172; COMMENT Creates a boolean option. ARG 0 key ARG 1 defaultValue + ARG 2 changeCallback METHOD method_41753 getValue ()Ljava/lang/Object; COMMENT {@return the option's current value} METHOD method_41754 getCallbacks ()Lnet/minecraft/class_7172$class_7178; @@ -134,20 +141,30 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT {@return the getter for the {@code tooltipFactoryGetter} parameter of the constructor COMMENT to indicate constant tooltips} ARG 0 text + METHOD method_47393 (Lnet/minecraft/class_2561;Ljava/lang/Object;)Lnet/minecraft/class_7919; + ARG 1 value + METHOD method_47394 (Ljava/lang/Object;)Lnet/minecraft/class_7919; + ARG 0 value METHOD method_47603 createWidget (Lnet/minecraft/class_315;IIILnet/minecraft/class_7172$class_1_783;)Lnet/minecraft/class_339; ARG 1 options ARG 2 x ARG 3 y ARG 4 width + ARG 5 changeCallback METHOD method_47604 ofBoolean (Ljava/lang/String;Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172$class_7303;ZLnet/minecraft/class_7172$class_1_783;)Lnet/minecraft/class_7172; ARG 0 key ARG 1 tooltipFactory ARG 2 valueTextGetter ARG 3 defaultValue + ARG 4 changeCallback METHOD method_47605 (Lnet/minecraft/class_2561;Ljava/lang/Boolean;)Lnet/minecraft/class_2561; + ARG 0 optionText ARG 1 value METHOD method_57701 createWidget (Lnet/minecraft/class_315;)Lnet/minecraft/class_339; ARG 1 options + CLASS class_1_783 ChangeCallback + METHOD method_1_4750 accept (Ljava/lang/Object;)V + ARG 1 value CLASS class_7173 PotentialValuesBasedCallbacks COMMENT A set of callbacks for a cycling option. COMMENT @@ -175,6 +192,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption ARG 6 option ARG 7 callbacks ARG 8 tooltipFactory + ARG 9 changeCallback ARG 10 shouldApplyImmediately METHOD method_59868 applyPendingValue ()V CLASS class_7176 SliderCallbacks @@ -206,7 +224,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT @see Callback Modifiers ARG 1 sliderProgressValueToValue ARG 2 valueToSliderProgressValue - CLASS 1 1 + CLASS 1 CLASS class_7178 Callbacks COMMENT A set of callbacks to customize an option's behavior. COMMENT @@ -221,6 +239,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption ARG 3 x ARG 4 y ARG 5 width + ARG 6 changeCallback METHOD method_41758 validate (Ljava/lang/Object;)Ljava/util/Optional; COMMENT {@return the validated value} COMMENT @@ -242,7 +261,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT @see Callback Modifiers ARG 1 sliderProgressValueToValue ARG 2 valueToSliderProgressValue - CLASS 1 1 + CLASS 1 CLASS class_7276 LazyCyclingCallbacks COMMENT A set of callbacks for a cycling option whose potential values are determined lazily. COMMENT @@ -251,7 +270,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption METHOD method_1_33 apply (Ljava/lang/Object;)Lnet/minecraft/class_7919; ARG 1 value CLASS class_7303 ValueTextGetter - METHOD method_1_31 toString (Lnet/minecraft/class_2561;Ljava/lang/Object;)Lnet/minecraft/class_2561; + METHOD method_1_31 toText (Lnet/minecraft/class_2561;Ljava/lang/Object;)Lnet/minecraft/class_2561; ARG 1 optionText ARG 2 value CLASS class_7304 MaxSuppliableIntCallbacks @@ -266,6 +285,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption METHOD method_42723 (Lnet/minecraft/class_7172$class_7277;IIILnet/minecraft/class_315;Lnet/minecraft/class_7172$class_1_783;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; ARG 7 option METHOD method_42724 (Lnet/minecraft/class_7172;Lnet/minecraft/class_315;Lnet/minecraft/class_7172$class_1_783;Lnet/minecraft/class_5676;Ljava/lang/Object;)V + ARG 4 text ARG 5 value CLASS class_7274 ValueSetter METHOD method_1_32 set (Lnet/minecraft/class_7172;Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping index efe785f1d7..aa482c3846 100644 --- a/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4599 net/minecraft/client/render/BufferBuilderStorage + FIELD field_1_5678 effectVertexConsumers Lnet/minecraft/class_4597$class_4598; FIELD field_20956 blockBufferBuilders Lnet/minecraft/class_750; FIELD field_20961 outlineVertexConsumers Lnet/minecraft/class_4618; FIELD field_46900 blockBufferBuildersPool Lnet/minecraft/class_8901; diff --git a/mappings/net/minecraft/client/render/BuiltBuffer.mapping b/mappings/net/minecraft/client/render/BuiltBuffer.mapping index 33edf4a9eb..15fc84adfb 100644 --- a/mappings/net/minecraft/client/render/BuiltBuffer.mapping +++ b/mappings/net/minecraft/client/render/BuiltBuffer.mapping @@ -5,15 +5,29 @@ CLASS net/minecraft/class_9801 net/minecraft/client/render/BuiltBuffer METHOD (Lnet/minecraft/class_9799$class_9800;Lnet/minecraft/class_9801$class_4574;)V ARG 1 buffer ARG 2 drawParameters + METHOD method_1_4742 getCloseableBuffer ()Lnet/minecraft/class_9799$class_9800; METHOD method_60818 getBuffer ()Ljava/nio/ByteBuffer; METHOD method_60819 sortQuads (Lnet/minecraft/class_9799;Lnet/minecraft/class_8251;)Lnet/minecraft/class_9801$class_9802; ARG 1 allocator ARG 2 sorter METHOD method_60820 collectCentroids (Ljava/nio/ByteBuffer;ILcom/mojang/blaze3d/vertex/VertexFormat;Lnet/minecraft/class_11899;I)V + ARG 0 buffer + ARG 1 vertexCount + ARG 2 format + ARG 3 quadsOut + ARG 4 index METHOD method_60821 getSortedBuffer ()Ljava/nio/ByteBuffer; METHOD method_60822 getDrawParameters ()Lnet/minecraft/class_9801$class_4574; CLASS class_4574 DrawParameters CLASS class_9802 SortState + METHOD method_1_4743 (Ljava/nio/ByteBuffer;I)V + ARG 1 index + METHOD method_1_4744 emitVertexIndices ([ILit/unimi/dsi/fastutil/ints/IntConsumer;)V + ARG 0 quadIndices + ARG 1 indexConsumer + METHOD method_1_4745 emitVertexIndices (Ljava/nio/ByteBuffer;Lnet/minecraft/class_8251;)V + ARG 1 buffer + ARG 2 vertexSorter METHOD method_60823 getStorer (JLcom/mojang/blaze3d/vertex/VertexFormat$class_5595;)Lit/unimi/dsi/fastutil/ints/IntConsumer; ARG 1 pointer ARG 3 indexType diff --git a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping deleted file mode 100644 index 90bbd91e70..0000000000 --- a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage - FIELD field_4150 chunks Lnet/minecraft/class_1_797; - METHOD (Lnet/minecraft/class_846;IIIIILnet/minecraft/class_8679;)V - ARG 1 chunkBuilder - METHOD method_3323 getRenderedChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_846$class_851; - ARG 1 blockPos - METHOD method_3327 clear ()V - METHOD method_52839 getViewDistance ()I - METHOD method_62963 getRenderedChunk (J)Lnet/minecraft/class_846$class_851; - ARG 1 sectionPos - METHOD method_62966 getSectionPos ()Lnet/minecraft/class_4076; diff --git a/mappings/net/minecraft/client/render/Camera.mapping b/mappings/net/minecraft/client/render/Camera.mapping index 5b7f0c5fd5..71b6682b18 100644 --- a/mappings/net/minecraft/client/render/Camera.mapping +++ b/mappings/net/minecraft/client/render/Camera.mapping @@ -64,6 +64,7 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera ARG 2 fov METHOD method_1_2109 getPanoramaHorizontalPlane ()Lorg/joml/Vector3fc; METHOD method_1_2110 updateFrustum (Lorg/joml/Matrix4fc;Lorg/joml/Matrix4f;Lnet/minecraft/class_243;)V + ARG 1 positionMatrix ARG 2 projectionMatrix ARG 3 pos METHOD method_1_2111 setFocusedEntity (Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index cc3b059e82..3ac30a24e4 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer + FIELD field_1_5778 chunkCullingEnabled Z + FIELD field_1_5780 cameraXd8 D + FIELD field_1_5781 cameraYd8 D + FIELD field_1_5782 cameraZd8 D + FIELD field_1_5783 fov I FIELD field_45617 LOGGER Lorg/slf4j/Logger; FIELD field_45618 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_45619 DEFAULT_SECTION_DISTANCE I @@ -9,6 +14,11 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre FIELD field_45624 state Ljava/util/concurrent/atomic/AtomicReference; FIELD field_45626 needsUpdate Ljava/util/concurrent/atomic/AtomicBoolean; FIELD field_55873 SECTION_DISTANCE I + METHOD method_1_4987 updateFromCameraRenderState (Lnet/minecraft/class_12075;I)V + ARG 1 cameraRenderState + ARG 2 fov + METHOD method_1_4989 (Lnet/minecraft/class_4604;)Lnet/minecraft/class_4604; + ARG 0 frustum METHOD method_52817 scheduleTerrainUpdate ()V METHOD method_52824 (Lnet/minecraft/class_8679$class_8681;Lnet/minecraft/class_8679$class_762;)V ARG 1 info @@ -34,8 +44,12 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 1 centerSectionPos ARG 3 otherSectionPos METHOD method_52833 updateTerrain (Lnet/minecraft/class_12075;)V + ARG 1 cameraRenderState METHOD method_52834 updateSectionOcclusionGraph (Lnet/minecraft/class_12075;ILit/unimi/dsi/fastutil/longs/LongOpenHashSet;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V + ARG 1 cameraRenderState + ARG 2 fov METHOD method_52835 updateNow (Lnet/minecraft/class_12075;)V + ARG 1 cameraRenderState METHOD method_52836 updateFrustum ()Z METHOD method_52837 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; ARG 1 chunk diff --git a/mappings/net/minecraft/client/render/Frustum.mapping b/mappings/net/minecraft/client/render/Frustum.mapping index 2ff0f617db..f6b2cd0b0e 100644 --- a/mappings/net/minecraft/client/render/Frustum.mapping +++ b/mappings/net/minecraft/client/render/Frustum.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum METHOD (Lnet/minecraft/class_4604;)V ARG 1 frustum METHOD (Lorg/joml/Matrix4fc;Lorg/joml/Matrix4f;)V + ARG 1 positionMatrix ARG 2 projectionMatrix METHOD method_1_2256 copyFrom (Lnet/minecraft/class_4604;)V ARG 1 frustum @@ -27,6 +28,7 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum METHOD method_23092 init (Lorg/joml/Matrix4fc;Lorg/joml/Matrix4f;)V COMMENT @implNote The upper-left 3x3 matrix of {@code positionMatrix * projectionMatrix} COMMENT should be orthogonal for {@link Frustum#recession} to be set to a meaningful value. + ARG 1 positionMatrix ARG 2 projectionMatrix METHOD method_23093 isVisible (Lnet/minecraft/class_238;)Z ARG 1 box diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 0f93dc5f69..b25c50826a 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_1_1813 hudProjection Lnet/minecraft/class_11279; FIELD field_1_2263 renderState Lnet/minecraft/class_1_405; FIELD field_1_3629 crosshair3d Lnet/minecraft/class_1_744; + FIELD field_1_5610 framebuffer Lnet/minecraft/class_276; FIELD field_3993 LOGGER Lorg/slf4j/Logger; FIELD field_3994 random Lnet/minecraft/class_5819; FIELD field_3997 lastSkyDarkness F @@ -52,6 +53,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 2 tick METHOD method_1_2680 tickCamera (Lnet/minecraft/class_9779;)V ARG 1 renderTickCounter + METHOD method_1_4829 getFramebuffer ()Lnet/minecraft/class_276; + METHOD method_1_4830 getBuffers ()Lnet/minecraft/class_4599; METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_3169 onResized (II)V diff --git a/mappings/net/minecraft/client/render/OptionsRenderState.mapping b/mappings/net/minecraft/client/render/OptionsRenderState.mapping index 2cd3a13660..00e03cf8eb 100644 --- a/mappings/net/minecraft/client/render/OptionsRenderState.mapping +++ b/mappings/net/minecraft/client/render/OptionsRenderState.mapping @@ -17,5 +17,8 @@ CLASS net/minecraft/class_1_421 net/minecraft/client/render/OptionsRenderState FIELD field_1_2347 distortionEffectScale F FIELD field_1_2348 textBackgroundOpacity F FIELD field_1_2349 textureFilteringMode Lnet/minecraft/class_12393; + FIELD field_1_5805 chunkFade D + FIELD field_1_5806 fov I + FIELD field_1_5807 chunkBuilderMode Lnet/minecraft/class_6597; METHOD method_1_2803 getBackgroundOpacity (F)F ARG 1 opacity diff --git a/mappings/net/minecraft/client/render/SkyRendering.mapping b/mappings/net/minecraft/client/render/SkyRenderer.mapping similarity index 99% rename from mappings/net/minecraft/client/render/SkyRendering.mapping rename to mappings/net/minecraft/client/render/SkyRenderer.mapping index c7b5008569..fa383fc39b 100644 --- a/mappings/net/minecraft/client/render/SkyRendering.mapping +++ b/mappings/net/minecraft/client/render/SkyRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9975 net/minecraft/client/render/SkyRendering +CLASS net/minecraft/class_9975 net/minecraft/client/render/SkyRenderer FIELD field_53143 END_SKY_TEXTURE Lnet/minecraft/class_2960; FIELD field_53145 starVertexBuffer Lcom/mojang/blaze3d/buffers/GpuBuffer; FIELD field_53146 topSkyVertexBuffer Lcom/mojang/blaze3d/buffers/GpuBuffer; diff --git a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping index 08cbe8b4f8..8c95bb0d15 100644 --- a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvider COMMENT Manages rendering with multiple {@linkplain RenderLayer render layers}. + METHOD method_1_4894 immediate (ILjava/util/SequencedSet;)Lnet/minecraft/class_4597$class_4598; + ARG 0 initialSize METHOD method_73477 getBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; COMMENT Starts building a buffer that will be drawn with {@code layer}. COMMENT @@ -18,3 +20,8 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvide COMMENT COMMENT @see VertexConsumerProvider#immediate(BufferAllocator) COMMENT @see VertexConsumerProvider#immediate(SequencedMap, BufferAllocator) + METHOD (ILjava/util/SequencedSet;)V + ARG 1 initialSize + METHOD method_1_4895 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_1_807$class_1_808; + ARG 1 renderLayer + METHOD method_1_4898 prepare ()V diff --git a/mappings/net/minecraft/client/render/WeatherRendering.mapping b/mappings/net/minecraft/client/render/WeatherRenderer.mapping similarity index 98% rename from mappings/net/minecraft/client/render/WeatherRendering.mapping rename to mappings/net/minecraft/client/render/WeatherRenderer.mapping index a78755db50..a75dffc949 100644 --- a/mappings/net/minecraft/client/render/WeatherRendering.mapping +++ b/mappings/net/minecraft/client/render/WeatherRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9976 net/minecraft/client/render/WeatherRendering +CLASS net/minecraft/class_9976 net/minecraft/client/render/WeatherRenderer FIELD field_53150 RAIN_TEXTURE Lnet/minecraft/class_2960; FIELD field_53151 SNOW_TEXTURE Lnet/minecraft/class_2960; FIELD field_53155 NORMAL_LINE_DX [F @@ -25,6 +25,7 @@ CLASS net/minecraft/class_9976 net/minecraft/client/render/WeatherRendering ARG 8 light ARG 9 tickProgress METHOD method_62315 buildPrecipitationPieces (Lnet/minecraft/class_638;FLnet/minecraft/class_243;Lnet/minecraft/class_12077;)V + ARG 1 world ARG 2 tickProgress ARG 3 cameraPos ARG 4 state diff --git a/mappings/net/minecraft/client/render/WorldBorderRendering.mapping b/mappings/net/minecraft/client/render/WorldBorderRenderer.mapping similarity index 98% rename from mappings/net/minecraft/client/render/WorldBorderRendering.mapping rename to mappings/net/minecraft/client/render/WorldBorderRenderer.mapping index f5b613d71c..ff4da9b72e 100644 --- a/mappings/net/minecraft/client/render/WorldBorderRendering.mapping +++ b/mappings/net/minecraft/client/render/WorldBorderRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9978 net/minecraft/client/render/WorldBorderRendering +CLASS net/minecraft/class_9978 net/minecraft/client/render/WorldBorderRenderer FIELD field_53157 FORCEFIELD Lnet/minecraft/class_2960; FIELD field_56586 forceRefreshBuffers Z FIELD field_56587 lastUploadedBoundWest D diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index ff3ed57c1d..9f03471443 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,5 +1,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_1_2266 optionsRenderState Lnet/minecraft/class_1_421; + FIELD field_1_5672 atlasManager Lnet/minecraft/class_11697; + FIELD field_1_5673 entityOutlineFramebuffer Lnet/minecraft/class_276; + FIELD field_1_5674 gameRenderer Lnet/minecraft/class_757; + FIELD field_1_5675 bakedModelManager Lnet/minecraft/class_1092; + FIELD field_1_5676 shaderLoader Lnet/minecraft/class_10151; + FIELD field_1_5677 textureManager Lnet/minecraft/class_1060; FIELD field_4109 entityRenderManager Lnet/minecraft/class_898; FIELD field_4112 chunks Lnet/minecraft/class_769; FIELD field_20951 bufferBuilders Lnet/minecraft/class_4599; @@ -7,10 +13,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_45614 chunkBuilder Lnet/minecraft/class_846; FIELD field_45615 chunkRenderingDataPreparer Lnet/minecraft/class_8679; FIELD field_45616 builtChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList; - FIELD field_53075 skyRendering Lnet/minecraft/class_9975; + FIELD field_53075 skyRenderer Lnet/minecraft/class_9975; FIELD field_53076 cloudRenderer Lnet/minecraft/class_9955; - FIELD field_53077 worldBorderRendering Lnet/minecraft/class_9978; - FIELD field_53078 weatherRendering Lnet/minecraft/class_9976; + FIELD field_53077 worldBorderRenderer Lnet/minecraft/class_9978; + FIELD field_53078 weatherRenderer Lnet/minecraft/class_9976; FIELD field_53081 framebufferSet Lnet/minecraft/class_9960; FIELD field_53900 TRANSPARENCY Lnet/minecraft/class_2960; FIELD field_53901 ENTITY_OUTLINE Lnet/minecraft/class_2960; @@ -24,14 +30,40 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_63574 gizmoCollector Lnet/minecraft/class_12185; FIELD field_64218 terrainSampler Lnet/minecraft/class_12137; FIELD field_64566 gizmos Lnet/minecraft/class_761$class_12351; + METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_1092;Lnet/minecraft/class_1060;Lnet/minecraft/class_11697;Lnet/minecraft/class_10151;Lnet/minecraft/class_757;II)V + ARG 1 entityRenderManager + ARG 2 blockEntityRenderManager + ARG 3 bakedModelManager + ARG 4 textureManager + ARG 5 atlasManager + ARG 6 shaderLoader + ARG 7 gameRenderer + ARG 8 width + ARG 9 height METHOD method_1_2233 createSectionRenderState (Lorg/joml/Matrix4fc;)Lnet/minecraft/class_11532; ARG 1 rotationMatrix METHOD method_1_2234 prepareForRender (Lnet/minecraft/class_12075;)V + METHOD method_1_4858 addGizmos (Ljava/util/List;)V + ARG 1 gizmos + METHOD method_1_4859 getBlockEntityRenderManager ()Lnet/minecraft/class_824; + METHOD method_1_4860 getEntityRenderManager ()Lnet/minecraft/class_898; + METHOD method_1_4861 rebuildChunks (Lnet/minecraft/class_638;Lnet/minecraft/class_315;Lnet/minecraft/class_4184;Lnet/minecraft/class_324;)V + ARG 1 world + ARG 2 options + ARG 3 camera + ARG 4 blockColors + METHOD method_1_4862 getNearbyChunks ()Lit/unimi/dsi/fastutil/objects/ObjectArrayList; + METHOD method_1_4863 clear ()V + METHOD method_1_4864 getSkyRenderer ()Lnet/minecraft/class_9975; + METHOD method_1_4865 getChunks ()Lnet/minecraft/class_769; + METHOD method_1_4866 getWeatherRenderer ()Lnet/minecraft/class_9976; + METHOD method_1_4867 getWorldBorderRenderer ()Lnet/minecraft/class_9978; METHOD method_3242 onResized (II)V ARG 1 width ARG 2 height METHOD method_3254 drawEntityOutlinesFramebuffer ()V METHOD method_3269 updateChunks (Lnet/minecraft/class_12075;)V + ARG 1 cameraRenderState METHOD method_3281 isTerrainRenderComplete ()Z METHOD method_22710 render (Lnet/minecraft/class_9922;Lnet/minecraft/class_9779;ZLnet/minecraft/class_12075;Lorg/joml/Matrix4fc;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;Z)V ARG 1 allocator @@ -60,6 +92,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_29364 getCloudsFramebuffer ()Lnet/minecraft/class_276; METHOD method_34810 getChunkBuilder ()Lnet/minecraft/class_846; METHOD method_40050 isRenderingReady (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_62196 getCloudRenderer ()Lnet/minecraft/class_9955; METHOD method_62198 translucencySort (Lnet/minecraft/class_243;)V ARG 1 cameraPos @@ -71,6 +104,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_62200 renderSky (Lnet/minecraft/class_9909;Lnet/minecraft/class_12075;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;)V ARG 1 frameGraphBuilder ARG 2 cameraRenderState + ARG 3 fogBuffer METHOD method_62202 renderMain (Lnet/minecraft/class_9909;Lorg/joml/Matrix4fc;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;ZLnet/minecraft/class_11658;Lnet/minecraft/class_3695;Lnet/minecraft/class_11532;)V ARG 1 frameGraphBuilder ARG 2 rotationMatrix @@ -106,7 +140,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_62220 getBuiltChunks ()Lit/unimi/dsi/fastutil/objects/ObjectArrayList; METHOD method_62221 getChunkRenderingDataPreparer ()Lnet/minecraft/class_8679; METHOD method_62907 getTransparencyPostEffectProcessor ()Lnet/minecraft/class_279; - METHOD method_64059 clear ()V + METHOD method_64059 clearBuiltAndNearbyChunks ()V METHOD method_64060 scheduleChunkTranslucencySort (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_10196;Lnet/minecraft/class_243;ZZ)V ARG 1 chunk ARG 2 relativePos diff --git a/mappings/net/minecraft/client/render/chunk/BuiltChunkStorage.mapping b/mappings/net/minecraft/client/render/chunk/BuiltChunkStorage.mapping new file mode 100644 index 0000000000..2eba2e8c91 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/BuiltChunkStorage.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_769 net/minecraft/client/render/chunk/BuiltChunkStorage + FIELD field_1_5276 topYInclusive I + FIELD field_1_5277 bottomY I + FIELD field_1_5278 dataPreparer Lnet/minecraft/class_8679; + FIELD field_4150 chunks Lnet/minecraft/class_1_797; + METHOD (Lnet/minecraft/class_846;IIIIILnet/minecraft/class_8679;)V + ARG 1 chunkBuilder + ARG 2 bottomY + ARG 3 topYInclusive + ARG 4 minSectionY + ARG 5 maxSectionY + ARG 6 viewDistance + ARG 7 dataPreparer + METHOD method_1_4764 (Lnet/minecraft/class_846;IJ)Lnet/minecraft/class_846$class_851; + ARG 1 index + ARG 2 sectionPos + METHOD method_1_4765 getMaxSectionY ()I + METHOD method_1_4766 getTopYInclusive ()I + METHOD method_1_4767 getMinSectionY ()I + METHOD method_1_4768 getBottomY ()I + METHOD method_1_4769 setOrigin (Lnet/minecraft/class_4076;)Z + ARG 1 sectionPos + METHOD method_1_4770 getHeightInSections ()I + METHOD method_1_4771 getSectionCount ()I + METHOD method_3323 getRenderedChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_846$class_851; + ARG 1 blockPos + METHOD method_3327 clear ()V + METHOD method_52839 getViewDistance ()I + METHOD method_62963 getRenderedChunk (J)Lnet/minecraft/class_846$class_851; + ARG 1 sectionPos + METHOD method_62966 getSectionPos ()Lnet/minecraft/class_4076; diff --git a/mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping b/mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping new file mode 100644 index 0000000000..27d205b352 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping @@ -0,0 +1,51 @@ +CLASS net/minecraft/class_1_797 net/minecraft/client/render/chunk/VisibleChunkStorage + FIELD field_1_5661 origin Lnet/minecraft/class_4076; + FIELD field_1_5662 maxSectionY I + FIELD field_1_5663 minSectionY I + FIELD field_1_5664 storage [Lnet/minecraft/class_1_797$class_1_798; + FIELD field_1_5665 viewDistance I + FIELD field_1_5666 horizontalSectionSideLength I + FIELD field_1_5667 heightInSections I + METHOD (IIILnet/minecraft/class_1_797$class_1_800;)V + ARG 1 viewDistance + ARG 2 minSectionY + ARG 3 maxSectionY + ARG 4 dataFactory + METHOD forEach (Ljava/util/function/Consumer;)V + ARG 1 callback + METHOD method_1_4843 getSectionPos ()Lnet/minecraft/class_4076; + METHOD method_1_4844 isInRange (III)Z + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + METHOD method_1_4845 getStorageIndex (III)I + ARG 1 i + ARG 2 j + ARG 3 k + METHOD method_1_4846 getRenderedChunk (III)Lnet/minecraft/class_1_797$class_1_799; + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ + METHOD method_1_4847 getRenderedChunk (J)Lnet/minecraft/class_1_797$class_1_799; + ARG 1 sectionPos + METHOD method_1_4848 getRenderedChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1_797$class_1_799; + ARG 1 pos + METHOD method_1_4849 getHeightInSections ()I + METHOD method_1_4850 getMaxSectionY ()I + METHOD method_1_4851 getMinSectionY ()I + METHOD method_1_4852 getViewDistance ()I + METHOD method_1_4853 setOrigin (Lnet/minecraft/class_4076;)Z + COMMENT {@return whether a terrain update should be scheduled} + ARG 1 pos + METHOD method_1_4854 getSectionCount ()I + CLASS 1 + FIELD field_1_5668 index I + CLASS class_1_798 SectionEntry + CLASS class_1_799 Positioned + METHOD method_62973 setSectionPos (J)V + ARG 1 sectionPos + METHOD method_62975 getSectionPos ()J + CLASS class_1_800 DataFactory + METHOD method_1_4856 create (IJ)Lnet/minecraft/class_1_797$class_1_799; + ARG 1 index + ARG 2 sectionPos diff --git a/mappings/net/minecraft/client/render/state/CameraRenderState.mapping b/mappings/net/minecraft/client/render/state/CameraRenderState.mapping index 9e350791dc..d2303cf04f 100644 --- a/mappings/net/minecraft/client/render/state/CameraRenderState.mapping +++ b/mappings/net/minecraft/client/render/state/CameraRenderState.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_12075 net/minecraft/client/render/state/CameraRenderSt FIELD field_1_1903 rotationMatrix Lorg/joml/Matrix4f; FIELD field_1_1904 pitch F FIELD field_1_1905 yaw F + FIELD field_1_5923 hasCapturedFrustum Z + FIELD field_1_5924 chunkCullingEnabled Z FIELD field_63077 blockPos Lnet/minecraft/class_2338; FIELD field_63078 pos Lnet/minecraft/class_243; FIELD field_63079 initialized Z diff --git a/mappings/net/minecraft/client/render/state/WorldRenderState.mapping b/mappings/net/minecraft/client/render/state/WorldRenderState.mapping index 65f9eeb813..64b3602e19 100644 --- a/mappings/net/minecraft/client/render/state/WorldRenderState.mapping +++ b/mappings/net/minecraft/client/render/state/WorldRenderState.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_11658 net/minecraft/client/render/state/WorldRenderSta FIELD field_1_1887 cloudHeight F FIELD field_1_2384 particles Lnet/minecraft/class_11943; FIELD field_1_3809 show3dCrosshair Z + FIELD field_1_5913 sectionReadyCallback Ljava/lang/Runnable; + FIELD field_1_5916 recreateTerrainSampler Z + FIELD field_1_5917 scheduledReload Z + FIELD field_1_5918 drawEntityOutlines Z FIELD field_61735 entityRenderStates Ljava/util/List; FIELD field_61736 hasOutline Z FIELD field_62646 blockEntityRenderStates Ljava/util/List; diff --git a/mappings/net/minecraft/client/world/ClientChunkLoadProgress.mapping b/mappings/net/minecraft/client/world/ClientChunkLoadProgress.mapping index 13e258a0c7..6e074d5694 100644 --- a/mappings/net/minecraft/client/world/ClientChunkLoadProgress.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkLoadProgress.mapping @@ -6,6 +6,12 @@ CLASS net/minecraft/class_11653 net/minecraft/client/world/ClientChunkLoadProgre FIELD field_61728 chunkLoadMap Lnet/minecraft/class_11544; FIELD field_61729 stage Lnet/minecraft/class_11545$class_11546; FIELD field_61730 state Lnet/minecraft/class_11653$class_11655; + FIELD field_61937 maxWait J + COMMENT After this number of milliseconds, a chunk will be forced to be considered + COMMENT ready regardless of its state. + METHOD (J)V + ARG 1 maxWait + METHOD method_1_4980 getSectionReadyCallback ()Ljava/lang/Runnable; METHOD method_72899 tick ()V METHOD method_72900 setChunkLoadMap (Lnet/minecraft/class_11544;)V ARG 1 map diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index ac991d4b70..25efaea185 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager ARG 2 z ARG 3 buf ARG 4 heightmaps + ARG 5 blockEntityVisitorConsumer METHOD method_20180 updateLoadDistance (I)V ARG 1 loadDistance METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index f58c1f8570..38210a3518 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld + FIELD field_1_5681 blockBreakingInfoByEntity Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_1_5682 blockBreakingInfoByPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_3727 networkHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_17675 mapStates Ljava/util/Map; @@ -37,6 +39,12 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 9 seed ARG 11 seaLevel METHOD method_1_2685 runLightUpdates ()V + METHOD method_1_4871 getBlockBreakingInfoByPos ()Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + METHOD method_1_4872 getPrecipitationAt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1963; + ARG 1 pos + METHOD method_1_4874 decayBlockBreakingInfo ()V + METHOD method_1_4875 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V + ARG 1 info METHOD method_2932 addParticle (DDDDDLnet/minecraft/class_2394;)V ARG 1 minX ARG 3 maxX @@ -76,10 +84,10 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_18110 unloadBlockEntities (Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD method_18112 getEntities ()Ljava/lang/Iterable; - METHOD method_18113 scheduleBlockRenders (III)V - ARG 1 x - ARG 2 y - ARG 3 z + METHOD method_18113 scheduleChunkRenders (III)V + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ METHOD method_18116 tickEntities ()V METHOD method_18120 getRegularEntityCount ()I METHOD method_18646 tickEntity (Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/data/BlockItemTagProvider.mapping b/mappings/net/minecraft/data/BlockItemTagProvider.mapping new file mode 100644 index 0000000000..69bf0045e4 --- /dev/null +++ b/mappings/net/minecraft/data/BlockItemTagProvider.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_1_802 net/minecraft/data/BlockItemTagProvider + FIELD field_1_5686 builderFactory Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;)V + ARG 1 builderFactory + METHOD method_1_4886 builder (Lnet/minecraft/class_1_782;)Lnet/minecraft/class_1_802$class_1_803; + ARG 1 key + METHOD method_1_4887 blockBuilder (Lnet/minecraft/class_11389;)Lnet/minecraft/class_1_802$class_1_803; + ARG 0 blockBuilder + METHOD method_1_4888 itemBuilder (Lnet/minecraft/class_11389;)Lnet/minecraft/class_1_802$class_1_803; + ARG 0 itemBuilder + METHOD method_71549 configure ()V + CLASS class_1_803 Builder + METHOD method_1_4889 add ([Lnet/minecraft/class_1_784;)Lnet/minecraft/class_1_802$class_1_803; + ARG 1 keys + METHOD method_1_4890 add (Ljava/util/Collection;)Lnet/minecraft/class_1_802$class_1_803; + ARG 1 keys + METHOD method_1_4891 add (Ljava/util/stream/Stream;)Lnet/minecraft/class_1_802$class_1_803; + ARG 1 keys + METHOD method_1_4892 addTag (Lnet/minecraft/class_1_782;)Lnet/minecraft/class_1_802$class_1_803; + ARG 1 tagKey diff --git a/mappings/net/minecraft/data/tag/BlockItemProvidedTagBuilder.mapping b/mappings/net/minecraft/data/tag/BlockItemProvidedTagBuilder.mapping new file mode 100644 index 0000000000..36a30822e9 --- /dev/null +++ b/mappings/net/minecraft/data/tag/BlockItemProvidedTagBuilder.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_1_801 net/minecraft/data/tag/BlockItemProvidedTagBuilder + FIELD field_1_5685 delegate Lnet/minecraft/class_11389; + METHOD (Lnet/minecraft/class_11389;)V + ARG 1 delegate + METHOD method_1_4878 add ([Lnet/minecraft/class_1_784;)Lnet/minecraft/class_1_801; + ARG 1 elems + METHOD method_1_4880 addColors (Lnet/minecraft/class_1_727;)Lnet/minecraft/class_1_801; + ARG 1 elems + METHOD method_1_4881 addColors (Lnet/minecraft/class_1_758;)Lnet/minecraft/class_1_801; + ARG 1 elems + METHOD method_1_4885 getElemKey (Lnet/minecraft/class_1_784;)Lnet/minecraft/class_5321; + ARG 1 key diff --git a/mappings/net/minecraft/data/tag/ProvidedTagBuilder.mapping b/mappings/net/minecraft/data/tag/ProvidedTagBuilder.mapping index 6ab5468601..54c567141d 100644 --- a/mappings/net/minecraft/data/tag/ProvidedTagBuilder.mapping +++ b/mappings/net/minecraft/data/tag/ProvidedTagBuilder.mapping @@ -4,11 +4,14 @@ CLASS net/minecraft/class_11389 net/minecraft/data/tag/ProvidedTagBuilder METHOD method_71553 addTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_11389; ARG 1 tag METHOD method_71554 add (Lnet/minecraft/class_5321;)Lnet/minecraft/class_11389; + ARG 1 elem METHOD method_71555 add (Ljava/util/Collection;)Lnet/minecraft/class_11389; ARG 1 values METHOD method_71557 add (Ljava/util/stream/Stream;)Lnet/minecraft/class_11389; ARG 1 values METHOD method_71558 add ([Lnet/minecraft/class_5321;)Lnet/minecraft/class_11389; + ARG 1 elems METHOD method_71559 addOptionalTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_11389; ARG 1 tag METHOD method_71560 addOptional (Lnet/minecraft/class_5321;)Lnet/minecraft/class_11389; + ARG 1 elem diff --git a/mappings/net/minecraft/data/tag/TagProvider.mapping b/mappings/net/minecraft/data/tag/TagProvider.mapping index 5f161a9227..e28907ffb5 100644 --- a/mappings/net/minecraft/data/tag/TagProvider.mapping +++ b/mappings/net/minecraft/data/tag/TagProvider.mapping @@ -14,8 +14,15 @@ CLASS net/minecraft/class_2474 net/minecraft/data/tag/TagProvider ARG 2 registryRef ARG 3 registriesFuture ARG 4 parentTagLookupFuture + METHOD method_1_4755 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_11389; + ARG 1 key + METHOD method_1_4756 builder (Lnet/minecraft/class_6862;Z)Lnet/minecraft/class_11389; + ARG 1 key + ARG 2 replace METHOD method_10514 configure (Lnet/minecraft/class_7225$class_7874;)V ARG 1 registries + METHOD method_27046 (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_7403;Lnet/minecraft/class_2474$class_8210;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; + ARG 5 entry METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495; ARG 1 tag METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; diff --git a/mappings/net/minecraft/predicate/entity/ComponentsSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/ComponentsSubPredicate.mapping new file mode 100644 index 0000000000..4182504c9d --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/ComponentsSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_836 net/minecraft/predicate/entity/ComponentsSubPredicate + FIELD field_1_5946 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/CompositeSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/CompositeSubPredicate.mapping new file mode 100644 index 0000000000..e85007c441 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/CompositeSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_835 net/minecraft/predicate/entity/CompositeSubPredicate + FIELD field_1_5945 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistanceCheck.mapping similarity index 98% rename from mappings/net/minecraft/predicate/entity/DistancePredicate.mapping rename to mappings/net/minecraft/predicate/entity/DistanceCheck.mapping index 34d31bec71..7fd28b3feb 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistanceCheck.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate +CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistanceCheck FIELD field_45728 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;)V ARG 1 x diff --git a/mappings/net/minecraft/predicate/entity/DistanceSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/DistanceSubPredicate.mapping new file mode 100644 index 0000000000..308fd5cf7d --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/DistanceSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_832 net/minecraft/predicate/entity/DistanceSubPredicate + FIELD field_1_5942 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/EffectsSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/EffectsSubPredicate.mapping new file mode 100644 index 0000000000..5692935e4d --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/EffectsSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_829 net/minecraft/predicate/entity/EffectsSubPredicate + FIELD field_1_5939 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentSubPredicate.mapping similarity index 98% rename from mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping rename to mappings/net/minecraft/predicate/entity/EntityEquipmentSubPredicate.mapping index d6c51eff8c..cd9a7e5faa 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPredicate +CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentSubPredicate FIELD field_45744 CODEC Lcom/mojang/serialization/Codec; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z ARG 1 entity diff --git a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityFlagsSubPredicate.mapping similarity index 98% rename from mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping rename to mappings/net/minecraft/predicate/entity/EntityFlagsSubPredicate.mapping index e0882b5fe1..bd4648689d 100644 --- a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityFlagsSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredicate +CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsSubPredicate FIELD comp_1757 isSneaking Ljava/util/Optional; FIELD field_45745 CODEC Lcom/mojang/serialization/Codec; METHOD comp_1757 isSneaking ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 7ccb5f5ded..c6a7d7939d 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -1,5 +1,24 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate + FIELD field_1_5925 SUBPREDICATES_CODEC Lcom/mojang/serialization/Codec; + FIELD field_1_5926 ENTRY_COMPARATOR Ljava/util/Comparator; + FIELD field_1_5927 merged Lnet/minecraft/class_7376; + FIELD field_1_5928 parts Ljava/util/Map; + FIELD field_45746 CODEC Lcom/mojang/serialization/Codec; FIELD field_47250 LOOT_CONTEXT_PREDICATE_CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/Map;)V + ARG 1 parts + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other + METHOD method_1_5087 allOf (Ljava/util/Map;)Lnet/minecraft/class_7376; + ARG 0 parts + METHOD method_1_5089 ([Lnet/minecraft/class_7376;Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z + ARG 1 entity + ARG 2 world + ARG 3 os + METHOD method_1_5090 (Lnet/minecraft/class_2048;)Ljava/util/Map; + ARG 0 predicate + METHOD method_1_5091 (Lcom/mojang/serialization/Codec;)Ljava/lang/Integer; + ARG 0 codec METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 world ARG 2 pos @@ -14,11 +33,33 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 0 predicate METHOD method_53134 contextPredicateFromEntityPredicate (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_5258; ARG 0 builder + METHOD method_53135 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 codec METHOD method_53137 contextPredicateFromEntityPredicate (Ljava/util/Optional;)Ljava/util/Optional; ARG 0 entityPredicate METHOD method_53139 contextPredicateFromEntityPredicates ([Lnet/minecraft/class_2048$class_2049;)Ljava/util/List; ARG 0 builders CLASS class_2049 Builder + FIELD field_1_5929 parts Lcom/google/common/collect/ImmutableMap$Builder; + METHOD method_1_5092 partialComponents (Ljava/util/Map;)Lnet/minecraft/class_2048$class_2049; + ARG 1 components + METHOD method_1_5093 exactComponents (Lnet/minecraft/class_9329;)Lnet/minecraft/class_2048$class_2049; + ARG 1 components + METHOD method_1_5094 slime (Lnet/minecraft/class_7383;)Lnet/minecraft/class_2048$class_2049; + ARG 1 slime + METHOD method_1_5095 fishingHook (Lnet/minecraft/class_4965;)Lnet/minecraft/class_2048$class_2049; + ARG 1 fishingHook + METHOD method_1_5096 lightningBolt (Lnet/minecraft/class_6404;)Lnet/minecraft/class_2048$class_2049; + ARG 1 lightningBolt + METHOD method_1_5097 player (Lnet/minecraft/class_4553;)Lnet/minecraft/class_2048$class_2049; + ARG 1 player + METHOD method_1_5098 subpredicate (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7376;)Lnet/minecraft/class_2048$class_2049; + ARG 1 codec + ARG 2 subpredicate + METHOD method_1_5099 raider (Lnet/minecraft/class_9471;)Lnet/minecraft/class_2048$class_2049; + ARG 1 raider + METHOD method_1_5100 sheep (Lnet/minecraft/class_10168;)Lnet/minecraft/class_2048$class_2049; + ARG 1 sheep METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049; ARG 1 nbt METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049; @@ -62,3 +103,4 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate METHOD method_60611 movementAffectedBy (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2048$class_2049; ARG 1 movementAffectedBy METHOD method_66675 components (Lnet/minecraft/class_10914;)Lnet/minecraft/class_2048$class_2049; + ARG 1 components diff --git a/mappings/net/minecraft/predicate/entity/EntitySubPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicate.mapping index 0960a509ec..d0515addda 100644 --- a/mappings/net/minecraft/predicate/entity/EntitySubPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicate.mapping @@ -1,4 +1,15 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/EntitySubPredicate + FIELD field_1_5934 ALWAYS_TRUE Lnet/minecraft/class_7376; + METHOD method_1_5104 and (Lnet/minecraft/class_7376;)Lnet/minecraft/class_7376; + ARG 1 other + METHOD method_1_5105 (Lnet/minecraft/class_7376;Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z + ARG 2 entity + ARG 3 world + ARG 4 pos + METHOD method_1_5106 (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z + ARG 0 entity + ARG 1 world + ARG 2 pos METHOD method_22497 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 1 entity ARG 2 world diff --git a/mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping new file mode 100644 index 0000000000..6d1d378015 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/EntityTagsSubPredicate.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1_824 net/minecraft/predicate/entity/EntityTagsSubPredicate diff --git a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypeSubPredicate.mapping similarity index 95% rename from mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping rename to mappings/net/minecraft/predicate/entity/EntityTypeSubPredicate.mapping index 3d6ab9fe99..224c53b07c 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypeSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicate +CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypeSubPredicate FIELD field_45749 CODEC Lcom/mojang/serialization/Codec; METHOD method_8925 matches (Lnet/minecraft/class_6880;)Z METHOD method_8926 create (Lnet/minecraft/class_7871;Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; diff --git a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping b/mappings/net/minecraft/predicate/entity/FishingHookSubPredicate.mapping similarity index 94% rename from mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping rename to mappings/net/minecraft/predicate/entity/FishingHookSubPredicate.mapping index 2c320c4772..703f004a94 100644 --- a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/FishingHookSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookPredicate +CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookSubPredicate FIELD field_23137 ALL Lnet/minecraft/class_4965; FIELD field_45750 CODEC Lcom/mojang/serialization/Codec; METHOD method_26095 of (Z)Lnet/minecraft/class_4965; diff --git a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping b/mappings/net/minecraft/predicate/entity/LightningBoltSubPredicate.mapping similarity index 96% rename from mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping rename to mappings/net/minecraft/predicate/entity/LightningBoltSubPredicate.mapping index 9b8e739601..734f665a2e 100644 --- a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LightningBoltSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredicate +CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltSubPredicate FIELD field_45759 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 1 blocksSetOnFire diff --git a/mappings/net/minecraft/predicate/entity/LocationSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationSubPredicate.mapping new file mode 100644 index 0000000000..92360b9465 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/LocationSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_830 net/minecraft/predicate/entity/LocationSubPredicate + FIELD field_1_5940 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/MovementAffectedBySubPredicate.mapping b/mappings/net/minecraft/predicate/entity/MovementAffectedBySubPredicate.mapping new file mode 100644 index 0000000000..f2af852c3b --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/MovementAffectedBySubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_833 net/minecraft/predicate/entity/MovementAffectedBySubPredicate + FIELD field_1_5943 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/MovementPredicate.mapping b/mappings/net/minecraft/predicate/entity/MovementSubPredicate.mapping similarity index 97% rename from mappings/net/minecraft/predicate/entity/MovementPredicate.mapping rename to mappings/net/minecraft/predicate/entity/MovementSubPredicate.mapping index e62dde165e..f16d74392f 100644 --- a/mappings/net/minecraft/predicate/entity/MovementPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/MovementSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9750 net/minecraft/predicate/entity/MovementPredicate +CLASS net/minecraft/class_9750 net/minecraft/predicate/entity/MovementSubPredicate FIELD field_51786 CODEC Lcom/mojang/serialization/Codec; METHOD method_60277 test (DDDD)Z ARG 1 x diff --git a/mappings/net/minecraft/predicate/entity/NBtSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/NBtSubPredicate.mapping new file mode 100644 index 0000000000..d0c0d8737d --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/NBtSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_823 net/minecraft/predicate/entity/NBtSubPredicate + FIELD field_1_5933 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/PassengerSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/PassengerSubPredicate.mapping new file mode 100644 index 0000000000..4439243613 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/PassengerSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_825 net/minecraft/predicate/entity/PassengerSubPredicate + FIELD field_1_5936 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/PeriodicTickSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/PeriodicTickSubPredicate.mapping new file mode 100644 index 0000000000..f77e02e519 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/PeriodicTickSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_834 net/minecraft/predicate/entity/PeriodicTickSubPredicate + FIELD field_1_5944 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/entity/PlayerSubPredicate.mapping similarity index 99% rename from mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping rename to mappings/net/minecraft/predicate/entity/PlayerSubPredicate.mapping index f864f0f927..fef6f77997 100644 --- a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/PlayerSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate +CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerSubPredicate FIELD comp_1817 experienceLevel Lnet/minecraft/class_2096$class_2100; FIELD comp_1818 gameMode Lnet/minecraft/class_9789; FIELD field_33928 LOOKING_AT_DISTANCE I diff --git a/mappings/net/minecraft/predicate/entity/RaiderPredicate.mapping b/mappings/net/minecraft/predicate/entity/RaiderSubPredicate.mapping similarity index 95% rename from mappings/net/minecraft/predicate/entity/RaiderPredicate.mapping rename to mappings/net/minecraft/predicate/entity/RaiderSubPredicate.mapping index 68bc4cb6f6..a42a1a5330 100644 --- a/mappings/net/minecraft/predicate/entity/RaiderPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/RaiderSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9471 net/minecraft/predicate/entity/RaiderPredicate +CLASS net/minecraft/class_9471 net/minecraft/predicate/entity/RaiderSubPredicate FIELD field_50162 CODEC Lcom/mojang/serialization/Codec; FIELD field_50163 CAPTAIN_WITHOUT_RAID Lnet/minecraft/class_9471; METHOD method_58678 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/predicate/entity/SheepPredicate.mapping b/mappings/net/minecraft/predicate/entity/SheepSubPredicate.mapping similarity index 94% rename from mappings/net/minecraft/predicate/entity/SheepPredicate.mapping rename to mappings/net/minecraft/predicate/entity/SheepSubPredicate.mapping index 0749cb9eef..c6eda934bc 100644 --- a/mappings/net/minecraft/predicate/entity/SheepPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/SheepSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_10168 net/minecraft/predicate/entity/SheepPredicate +CLASS net/minecraft/class_10168 net/minecraft/predicate/entity/SheepSubPredicate FIELD field_54004 CODEC Lcom/mojang/serialization/Codec; METHOD method_63497 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping b/mappings/net/minecraft/predicate/entity/SlimeSubPredicate.mapping similarity index 96% rename from mappings/net/minecraft/predicate/entity/SlimePredicate.mapping rename to mappings/net/minecraft/predicate/entity/SlimeSubPredicate.mapping index f4235bbed5..a477f98f84 100644 --- a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/SlimeSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7383 net/minecraft/predicate/entity/SlimePredicate +CLASS net/minecraft/class_7383 net/minecraft/predicate/entity/SlimeSubPredicate FIELD field_45776 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2096$class_2100;)V ARG 1 size diff --git a/mappings/net/minecraft/predicate/entity/SlotsSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/SlotsSubPredicate.mapping new file mode 100644 index 0000000000..f6f38b5a0d --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/SlotsSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_827 net/minecraft/predicate/entity/SlotsSubPredicate + FIELD field_1_5938 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/SteppingOnSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/SteppingOnSubPredicate.mapping new file mode 100644 index 0000000000..b2802ae811 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/SteppingOnSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_826 net/minecraft/predicate/entity/SteppingOnSubPredicate + FIELD field_1_5937 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/TargetedEntitySubPredicate.mapping b/mappings/net/minecraft/predicate/entity/TargetedEntitySubPredicate.mapping new file mode 100644 index 0000000000..b848e0df95 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/TargetedEntitySubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_831 net/minecraft/predicate/entity/TargetedEntitySubPredicate + FIELD field_1_5941 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/TeamSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/TeamSubPredicate.mapping new file mode 100644 index 0000000000..e5f273676b --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/TeamSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_820 net/minecraft/predicate/entity/TeamSubPredicate + FIELD field_1_5910 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/predicate/entity/VehicleSubPredicate.mapping b/mappings/net/minecraft/predicate/entity/VehicleSubPredicate.mapping new file mode 100644 index 0000000000..fd802599d8 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/VehicleSubPredicate.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1_822 net/minecraft/predicate/entity/VehicleSubPredicate + FIELD field_1_5931 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/resource/SynchronousResourceReloader.mapping b/mappings/net/minecraft/resource/SynchronousResourceReloader.mapping index 49e5e0394b..08a72b8eb8 100644 --- a/mappings/net/minecraft/resource/SynchronousResourceReloader.mapping +++ b/mappings/net/minecraft/resource/SynchronousResourceReloader.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_4013 net/minecraft/resource/SynchronousResourceReloade COMMENT manager, consider writing resource reloaders that have a proper prepare COMMENT stage instead by moving resource manager access to the prepare stage. COMMENT That can speed up resource reloaders significantly. - METHOD method_14491 reload (Lnet/minecraft/class_3300;)V - COMMENT Performs the reload in the apply executor, or the game engine. + METHOD method_14491 scheduleReload (Lnet/minecraft/class_3300;)V ARG 1 manager COMMENT the resource manager diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping index 7b63f1af01..e7df13fe44 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3178 net/minecraft/server/dedicated/DedicatedServerWatchdog + FIELD field_1_3855 THREAD_INFO_COMPARATOR Ljava/util/Comparator; FIELD field_13823 server Lnet/minecraft/class_3176; FIELD field_13825 LOGGER Lorg/slf4j/Logger; FIELD field_46927 maxTickTime J diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index d74bb98960..01127f5cc4 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -31,6 +31,10 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 valuesToAppend METHOD method_1_3882 join ([Ljava/util/List;)Ljava/util/List; ARG 0 lists + METHOD method_1_4709 getThreadInfos ()[Ljava/lang/management/ThreadInfo; + METHOD method_1_4710 join (Ljava/util/List;Ljava/util/List;)Ljava/util/List; + ARG 0 first + ARG 1 second METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item preceding {@code object} in {@code iterable}} COMMENT @@ -519,14 +523,14 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_72236 isOnAarch64 ()Z METHOD method_75862 getDefaultLocaleFormatter (Ljava/time/format/FormatStyle;)Ljava/time/format/DateTimeFormatter; ARG 0 style - CLASS 2 2 - CLASS 3 3 - CLASS 4 4 - CLASS 10 10 + CLASS 2 + CLASS 3 + CLASS 4 + CLASS 10 FIELD field_29655 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t - CLASS 11 11 + CLASS 11 FIELD field_29657 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t diff --git a/mappings/net/minecraft/world/LightUtil.mapping b/mappings/net/minecraft/world/LightUtil.mapping index a705280e47..aa4a0accf4 100644 --- a/mappings/net/minecraft/world/LightUtil.mapping +++ b/mappings/net/minecraft/world/LightUtil.mapping @@ -57,6 +57,14 @@ CLASS net/minecraft/class_1_5 net/minecraft/world/LightUtil METHOD method_1_397 withBlock (II)I ARG 0 packed ARG 1 block + METHOD method_1_4746 getBlockBrightness (Lnet/minecraft/class_1_5$class_10948;Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I + ARG 0 brightnessGetter + ARG 1 world + ARG 2 state + ARG 3 pos + METHOD method_1_4747 getBlockBrightness (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I + ARG 0 world + ARG 1 pos CLASS class_10948 BrightnessGetter FIELD field_58200 DEFAULT Lnet/minecraft/class_1_5$class_10948; METHOD method_1_114 packedBrightness (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index b0c90e8f19..dd63aff822 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -80,10 +80,14 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 0 biome METHOD method_75731 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_75732 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_12199; + ARG 0 biome METHOD method_75733 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_4763; ARG 0 biome METHOD method_75734 getEnvironmentAttributes ()Lnet/minecraft/class_12199; - CLASS 1 1 + METHOD method_75735 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_12199; + ARG 0 biome + CLASS 1 METHOD rehash (I)V ARG 1 n CLASS class_1960 Builder diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index e6ee707c2a..860f53abbd 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider FIELD field_15813 skyLightProvider Lnet/minecraft/class_3558; FIELD field_15814 blockLightProvider Lnet/minecraft/class_3558; FIELD field_27339 world Lnet/minecraft/class_5539; + FIELD field_31714 SECTION_VERTICAL_MARGIN I + COMMENT The number of extra chunk sections to keep track of above and below the + COMMENT world. FIELD field_52658 DEFAULT Lnet/minecraft/class_3568; METHOD (Lnet/minecraft/class_2823;ZZ)V ARG 1 chunkProvider @@ -22,9 +25,9 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider METHOD method_22876 displaySectionLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Ljava/lang/String; ARG 1 lightType ARG 2 pos - METHOD method_31928 getHeight ()I - METHOD method_31929 getBottomY ()I - METHOD method_31930 getTopY ()I + METHOD method_31928 getHeightInSections ()I + METHOD method_31929 getMinSectionY ()I + METHOD method_31930 getMaxSectionY ()I METHOD method_51560 getStatus (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Lnet/minecraft/class_3560$class_8530; ARG 1 lightType ARG 2 pos From 161973a2ccc3980da2ed82d0587d328103fb78f1 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 09:00:28 -0400 Subject: [PATCH 07/14] class_1_807.{vertex, index} => {vertexPool, indexPool} --- mappings/net/minecraft/class_1_807.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/class_1_807.mapping b/mappings/net/minecraft/class_1_807.mapping index f297056086..2ac53a126d 100644 --- a/mappings/net/minecraft/class_1_807.mapping +++ b/mappings/net/minecraft/class_1_807.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1_807 FIELD field_1_5738 uploadedIndices Lcom/mojang/blaze3d/buffers/GpuBuffer; FIELD field_1_5739 uploadedVertices Lcom/mojang/blaze3d/buffers/GpuBuffer; - FIELD field_1_5741 index Lnet/minecraft/class_1_807$class_1_810; + FIELD field_1_5741 indexPool Lnet/minecraft/class_1_807$class_1_810; FIELD field_1_5744 allocator Lnet/minecraft/class_9799; FIELD field_1_5745 staging Lnet/minecraft/class_1_807$class_1_810; - FIELD field_1_5746 vertex Lnet/minecraft/class_1_807$class_1_810; + FIELD field_1_5746 vertexPool Lnet/minecraft/class_1_807$class_1_810; METHOD (Ljava/util/function/Supplier;I)V ARG 1 labelGetter ARG 2 maxSize From c7b744548fbe2e27ee17f0f77caa221fe80a4cf3 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 09:20:35 -0400 Subject: [PATCH 08/14] Format mappings --- mappings/net/minecraft/client/MinecraftClient.mapping | 2 +- .../client/network/ClientPlayNetworkHandler.mapping | 2 +- .../net/minecraft/client/option/GameOptions.mapping | 4 ++-- .../net/minecraft/client/option/SimpleOption.mapping | 4 ++-- .../client/render/chunk/VisibleChunkStorage.mapping | 2 +- mappings/net/minecraft/util/Util.mapping | 10 +++++----- mappings/net/minecraft/world/biome/Biome.mapping | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 83109ae195..b5e6505072 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -486,5 +486,5 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 world METHOD method_76797 disconnectWithProgressScreen (Z)V ARG 1 stopSounds - CLASS 1 + CLASS 1 1 FIELD field_52756 closed Z diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 4bced86602..0957e8d1a3 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -221,7 +221,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_76760 isLoaded ()Z METHOD method_76761 setLoaded (Z)V ARG 1 loaded - CLASS 1 + CLASS 1 1 METHOD method_71930 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context CLASS class_11503 CommandRunResult diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 7bff54faf9..9e718a6577 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -698,12 +698,12 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 1 renderCloudsDistance METHOD method_76786 (Ljava/lang/Boolean;)V ARG 1 value - CLASS 2 + CLASS 2 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key METHOD method_42571 (Ljava/lang/String;Lnet/minecraft/class_7172;Lcom/mojang/serialization/DataResult$Error;)V ARG 2 error - CLASS 3 + CLASS 3 3 METHOD method_33677 print (Ljava/lang/String;)V ARG 1 key METHOD method_42573 (Ljava/lang/String;Ljava/io/PrintWriter;Lcom/google/gson/JsonElement;)V diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping index 7f5acfa726..a675f94361 100644 --- a/mappings/net/minecraft/client/option/SimpleOption.mapping +++ b/mappings/net/minecraft/client/option/SimpleOption.mapping @@ -224,7 +224,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT @see Callback Modifiers ARG 1 sliderProgressValueToValue ARG 2 valueToSliderProgressValue - CLASS 1 + CLASS 1 1 CLASS class_7178 Callbacks COMMENT A set of callbacks to customize an option's behavior. COMMENT @@ -261,7 +261,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT @see Callback Modifiers ARG 1 sliderProgressValueToValue ARG 2 valueToSliderProgressValue - CLASS 1 + CLASS 1 1 CLASS class_7276 LazyCyclingCallbacks COMMENT A set of callbacks for a cycling option whose potential values are determined lazily. COMMENT diff --git a/mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping b/mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping index 27d205b352..fc76fbbff7 100644 --- a/mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping +++ b/mappings/net/minecraft/client/render/chunk/VisibleChunkStorage.mapping @@ -38,7 +38,7 @@ CLASS net/minecraft/class_1_797 net/minecraft/client/render/chunk/VisibleChunkSt COMMENT {@return whether a terrain update should be scheduled} ARG 1 pos METHOD method_1_4854 getSectionCount ()I - CLASS 1 + CLASS 1 1 FIELD field_1_5668 index I CLASS class_1_798 SectionEntry CLASS class_1_799 Positioned diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 01127f5cc4..3270f6282d 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -523,14 +523,14 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_72236 isOnAarch64 ()Z METHOD method_75862 getDefaultLocaleFormatter (Ljava/time/format/FormatStyle;)Ljava/time/format/DateTimeFormatter; ARG 0 style - CLASS 2 - CLASS 3 - CLASS 4 - CLASS 10 + CLASS 2 2 + CLASS 3 3 + CLASS 4 4 + CLASS 10 10 FIELD field_29655 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t - CLASS 11 + CLASS 11 11 FIELD field_29657 cache Ljava/util/Map; METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 t diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index dd63aff822..3045269005 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -87,7 +87,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_75734 getEnvironmentAttributes ()Lnet/minecraft/class_12199; METHOD method_75735 (Lnet/minecraft/class_1959;)Lnet/minecraft/class_12199; ARG 0 biome - CLASS 1 + CLASS 1 1 METHOD rehash (I)V ARG 1 n CLASS class_1960 Builder From f78aae7b74ee8af9e8854cef3deeefa0d9741134 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 18:36:49 -0400 Subject: [PATCH 09/14] Remove debug print --- .../field/nameprovider/RecursiveArgumentFieldNameProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java index 323991d038..7478b9d150 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/field/nameprovider/RecursiveArgumentFieldNameProvider.java @@ -18,7 +18,7 @@ public String getName(FieldData field) { if (arg == null) return null; if (!this.trustedOwnerPredicate().test(arg.owner)) return null; - if (!field.isStatic()) System.out.println(field); + return field.proposedFieldNames().get(new MappingEntry(arg.owner, arg.name, arg.desc)); } From abf05e2f42b86389f3433bfedfb1504a3e6de9aa Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 19:42:26 -0400 Subject: [PATCH 10/14] Add more mappings --- .../blaze3d/buffers/MultiDrawBuffer.mapping} | 16 ++++++++++++++-- .../PlayerAdvancementTracker.mapping | 13 ++++++++++++- mappings/net/minecraft/class_1_790.mapping | 7 +++++++ .../minecraft/client/data/ItemModels.mapping | 3 +++ .../client/gl/GlShaderProgram.mapping | 2 +- .../client/gui/render/GuiRenderer.mapping | 4 +++- .../client/render/BufferBuilder.mapping | 2 +- .../render/ChunkRenderingDataPreparer.mapping | 19 +++++++++++++++++-- .../client/render/GameRenderState.mapping | 1 + .../client/render/RenderLayer.mapping | 9 +++++++++ .../render/VertexConsumerProvider.mapping | 16 ++++++++++++---- .../client/render/WeatherRenderer.mapping | 8 ++++++++ .../client/render/WorldRenderer.mapping | 4 ++++ .../client/render/chunk/ChunkBuilder.mapping | 4 ++++ .../render/chunk/ChunkSectionUpdate.mapping | 1 + .../render/state/WorldRenderState.mapping | 3 +++ .../client/world/ClientChunkManager.mapping | 6 ++++++ .../fix/ItemRemoveBlockEntityTagFix.mapping | 18 ++++++++++++++++++ .../world/border/WorldBorderListener.mapping | 3 ++- 19 files changed, 126 insertions(+), 13 deletions(-) rename mappings/{net/minecraft/class_1_807.mapping => com/mojang/blaze3d/buffers/MultiDrawBuffer.mapping} (86%) create mode 100644 mappings/net/minecraft/client/render/chunk/ChunkSectionUpdate.mapping diff --git a/mappings/net/minecraft/class_1_807.mapping b/mappings/com/mojang/blaze3d/buffers/MultiDrawBuffer.mapping similarity index 86% rename from mappings/net/minecraft/class_1_807.mapping rename to mappings/com/mojang/blaze3d/buffers/MultiDrawBuffer.mapping index 2ac53a126d..806f4bd3f9 100644 --- a/mappings/net/minecraft/class_1_807.mapping +++ b/mappings/com/mojang/blaze3d/buffers/MultiDrawBuffer.mapping @@ -1,7 +1,10 @@ -CLASS net/minecraft/class_1_807 +CLASS net/minecraft/class_1_807 com/mojang/blaze3d/buffers/MultiDrawBuffer FIELD field_1_5738 uploadedIndices Lcom/mojang/blaze3d/buffers/GpuBuffer; FIELD field_1_5739 uploadedVertices Lcom/mojang/blaze3d/buffers/GpuBuffer; + FIELD field_1_5740 draws Ljava/util/List; FIELD field_1_5741 indexPool Lnet/minecraft/class_1_807$class_1_810; + FIELD field_1_5742 lastDraw Lnet/minecraft/class_1_807$class_1_808; + FIELD field_1_5743 bufferBuilderForLastDraw Lnet/minecraft/class_287; FIELD field_1_5744 allocator Lnet/minecraft/class_9799; FIELD field_1_5745 staging Lnet/minecraft/class_1_807$class_1_810; FIELD field_1_5746 vertexPool Lnet/minecraft/class_1_807$class_1_810; @@ -16,17 +19,23 @@ CLASS net/minecraft/class_1_807 ARG 2 drawMode ARG 3 vertexSorter METHOD method_1_4946 collectCentroids (Lnet/minecraft/class_1_807$class_1_808;)Lnet/minecraft/class_11899; + ARG 0 multiBuffer + METHOD method_1_4947 clear ()V METHOD method_1_4948 finish ()V + METHOD method_1_4949 finishPendingDraw ()V METHOD method_1_4950 execute (Lnet/minecraft/class_1_807$class_1_808;)Lnet/minecraft/class_1_807$class_1_809; + ARG 1 multiBuffer METHOD method_1_4951 appendDraw (Lnet/minecraft/class_1_807$class_1_808;)Lnet/minecraft/class_4588; + ARG 1 draw METHOD method_1_4955 upload ()V METHOD method_1_4956 upload (Lcom/mojang/blaze3d/systems/GpuDevice;Ljava/util/List;Lcom/mojang/blaze3d/buffers/GpuBuffer;Lcom/mojang/blaze3d/buffers/GpuBuffer;II)V ARG 1 device + ARG 2 draws ARG 3 vertexBuffer ARG 4 indexBuffer ARG 5 vertexOffset ARG 6 indexOffset - CLASS class_1_808 + CLASS class_1_808 MultiBuffer FIELD field_1_5748 vertexFormat Lcom/mojang/blaze3d/vertex/VertexFormat; FIELD field_1_5749 totalIndexCount I FIELD field_1_5750 indexOffset I @@ -45,7 +54,10 @@ CLASS net/minecraft/class_1_807 METHOD method_1_4958 clear ()V METHOD method_1_4959 getIndexType ()Lcom/mojang/blaze3d/vertex/VertexFormat$class_5595; METHOD method_1_4960 isEmpty ()Z + CLASS class_1_809 DrawCall CLASS class_1_810 BufferPool + FIELD field_1_5757 BUFFER_ALIGNMENT I + FIELD field_1_5758 ALLOCATION_MAX_SIZE_FACTOR I FIELD field_1_5759 usableBuffers Ljava/util/List; FIELD field_1_5760 labelGetter Ljava/util/function/Supplier; FIELD field_1_5761 waitingBuffers Ljava/util/List; diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index 506dbfce79..22385ee189 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracker + FIELD field_1_5441 criterionProgress Ljava/util/Map; FIELD field_13387 currentDisplayTab Lnet/minecraft/class_8779; FIELD field_13388 progressUpdates Ljava/util/Set; FIELD field_13390 visibleAdvancements Ljava/util/Set; @@ -14,9 +15,15 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke FIELD field_46074 progressMapCodec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3324;Lnet/minecraft/class_2989;Ljava/nio/file/Path;Lnet/minecraft/class_3222;)V ARG 1 dataFixer + ARG 2 playerManager ARG 3 advancementLoader ARG 4 filePath ARG 5 owner + METHOD method_1_4806 resetCriterionProgress ()V + METHOD method_1_4807 getOrCreateConditions (Lnet/minecraft/class_179;)Ljava/util/Map; + ARG 1 criterion + METHOD method_1_4808 getConditions (Lnet/minecraft/class_179;)Ljava/util/Map; + ARG 1 criterion METHOD method_12872 rewardEmptyAdvancements (Lnet/minecraft/class_2989;)V ARG 1 advancementLoader METHOD method_12873 load (Lnet/minecraft/class_2989;)V @@ -62,6 +69,8 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke METHOD method_53637 (Lnet/minecraft/class_8779;Lnet/minecraft/class_185;)V ARG 2 display METHOD method_53638 beginTracking (Lnet/minecraft/class_175;Lnet/minecraft/class_2985$class_180;)V + ARG 1 criterion + ARG 2 conditionKey METHOD method_53639 (Lnet/minecraft/class_2989;Lnet/minecraft/class_2960;Lnet/minecraft/class_167;)V ARG 2 id ARG 3 progress @@ -72,8 +81,10 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke ARG 1 entry ARG 2 progress METHOD method_53642 endTrackingCompleted (Lnet/minecraft/class_179;Lnet/minecraft/class_2985$class_180;)V + ARG 1 criterion + ARG 2 conditionKey METHOD method_53643 createProgressMap ()Lnet/minecraft/class_2985$class_8780; - CLASS class_180 ConditionsContainer + CLASS class_180 ConditionKey FIELD comp_1926 advancement Lnet/minecraft/class_8779; FIELD comp_1927 id Ljava/lang/String; METHOD (Lnet/minecraft/class_8779;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/class_1_790.mapping b/mappings/net/minecraft/class_1_790.mapping index 6ac6cb802c..d8c7c74c4b 100644 --- a/mappings/net/minecraft/class_1_790.mapping +++ b/mappings/net/minecraft/class_1_790.mapping @@ -23,8 +23,15 @@ CLASS net/minecraft/class_1_790 ARG 4 redrawOnMainThread METHOD method_1_4818 getSectionCount ()I CLASS class_1_791 Section + FIELD field_1_5601 playerChanged Z + FIELD field_1_5602 update Z FIELD field_1_5603 sectionPos J METHOD (ZZJ)V + ARG 1 update + ARG 2 playerChanged ARG 3 sectionPos + METHOD method_1_4819 shouldUpdate ()Z + METHOD method_1_4820 isPlayerChanged ()Z METHOD method_1_4821 update (Z)V ARG 1 redrawOnMainThread + METHOD method_1_4822 resetUpdate ()V diff --git a/mappings/net/minecraft/client/data/ItemModels.mapping b/mappings/net/minecraft/client/data/ItemModels.mapping index 7ef9aaab6f..04675c6486 100644 --- a/mappings/net/minecraft/client/data/ItemModels.mapping +++ b/mappings/net/minecraft/client/data/ItemModels.mapping @@ -33,6 +33,9 @@ CLASS net/minecraft/class_10410 net/minecraft/client/data/ItemModels ARG 1 property ARG 2 fallback ARG 3 valuesToModels + METHOD method_1_5024 basic (Lnet/minecraft/class_2960;Lnet/minecraft/class_4590;)Lnet/minecraft/class_10439$class_10441; + ARG 0 model + ARG 1 transformation METHOD method_65479 usingItemProperty ()Lnet/minecraft/class_10460; METHOD method_65480 constantTintSource (I)Lnet/minecraft/class_10401; ARG 0 value diff --git a/mappings/net/minecraft/client/gl/GlShaderProgram.mapping b/mappings/net/minecraft/client/gl/GlShaderProgram.mapping index 8b90312378..de2941052a 100644 --- a/mappings/net/minecraft/client/gl/GlShaderProgram.mapping +++ b/mappings/net/minecraft/client/gl/GlShaderProgram.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/GlShaderProgram METHOD (ILjava/lang/String;)V ARG 1 glRef ARG 2 debugLabel - METHOD method_1_4748 (Ljava/util/List;)V + METHOD method_1_4748 resolveResources (Ljava/util/List;)V ARG 1 layouts METHOD method_1270 getGlRef ()I METHOD method_34582 getUniform (Ljava/lang/String;)Lnet/minecraft/class_284; diff --git a/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping b/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping index 58f37716e0..f821d3be6a 100644 --- a/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping +++ b/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_11228 net/minecraft/client/gui/render/GuiRenderer FIELD field_1_1440 itemAtlas Lnet/minecraft/class_1_201; FIELD field_1_1816 guiProjection Lnet/minecraft/class_11279; FIELD field_1_2265 panoramaRenderer Lnet/minecraft/class_751; + FIELD field_1_5670 simpleElementMultiBuffer Lnet/minecraft/class_1_807$class_1_808; + FIELD field_1_5671 guiVertexBuffer Lnet/minecraft/class_1_807; FIELD field_59905 LOGGER Lorg/slf4j/Logger; FIELD field_59912 SIMPLE_ELEMENT_COMPARATOR Ljava/util/Comparator; FIELD field_59914 state Lnet/minecraft/class_11246; @@ -73,7 +75,7 @@ CLASS net/minecraft/class_11228 net/minecraft/client/gui/render/GuiRenderer METHOD method_72107 (ILnet/minecraft/class_11245;)V ARG 2 elem METHOD method_72109 clearOversizedItems ()V - CLASS 1 1 + CLASS 1 METHOD method_73409 draw (Lnet/minecraft/class_11767;)V ARG 1 drawable CLASS class_11230 Draw diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index c40e367451..6444f6a460 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_60801 putInt (JI)V ARG 0 pointer ARG 2 i - METHOD method_60802 ensureBuilding ()V + METHOD method_60802 assertBuilding ()V METHOD method_60804 build ()Lnet/minecraft/class_9801; METHOD method_60805 beginVertex ()J METHOD method_60806 endVertex ()V diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 3ac30a24e4..fb37a961ff 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer + FIELD field_1_5777 loadedSections Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; FIELD field_1_5778 chunkCullingEnabled Z + FIELD field_1_5779 propagationQueue Ljava/util/concurrent/BlockingQueue; FIELD field_1_5780 cameraXd8 D FIELD field_1_5781 cameraYd8 D FIELD field_1_5782 cameraZd8 D @@ -14,18 +16,27 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre FIELD field_45624 state Ljava/util/concurrent/atomic/AtomicReference; FIELD field_45626 needsUpdate Ljava/util/concurrent/atomic/AtomicBoolean; FIELD field_55873 SECTION_DISTANCE I + METHOD method_1_4986 doUpdateTerrain (Lnet/minecraft/class_2338;Ljava/util/Queue;)V + ARG 1 pos + ARG 2 chunkInfoQueue METHOD method_1_4987 updateFromCameraRenderState (Lnet/minecraft/class_12075;I)V ARG 1 cameraRenderState ARG 2 fov - METHOD method_1_4989 (Lnet/minecraft/class_4604;)Lnet/minecraft/class_4604; + METHOD method_1_4989 expandFrustum (Lnet/minecraft/class_4604;)Lnet/minecraft/class_4604; ARG 0 frustum + METHOD method_1_4990 updateLoadedSections (Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V + ARG 1 newSections + ARG 2 updatedSections METHOD method_52817 scheduleTerrainUpdate ()V METHOD method_52824 (Lnet/minecraft/class_8679$class_8681;Lnet/minecraft/class_8679$class_762;)V ARG 1 info METHOD method_52825 update (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V ARG 1 renderableChunks ARG 2 pos + ARG 3 chunkInfoQueue ARG 4 cullChunks + ARG 5 loadedSectionCallback + ARG 6 loadedSections METHOD method_52826 setStorage (Lnet/minecraft/class_769;)V ARG 1 storage METHOD method_52827 schedulePropagationFrom (Lnet/minecraft/class_846$class_851;)V @@ -34,6 +45,8 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 1 frustum ARG 2 builtChunks ARG 3 nearbyChunks + METHOD method_52829 (Lnet/minecraft/class_4604;Lnet/minecraft/class_846$class_851;)V + ARG 2 builtChunk METHOD method_52830 (Lnet/minecraft/class_2338;Lnet/minecraft/class_8679$class_762;)D ARG 1 chunkInfo METHOD method_52831 getRenderedChunk (JLnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_846$class_851; @@ -43,11 +56,13 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre METHOD method_52832 isWithinViewDistance (JJ)Z ARG 1 centerSectionPos ARG 3 otherSectionPos - METHOD method_52833 updateTerrain (Lnet/minecraft/class_12075;)V + METHOD method_52833 scheduleTerrainUpdate (Lnet/minecraft/class_12075;)V ARG 1 cameraRenderState METHOD method_52834 updateSectionOcclusionGraph (Lnet/minecraft/class_12075;ILit/unimi/dsi/fastutil/longs/LongOpenHashSet;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V ARG 1 cameraRenderState ARG 2 fov + ARG 3 newSections + ARG 4 updatedSections METHOD method_52835 updateNow (Lnet/minecraft/class_12075;)V ARG 1 cameraRenderState METHOD method_52836 updateFrustum ()Z diff --git a/mappings/net/minecraft/client/render/GameRenderState.mapping b/mappings/net/minecraft/client/render/GameRenderState.mapping index 50a12e6704..d5199273a7 100644 --- a/mappings/net/minecraft/client/render/GameRenderState.mapping +++ b/mappings/net/minecraft/client/render/GameRenderState.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_1_405 net/minecraft/client/render/GameRenderState FIELD field_1_2299 lightmap Lnet/minecraft/class_1_50; FIELD field_1_2300 options Lnet/minecraft/class_1_421; FIELD field_1_2301 window Lnet/minecraft/class_1_416; + METHOD method_1_4995 usesImprovedTransparency ()Z diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index e9970cd01a..547c33cb0d 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -19,6 +19,15 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 2 renderSetup METHOD method_1_1195 hasBlend ()Z METHOD method_1_2313 getOutputTarget ()Lnet/minecraft/class_12246; + METHOD method_1_4993 draw (Lcom/mojang/blaze3d/buffers/GpuBuffer;Lcom/mojang/blaze3d/buffers/GpuBuffer;Lcom/mojang/blaze3d/vertex/VertexFormat$class_5595;III)V + ARG 1 vertexBuffer + ARG 2 indexbuffer + ARG 3 indexType + ARG 4 baseVertex + ARG 5 firstIndex + ARG 6 indexCount + METHOD method_1_4994 draw (Lnet/minecraft/class_1_807$class_1_809;)V + ARG 1 drawCall METHOD method_23031 getVertexFormat ()Lcom/mojang/blaze3d/vertex/VertexFormat; METHOD method_23033 getDrawMode ()Lcom/mojang/blaze3d/vertex/VertexFormat$class_5596; METHOD method_23037 hasCrumbling ()Z diff --git a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping index 8c95bb0d15..1c2a9ba45f 100644 --- a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvide COMMENT Manages rendering with multiple {@linkplain RenderLayer render layers}. METHOD method_1_4894 immediate (ILjava/util/SequencedSet;)Lnet/minecraft/class_4597$class_4598; ARG 0 initialSize + ARG 1 retainedLayers METHOD method_73477 getBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; COMMENT Starts building a buffer that will be drawn with {@code layer}. COMMENT @@ -14,14 +15,21 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvide COMMENT {@link Tessellator} or making a custom render layer. ARG 1 layer CLASS class_4598 Immediate - COMMENT A vertex consumer provider that immediately draws the current buffer - COMMENT builder when a different render layer is requested except for render - COMMENT layers specified in the constructor. + COMMENT A vertex consumer provider that acts as if it immediately draws the + COMMENT current buffer builder when a different render layer is requested + COMMENT except for render layers specified in the constructor. COMMENT COMMENT @see VertexConsumerProvider#immediate(BufferAllocator) COMMENT @see VertexConsumerProvider#immediate(SequencedMap, BufferAllocator) + FIELD field_1_5710 workingRenderLayers Ljava/util/List; + FIELD field_1_5711 workingMultiBuffers Ljava/util/List; + FIELD field_1_5712 layerIndices Lit/unimi/dsi/fastutil/objects/Reference2IntMap; + FIELD field_1_5713 retainedLayers Ljava/util/SequencedSet; + FIELD field_1_5714 multiDrawBuffer Lnet/minecraft/class_1_807; METHOD (ILjava/util/SequencedSet;)V ARG 1 initialSize - METHOD method_1_4895 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_1_807$class_1_808; + ARG 2 retainedLayers + METHOD method_1_4895 createMultiBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_1_807$class_1_808; ARG 1 renderLayer + METHOD method_1_4896 finish ()V METHOD method_1_4898 prepare ()V diff --git a/mappings/net/minecraft/client/render/WeatherRenderer.mapping b/mappings/net/minecraft/client/render/WeatherRenderer.mapping index a75dffc949..01d574f17f 100644 --- a/mappings/net/minecraft/client/render/WeatherRenderer.mapping +++ b/mappings/net/minecraft/client/render/WeatherRenderer.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_9976 net/minecraft/client/render/WeatherRenderer + FIELD field_1_1035 INDICES_PER_PIECE I + FIELD field_1_5784 vertexBuffer Lcom/mojang/blaze3d/buffers/GpuBuffer; FIELD field_53150 RAIN_TEXTURE Lnet/minecraft/class_2960; FIELD field_53151 SNOW_TEXTURE Lnet/minecraft/class_2960; + FIELD field_53152 NORMAL_TABLE_DIMENSION I + FIELD field_53153 NORMAL_TABLE_BIAS I FIELD field_53155 NORMAL_LINE_DX [F COMMENT Given {@code -16 <= z < 16} and {@code -16 <= x < 16}, let {@code i = 32 * (z + 16) + (x + 16)}. COMMENT Then {@code NORMAL_LINE_DX[i]} and {@code NORMAL_LINE_DZ[i]} describe the @@ -16,8 +20,11 @@ CLASS net/minecraft/class_9976 net/minecraft/client/render/WeatherRenderer ARG 2 texture ARG 3 start ARG 4 end + METHOD method_1_4992 upload (Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/buffers/GpuBuffer; + ARG 1 buffer METHOD method_62314 createRainPiece (Lnet/minecraft/class_5819;JIIIIIF)Lnet/minecraft/class_9976$class_9977; ARG 1 random + ARG 2 time ARG 4 x ARG 5 yMin ARG 6 yMax @@ -38,6 +45,7 @@ CLASS net/minecraft/class_9976 net/minecraft/client/render/WeatherRenderer ARG 6 gradient METHOD method_62321 createSnowPiece (Lnet/minecraft/class_5819;JIIIIIF)Lnet/minecraft/class_9976$class_9977; ARG 1 random + ARG 2 time ARG 4 x ARG 5 yMin ARG 6 yMax diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 9f03471443..20367681f3 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_61739 entityRenderDispatcher Lnet/minecraft/class_11684; FIELD field_63574 gizmoCollector Lnet/minecraft/class_12185; FIELD field_64218 terrainSampler Lnet/minecraft/class_12137; + FIELD field_64450 MIN_CHUNK_RENDERING_OPACITY F FIELD field_64566 gizmos Lnet/minecraft/class_761$class_12351; METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_1092;Lnet/minecraft/class_1060;Lnet/minecraft/class_11697;Lnet/minecraft/class_10151;Lnet/minecraft/class_757;II)V ARG 1 entityRenderManager @@ -40,9 +41,12 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 7 gameRenderer ARG 8 width ARG 9 height + METHOD method_1_2232 (I)Ljava/util/List; + ARG 0 hash METHOD method_1_2233 createSectionRenderState (Lorg/joml/Matrix4fc;)Lnet/minecraft/class_11532; ARG 1 rotationMatrix METHOD method_1_2234 prepareForRender (Lnet/minecraft/class_12075;)V + ARG 1 cameraRenderState METHOD method_1_4858 addGizmos (Ljava/util/List;)V ARG 1 gizmos METHOD method_1_4859 getBlockEntityRenderManager ()Lnet/minecraft/class_824; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 9933e4731d..cc0e10a0a0 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -70,12 +70,16 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_1_2412 onVertexBufferUploaded (Lnet/minecraft/class_11516;Lnet/minecraft/class_11515;)V ARG 1 data ARG 2 blockRenderLayer + METHOD method_1_5084 rebuildAsync (Lnet/minecraft/class_853;)V + ARG 1 region METHOD method_3663 cancel ()V METHOD method_3670 getOrigin ()Lnet/minecraft/class_2338; METHOD method_3674 createRebuildTask (Lnet/minecraft/class_853;)Lnet/minecraft/class_846$class_851$class_4577; + ARG 1 region METHOD method_3675 clear ()V METHOD method_22773 scheduleSort ()V METHOD method_22781 rebuild (Lnet/minecraft/class_853;)V + ARG 1 region METHOD method_40051 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_60909 getVertexSorter (Lnet/minecraft/class_4076;Lnet/minecraft/class_243;)Lnet/minecraft/class_8251; ARG 1 sectionPos diff --git a/mappings/net/minecraft/client/render/chunk/ChunkSectionUpdate.mapping b/mappings/net/minecraft/client/render/chunk/ChunkSectionUpdate.mapping new file mode 100644 index 0000000000..7db8c9e1c0 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/ChunkSectionUpdate.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1_828 net/minecraft/client/render/chunk/ChunkSectionUpdate diff --git a/mappings/net/minecraft/client/render/state/WorldRenderState.mapping b/mappings/net/minecraft/client/render/state/WorldRenderState.mapping index 64b3602e19..bd1b18d7e1 100644 --- a/mappings/net/minecraft/client/render/state/WorldRenderState.mapping +++ b/mappings/net/minecraft/client/render/state/WorldRenderState.mapping @@ -4,7 +4,10 @@ CLASS net/minecraft/class_11658 net/minecraft/client/render/state/WorldRenderSta FIELD field_1_1887 cloudHeight F FIELD field_1_2384 particles Lnet/minecraft/class_11943; FIELD field_1_3809 show3dCrosshair Z + FIELD field_1_5912 newSections Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; FIELD field_1_5913 sectionReadyCallback Ljava/lang/Runnable; + FIELD field_1_5914 updatedSections Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; + FIELD field_1_5915 sectionUpdates Ljava/util/List; FIELD field_1_5916 recreateTerrainSampler Z FIELD field_1_5917 scheduledReload Z FIELD field_1_5918 drawEntityOutlines Z diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 25efaea185..179725f469 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager METHOD (Lnet/minecraft/class_638;I)V ARG 1 world ARG 2 loadDistance + METHOD method_1_4977 getNewSections ()Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; + METHOD method_1_4978 flip ()V + METHOD method_1_4979 getUpdatedSections ()Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; METHOD method_2859 unload (Lnet/minecraft/class_1923;)V ARG 1 pos METHOD method_16020 loadChunkFromPacket (IILnet/minecraft/class_2540;Ljava/util/Map;Ljava/util/function/Consumer;)Lnet/minecraft/class_2818; @@ -31,6 +34,9 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager ARG 2 z ARG 3 buf CLASS class_3681 ClientChunkMap + FIELD field_1_5766 newSections [Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; + FIELD field_1_5767 updatedSections [Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; + FIELD field_1_5768 activeIndex I FIELD field_16251 chunks Ljava/util/concurrent/atomic/AtomicReferenceArray; FIELD field_16252 diameter I FIELD field_16253 radius I diff --git a/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping index b51b5687d7..b7eda3efa4 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping @@ -1,2 +1,20 @@ CLASS net/minecraft/class_7641 net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix + FIELD field_1_5859 old Z FIELD field_39900 itemIds Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Set;)V + ARG 1 schema + ARG 2 itemIds + METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/util/Set;)V + ARG 1 schema + ARG 2 old + ARG 3 itemIds + METHOD method_1_5041 removeTagInBlockEntities (Lcom/mojang/datafixers/OpticFinder;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 1 idFieldFinder + METHOD method_1_5042 removeTagInFallingBlockEntities (Lcom/mojang/datafixers/OpticFinder;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 1 idFieldFinder + METHOD method_1_5043 removeTagInItemStacks (Lcom/mojang/datafixers/OpticFinder;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 1 idFieldFinder + ARG 2 componentsField + METHOD method_1_5044 removeTagInStructures (Lcom/mojang/datafixers/OpticFinder;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 1 idFieldFinder + METHOD method_1_5045 updateBlockEntityType ()Lcom/mojang/datafixers/TypeRewriteRule; diff --git a/mappings/net/minecraft/world/border/WorldBorderListener.mapping b/mappings/net/minecraft/world/border/WorldBorderListener.mapping index e347e5f2e7..9339cd2c88 100644 --- a/mappings/net/minecraft/world/border/WorldBorderListener.mapping +++ b/mappings/net/minecraft/world/border/WorldBorderListener.mapping @@ -10,7 +10,8 @@ CLASS net/minecraft/class_2780 net/minecraft/world/border/WorldBorderListener ARG 1 border ARG 2 fromSize ARG 4 toSize - ARG 6 time + ARG 6 timeDuration + ARG 8 timeStart METHOD method_11932 onWarningTimeChanged (Lnet/minecraft/class_2784;I)V ARG 1 border ARG 2 warningTime From 9514d8ecfc4906f8636b7974a1d1029ccb072b37 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 19:47:58 -0400 Subject: [PATCH 11/14] Format mappings again --- mappings/net/minecraft/client/gui/render/GuiRenderer.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping b/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping index f821d3be6a..21a493613b 100644 --- a/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping +++ b/mappings/net/minecraft/client/gui/render/GuiRenderer.mapping @@ -75,7 +75,7 @@ CLASS net/minecraft/class_11228 net/minecraft/client/gui/render/GuiRenderer METHOD method_72107 (ILnet/minecraft/class_11245;)V ARG 2 elem METHOD method_72109 clearOversizedItems ()V - CLASS 1 + CLASS 1 1 METHOD method_73409 draw (Lnet/minecraft/class_11767;)V ARG 1 drawable CLASS class_11230 Draw From 1a86188fd0bd470580d6877474b7e0ac403f1787 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 21:13:57 -0400 Subject: [PATCH 12/14] Add name proposals for trim and sherd items --- .../nameproposal/NameProposalConfig.java | 6 +- .../client/data/ItemModelGenerator.mapping | 9 ++ .../model/special/ShieldModelRenderer.mapping | 1 + .../special/TridentModelRenderer.mapping | 1 + mappings/net/minecraft/item/ItemKeys.mapping | 43 +--------- mappings/net/minecraft/item/Items.mapping | 82 ++++++++++++++++++- 6 files changed, 98 insertions(+), 44 deletions(-) diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java index 4006464489..c6b2f78c00 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java @@ -35,6 +35,8 @@ public record NameProposalConfig(FieldNameProvider fieldNameProvider) { // trusted owners, currently for most IDs private static final Set TRUSTED_ID_OWNERS = Set.of( "net/minecraft/class_3612", + "net/minecraft/class_8057", + "net/minecraft/class_8173", "net/minecraft/class_9796", "net/minecraft/class_1_779", "net/minecraft/class_1_780", @@ -60,8 +62,10 @@ public record NameProposalConfig(FieldNameProvider fieldNameProvider) { InternalInitFieldPredicate.INSTANCE ) ), (name, field) -> switch (field.methodName()) { + case "method_1_4731" -> name + "_SMITHING_TEMPLATE"; + case "method_1_4732" -> "MUSIC_DISC_" + name; + case "method_1_4733" -> name + "_POTTERY_SHERD"; case "method_1_4735" -> name + "_SPAWN_EGG"; - case "method_1_4732" -> "MUSIC_DISC" + name; default -> name; }), // Results of BlockItemTagKey#{block, item} diff --git a/mappings/net/minecraft/client/data/ItemModelGenerator.mapping b/mappings/net/minecraft/client/data/ItemModelGenerator.mapping index 6a6e6656cd..af2f99cab1 100644 --- a/mappings/net/minecraft/client/data/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/client/data/ItemModelGenerator.mapping @@ -10,13 +10,20 @@ CLASS net/minecraft/class_4915 net/minecraft/client/data/ItemModelGenerator METHOD (Lnet/minecraft/class_10405;Ljava/util/function/BiConsumer;)V ARG 1 output ARG 2 modelCollector + METHOD method_1_4484 (Lnet/minecraft/class_1792;)V + ARG 1 dye METHOD method_25731 register ()V METHOD method_43229 registerClock (Lnet/minecraft/class_1792;)V ARG 1 clock METHOD method_48517 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_1_314;Lnet/minecraft/class_1_314;)Lnet/minecraft/class_2960; ARG 1 id + ARG 2 itemTexture + ARG 3 trimTexture METHOD method_48742 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_1_314;Lnet/minecraft/class_1_314;Lnet/minecraft/class_1_314;)V ARG 1 id + ARG 2 itemTexture + ARG 3 overlayTexture + ARG 4 trimTexture METHOD method_65426 register (Lnet/minecraft/class_1792;)V ARG 1 item METHOD method_65427 registerDyeable (Lnet/minecraft/class_1792;I)V @@ -32,6 +39,8 @@ CLASS net/minecraft/class_4915 net/minecraft/client/data/ItemModelGenerator ARG 2 model METHOD method_65431 uploadTwoLayers (Lnet/minecraft/class_1792;Lnet/minecraft/class_1_314;Lnet/minecraft/class_1_314;)Lnet/minecraft/class_2960; ARG 1 item + ARG 2 texture0 + ARG 3 texture1 METHOD method_65432 uploadWithTextureSource (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_4942;)Lnet/minecraft/class_2960; ARG 1 item ARG 2 textureSourceItem diff --git a/mappings/net/minecraft/client/render/item/model/special/ShieldModelRenderer.mapping b/mappings/net/minecraft/client/render/item/model/special/ShieldModelRenderer.mapping index 621535c57d..5e161ab697 100644 --- a/mappings/net/minecraft/client/render/item/model/special/ShieldModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/model/special/ShieldModelRenderer.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_10509 net/minecraft/client/render/item/model/special/ShieldModelRenderer + FIELD field_1_2388 TRANSFORMATION Lnet/minecraft/class_4590; FIELD field_55441 model Lnet/minecraft/class_600; FIELD field_61858 spriteHolder Lnet/minecraft/class_11701; METHOD (Lnet/minecraft/class_11701;Lnet/minecraft/class_600;)V diff --git a/mappings/net/minecraft/client/render/item/model/special/TridentModelRenderer.mapping b/mappings/net/minecraft/client/render/item/model/special/TridentModelRenderer.mapping index 215cbae56a..b5ad109a4e 100644 --- a/mappings/net/minecraft/client/render/item/model/special/TridentModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/model/special/TridentModelRenderer.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_10518 net/minecraft/client/render/item/model/special/TridentModelRenderer + FIELD field_1_2391 TRANSFORMATION Lnet/minecraft/class_4590; FIELD field_55456 model Lnet/minecraft/class_613; METHOD (Lnet/minecraft/class_613;)V ARG 1 model diff --git a/mappings/net/minecraft/item/ItemKeys.mapping b/mappings/net/minecraft/item/ItemKeys.mapping index 39480b9caa..b512e870c7 100644 --- a/mappings/net/minecraft/item/ItemKeys.mapping +++ b/mappings/net/minecraft/item/ItemKeys.mapping @@ -1,52 +1,11 @@ CLASS net/minecraft/class_1_779 net/minecraft/item/ItemKeys - FIELD field_1_3875 ANGLER_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_3877 ARCHER_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_3881 ARMS_UP_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_3895 BLADE_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_3901 BOLT_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_3911 BREWER_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_3917 BURN_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_3937 COAST_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_3971 DANGER_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_3994 DUNE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_3995 BUNDLES Lnet/minecraft/class_1_727; + FIELD field_1_3995 DYED_BUNDLES Lnet/minecraft/class_1_727; FIELD field_1_3996 DYES Lnet/minecraft/class_1_727; - FIELD field_1_4012 EXPLORER_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4013 EYE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4025 FLOW_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4027 FLOW_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4029 FRIEND_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4062 GUSTER_POTTERY_SHERD Lnet/minecraft/class_5321; FIELD field_1_4064 HARNESSES Lnet/minecraft/class_1_727; - FIELD field_1_4065 HEARTBREAK_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4067 HEART_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4073 HOST_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4074 HOWL_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4116 MINER_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4119 MOURNER_POTTERY_SHERD Lnet/minecraft/class_5321; FIELD field_1_4122 MUSIC_DISC_11 Lnet/minecraft/class_5321; FIELD field_1_4123 MUSIC_DISC_13 Lnet/minecraft/class_5321; FIELD field_1_4124 MUSIC_DISC_5 Lnet/minecraft/class_5321; - FIELD field_1_4183 PLENTY_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4191 PRIZE_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4202 RAISER_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4209 RIB_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4215 SCRAPE_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4216 SENTRY_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4217 SHAPER_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4218 SHEAF_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4221 SHELTER_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4225 SILENCE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4230 SKULL_POTTERY_SHERD Lnet/minecraft/class_5321; FIELD field_1_4233 SMITHING_TEMPLATE_SUFFIX Ljava/lang/String; - FIELD field_1_4235 SNORT_POTTERY_SHERD Lnet/minecraft/class_5321; - FIELD field_1_4236 SNOUT_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4242 SPIRE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4263 TIDE_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4276 VEX_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4282 WARD_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4285 WAYFINDER_SMITHING_TEMPLATE Lnet/minecraft/class_5321; - FIELD field_1_4287 WILD_SMITHING_TEMPLATE Lnet/minecraft/class_5321; METHOD method_1_4730 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 path METHOD method_1_4731 ofSmithingTemplate (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 8316b21cda..0d49a53bff 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_1_3318 CUT_COPPERS Lnet/minecraft/class_1_758; FIELD field_1_3319 CUT_COPPER_SLABS Lnet/minecraft/class_1_758; FIELD field_1_3320 CUT_COPPER_STAIRS Lnet/minecraft/class_1_758; - FIELD field_1_3321 BUNDLE Lnet/minecraft/class_1_727; + FIELD field_1_3321 DYED_BUNDLES Lnet/minecraft/class_1_727; FIELD field_1_3322 DYED_CANDLES Lnet/minecraft/class_1_727; FIELD field_1_3323 DYED_SHULKER_BOXES Lnet/minecraft/class_1_727; FIELD field_1_3324 DYED_TERRACOTTAS Lnet/minecraft/class_1_727; @@ -96,6 +96,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_8136 ZOMBIE_VILLAGER_SPAWN_EGG Lnet/minecraft/class_1792; FIELD field_8140 CONDUIT Lnet/minecraft/class_1792; FIELD field_8141 GLASS_PANE Lnet/minecraft/class_1792; + FIELD field_8144 MUSIC_DISC_13 Lnet/minecraft/class_1792; FIELD field_8148 INFESTED_CHISELED_STONE_BRICKS Lnet/minecraft/class_1792; FIELD field_8149 VINDICATOR_SPAWN_EGG Lnet/minecraft/class_1792; FIELD field_8152 END_STONE_BRICK_STAIRS Lnet/minecraft/class_1792; @@ -175,6 +176,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_8311 JUNGLE_STAIRS Lnet/minecraft/class_1792; FIELD field_8312 GRANITE_SLAB Lnet/minecraft/class_1792; FIELD field_8316 POLISHED_ANDESITE_STAIRS Lnet/minecraft/class_1792; + FIELD field_8317 WHEAT_SEEDS Lnet/minecraft/class_1792; FIELD field_8319 POLISHED_GRANITE_STAIRS Lnet/minecraft/class_1792; FIELD field_8320 OAK_SLAB Lnet/minecraft/class_1792; FIELD field_8321 JUNGLE_TRAPDOOR Lnet/minecraft/class_1792; @@ -350,6 +352,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_8723 HORN_CORAL Lnet/minecraft/class_1792; FIELD field_8727 BAT_SPAWN_EGG Lnet/minecraft/class_1792; FIELD field_8728 ZOMBIE_HORSE_SPAWN_EGG Lnet/minecraft/class_1792; + FIELD field_8731 MUSIC_DISC_11 Lnet/minecraft/class_1792; FIELD field_8732 FURNACE Lnet/minecraft/class_1792; FIELD field_8733 EMERALD_BLOCK Lnet/minecraft/class_1792; FIELD field_8740 BREWING_STAND Lnet/minecraft/class_1792; @@ -412,6 +415,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_8857 COMPARATOR Lnet/minecraft/class_1792; FIELD field_8858 SAND Lnet/minecraft/class_1792; FIELD field_8860 DIORITE_STAIRS Lnet/minecraft/class_1792; + FIELD field_8861 WHEAT Lnet/minecraft/class_1792; FIELD field_8865 LEVER Lnet/minecraft/class_1792; FIELD field_8866 COMMAND_BLOCK Lnet/minecraft/class_1792; FIELD field_8867 JUNGLE_SIGN Lnet/minecraft/class_1792; @@ -703,6 +707,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_38219 WARDEN_SPAWN_EGG Lnet/minecraft/class_1792; FIELD field_38418 REINFORCED_DEEPSLATE Lnet/minecraft/class_1792; FIELD field_38419 ALLAY_SPAWN_EGG Lnet/minecraft/class_1792; + FIELD field_38973 MUSIC_DISC_5 Lnet/minecraft/class_1792; FIELD field_40213 BAMBOO_PLANKS Lnet/minecraft/class_1792; FIELD field_40214 BAMBOO_MOSAIC Lnet/minecraft/class_1792; FIELD field_40215 CHISELED_BOOKSHELF Lnet/minecraft/class_1792; @@ -871,41 +876,109 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items ARG 0 registries METHOD method_1_2928 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6885; ARG 0 registries + METHOD method_1_3956 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color METHOD method_1_3957 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings METHOD method_1_3958 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 settings METHOD method_1_3959 (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 color + METHOD method_1_3960 (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id ARG 1 color + METHOD method_1_3961 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color METHOD method_1_3962 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block ARG 2 color METHOD method_1_3963 (Lnet/minecraft/class_1767;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 1 block_ ARG 2 settings METHOD method_1_3964 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings + METHOD method_1_3965 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color + METHOD method_1_3966 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + METHOD method_1_3967 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color METHOD method_1_3968 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block ARG 2 color METHOD method_1_3969 (Lnet/minecraft/class_1767;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 1 settings + METHOD method_1_3970 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color + METHOD method_1_3971 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color + METHOD method_1_3972 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color + METHOD method_1_3973 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color + METHOD method_1_3974 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color + METHOD method_1_3975 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block + ARG 2 color + METHOD method_1_3976 (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + ARG 0 id + ARG 1 block METHOD method_1_3977 (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; + ARG 0 id ARG 1 color METHOD method_7989 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 block METHOD method_7990 register (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1792; + ARG 0 key METHOD method_7991 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 key ARG 1 settings METHOD method_7992 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 block ARG 2 settings METHOD method_7993 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 block ARG 2 factory METHOD method_35220 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 block ARG 2 blocks METHOD method_51348 register (Lnet/minecraft/class_5321;Ljava/util/function/Function;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 key ARG 1 factory ARG 2 settings METHOD method_58095 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings METHOD method_58096 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 block ARG 2 settingsOperator METHOD method_58097 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings @@ -1006,13 +1079,18 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items ARG 0 block ARG 1 settings METHOD method_63747 register (Lnet/minecraft/class_5321;Ljava/util/function/Function;)Lnet/minecraft/class_1792; + ARG 0 key ARG 1 factory METHOD method_63748 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_2248;Ljava/util/function/BiFunction;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 block ARG 2 factory ARG 3 settings METHOD method_63749 register (Lnet/minecraft/class_1_784;Ljava/util/function/Function;)Lnet/minecraft/class_1792; + ARG 0 key ARG 1 factory METHOD method_63750 register (Lnet/minecraft/class_1_784;Ljava/util/function/Function;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 key ARG 1 factory ARG 2 settings METHOD method_63751 (Ljava/util/function/BiFunction;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; @@ -1238,3 +1316,5 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items ARG 0 block ARG 1 settings METHOD method_76591 registerSpawnEgg (Lnet/minecraft/class_5321;Lnet/minecraft/class_1299;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 entityType From c0764bd7d9d91a413c2c785bab867d93ecea0be6 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 23:06:14 -0400 Subject: [PATCH 13/14] Add more mappings --- .../net/minecraft/client/MinecraftClient.mapping | 1 + .../minecraft/client/render/GameRenderer.mapping | 2 +- .../render/WorldExtractor.mapping} | 15 +++++++++++---- .../block/entity/BlockEntityRenderManager.mapping | 6 ++++++ .../StructureBlockBlockEntityRenderer.mapping | 6 ++++++ .../StructureBlockBlockEntityRenderState.mapping | 1 + .../minecraft/util/profiler/DebugRecorder.mapping | 2 ++ .../net/minecraft/util/profiler/Recorder.mapping | 1 + .../net/minecraft/util/profiler/Sampler.mapping | 15 +++++++++++++-- 9 files changed, 42 insertions(+), 7 deletions(-) rename mappings/net/minecraft/{class_1_816.mapping => client/render/WorldExtractor.mapping} (75%) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index b5e6505072..2f0ba1cdc7 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1_2136 blockModelManager Lnet/minecraft/class_1_394; FIELD field_1_2249 lastWindowFocusTime J FIELD field_1_2571 imeStatusController Lnet/minecraft/class_1_490; + FIELD field_1_3288 backendFailure Lnet/minecraft/class_1_739; FIELD field_1_3290 surfaceConfigureFailed Z FIELD field_1_3291 gpuTimestampProfiler Lnet/minecraft/class_1_667; FIELD field_1_3292 gpuSurface Lnet/minecraft/class_1_665; diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index b25c50826a..e02e417f24 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 3 bakedModelManager METHOD method_1_430 getWorldLightmapTextureView ()Lcom/mojang/blaze3d/textures/GpuTextureView; METHOD method_1_431 getLightmapTextureView ()Lcom/mojang/blaze3d/textures/GpuTextureView; - METHOD method_1_2674 renderGui (Lnet/minecraft/class_9779;Z)V + METHOD method_1_2674 extract (Lnet/minecraft/class_9779;Z)V ARG 1 renderTickCounter ARG 2 tick METHOD method_1_2676 updateOptionsRenderState ()V diff --git a/mappings/net/minecraft/class_1_816.mapping b/mappings/net/minecraft/client/render/WorldExtractor.mapping similarity index 75% rename from mappings/net/minecraft/class_1_816.mapping rename to mappings/net/minecraft/client/render/WorldExtractor.mapping index 523454d467..6e7d775947 100644 --- a/mappings/net/minecraft/class_1_816.mapping +++ b/mappings/net/minecraft/client/render/WorldExtractor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_816 +CLASS net/minecraft/class_1_816 net/minecraft/client/render/WorldExtractor FIELD field_1_5786 debugRenderer Lnet/minecraft/class_863; FIELD field_1_5787 gameTestDebugRenderer Lnet/minecraft/class_4503; FIELD field_1_5788 viewDistance I @@ -24,23 +24,29 @@ CLASS net/minecraft/class_1_816 ARG 1 pos ARG 2 flags METHOD method_1_4999 startGizmos ()Lnet/minecraft/class_12180$class_12181; + METHOD method_1_5000 getRenderedSectionCount ()I METHOD method_1_5002 render (Lnet/minecraft/class_9779;Lnet/minecraft/class_4184;F)V ARG 1 tickCounter ARG 2 camera ARG 3 tickProgress - METHOD method_1_5005 (Lnet/minecraft/class_1297;F)Lnet/minecraft/class_10017; + METHOD method_1_5003 renderBlockBreaking (Lnet/minecraft/class_4184;Lnet/minecraft/class_11658;)V + METHOD method_1_5004 renderBlockOutline (Lnet/minecraft/class_4184;Lnet/minecraft/class_11658;)V + METHOD method_1_5005 getAndUpdateRenderState (Lnet/minecraft/class_1297;F)Lnet/minecraft/class_10017; ARG 1 entity ARG 2 tickProgress METHOD method_1_5006 renderGizmos ()V - METHOD method_1_5007 (Lnet/minecraft/class_4184;FLnet/minecraft/class_11658;)V + METHOD method_1_5007 renderBlockEntities (Lnet/minecraft/class_4184;FLnet/minecraft/class_11658;)V ARG 1 camera + ARG 2 tickProgress ARG 3 worldRenderState - METHOD method_1_5008 (Lnet/minecraft/class_4184;Lnet/minecraft/class_4604;Lnet/minecraft/class_9779;Lnet/minecraft/class_11658;)V + METHOD method_1_5008 renderEntities (Lnet/minecraft/class_4184;Lnet/minecraft/class_4604;Lnet/minecraft/class_9779;Lnet/minecraft/class_11658;)V ARG 1 camera ARG 2 frustum ARG 3 tickCounter ARG 4 worldRenderState + METHOD method_1_5009 getLastViewDistance ()D METHOD method_1_5010 recreateTerrainSampler ()V + METHOD method_1_5011 getChunkRenderStats ()Ljava/lang/String; METHOD method_1_5012 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 from @@ -79,3 +85,4 @@ CLASS net/minecraft/class_1_816 ARG 6 maxSectionZ METHOD method_1_5020 shouldDrawEntityOutlines (Lnet/minecraft/class_4184;)Z ARG 1 camera + METHOD method_1_5021 getSectionCount ()D diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderManager.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderManager.mapping index 67002d9926..c4a2eb7960 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderManager.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEntityRenderManager + FIELD field_1_2243 blockModelManager Lnet/minecraft/class_1_394; FIELD field_4342 textRenderer Lnet/minecraft/class_327; FIELD field_4345 renderers Ljava/util/Map; FIELD field_27746 entityModelsGetter Ljava/util/function/Supplier; @@ -10,9 +11,13 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti METHOD (Lnet/minecraft/class_327;Ljava/util/function/Supplier;Lnet/minecraft/class_1_394;Lnet/minecraft/class_10442;Lnet/minecraft/class_898;Lnet/minecraft/class_11701;Lnet/minecraft/class_11786;)V ARG 1 textRenderer ARG 2 entityModelsGetter + ARG 3 blockModelManager + ARG 4 itemModelManager ARG 5 entityRenderDispatcher + ARG 6 spriteHolder ARG 7 playerSkinCache METHOD method_3549 configure (Lnet/minecraft/class_243;)V + ARG 1 cameraPos METHOD method_3550 get (Lnet/minecraft/class_2586;)Lnet/minecraft/class_827; ARG 1 blockEntity METHOD method_3555 render (Lnet/minecraft/class_11954;Lnet/minecraft/class_4587;Lnet/minecraft/class_11659;Lnet/minecraft/class_12075;)V @@ -24,5 +29,6 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti ARG 1 blockEntity ARG 2 tickProgress ARG 3 crumblingOverlay + ARG 4 outside METHOD method_74349 getByRenderState (Lnet/minecraft/class_11954;)Lnet/minecraft/class_827; ARG 1 renderState diff --git a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping index ca65a363bd..75e8148236 100644 --- a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_838 net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer + FIELD field_63584 STRUCTURE_VOID_COLOR I METHOD method_3585 renderInvisibleBlocks (Lnet/minecraft/class_11955;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;)V ARG 1 state ARG 2 pos @@ -7,6 +8,11 @@ CLASS net/minecraft/class_838 net/minecraft/client/render/block/entity/Structure ARG 1 state ARG 2 pos ARG 3 size + METHOD method_61048 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;III)V + ARG 1 direction + ARG 2 x + ARG 3 y + ARG 4 z METHOD method_74357 updateStructureBoxRenderState (Lnet/minecraft/class_2586;Lnet/minecraft/class_11955;)V ARG 0 blockEntity ARG 1 state diff --git a/mappings/net/minecraft/client/render/block/entity/state/StructureBlockBlockEntityRenderState.mapping b/mappings/net/minecraft/client/render/block/entity/state/StructureBlockBlockEntityRenderState.mapping index 957533b0fd..6cb00f4044 100644 --- a/mappings/net/minecraft/client/render/block/entity/state/StructureBlockBlockEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/block/entity/state/StructureBlockBlockEntityRenderState.mapping @@ -3,4 +3,5 @@ CLASS net/minecraft/class_11955 net/minecraft/client/render/block/entity/state/S FIELD field_62679 renderMode Lnet/minecraft/class_10634$class_10635; FIELD field_62680 structureBox Lnet/minecraft/class_10634$class_10636; FIELD field_62681 invisibleBlocks [Lnet/minecraft/class_11955$class_11956; + FIELD field_62682 structureVoidPresences [Z CLASS class_11956 InvisibleRenderType diff --git a/mappings/net/minecraft/util/profiler/DebugRecorder.mapping b/mappings/net/minecraft/util/profiler/DebugRecorder.mapping index 32fb950d09..bc2c4873fb 100644 --- a/mappings/net/minecraft/util/profiler/DebugRecorder.mapping +++ b/mappings/net/minecraft/util/profiler/DebugRecorder.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_5961 net/minecraft/util/profiler/DebugRecorder ARG 4 dumper ARG 5 resultConsumer ARG 6 dumpConsumer + METHOD method_1_5112 sample (Lnet/minecraft/class_5965$class_1_815;)V + ARG 1 stage METHOD method_34762 checkState ()V METHOD method_34763 dump (Lnet/minecraft/class_3696;)V ARG 1 result diff --git a/mappings/net/minecraft/util/profiler/Recorder.mapping b/mappings/net/minecraft/util/profiler/Recorder.mapping index 6c4401b6f9..4a44b29f07 100644 --- a/mappings/net/minecraft/util/profiler/Recorder.mapping +++ b/mappings/net/minecraft/util/profiler/Recorder.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5962 net/minecraft/util/profiler/Recorder + METHOD method_1_5103 extract ()V METHOD method_34770 stop ()V METHOD method_34771 startTick ()V METHOD method_34772 endTick ()V diff --git a/mappings/net/minecraft/util/profiler/Sampler.mapping b/mappings/net/minecraft/util/profiler/Sampler.mapping index 60dc45ef3a..8f9861c8d5 100644 --- a/mappings/net/minecraft/util/profiler/Sampler.mapping +++ b/mappings/net/minecraft/util/profiler/Sampler.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5965 net/minecraft/util/profiler/Sampler + FIELD field_1_5771 stage Lnet/minecraft/class_5965$class_1_815; FIELD field_29598 type Lnet/minecraft/class_5949; FIELD field_29599 retriever Ljava/util/function/DoubleSupplier; FIELD field_29600 valueBuffer Lio/netty/buffer/ByteBuf; @@ -10,17 +11,22 @@ CLASS net/minecraft/class_5965 net/minecraft/util/profiler/Sampler FIELD field_33884 currentSample D METHOD (Ljava/lang/String;Lnet/minecraft/class_5965$class_1_815;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;Ljava/lang/Runnable;Lnet/minecraft/class_5965$class_5967;)V ARG 1 name + ARG 2 stage + ARG 3 type ARG 4 retriever ARG 5 startAction ARG 6 deviationChecker METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_34776 (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965; + METHOD method_1_4983 getStage ()Lnet/minecraft/class_5965$class_1_815; + METHOD method_34776 endTick (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965; ARG 0 name ARG 1 type ARG 2 retriever - METHOD method_34778 (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965; + METHOD method_34778 extract (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965; + ARG 0 name ARG 1 type + ARG 2 retriever METHOD method_34779 builder (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)Lnet/minecraft/class_5965$class_5966; ARG 0 name ARG 1 type @@ -36,7 +42,9 @@ CLASS net/minecraft/class_5965 net/minecraft/util/profiler/Sampler METHOD method_37172 getType ()Lnet/minecraft/class_5949; METHOD method_37173 collectData ()Lnet/minecraft/class_5965$class_6398; METHOD method_37174 hasDeviated ()Z + CLASS class_1_815 Stage CLASS class_5966 Builder + FIELD field_1_5772 stage Lnet/minecraft/class_5965$class_1_815; FIELD field_29605 timeGetter Ljava/util/function/DoubleSupplier; FIELD field_29606 context Ljava/lang/Object; FIELD field_29607 startAction Ljava/lang/Runnable; @@ -44,9 +52,12 @@ CLASS net/minecraft/class_5965 net/minecraft/util/profiler/Sampler FIELD field_33885 name Ljava/lang/String; FIELD field_33886 type Lnet/minecraft/class_5949; METHOD (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)V + ARG 1 name ARG 2 type ARG 3 timeFunction ARG 4 context + METHOD method_1_4984 stage (Lnet/minecraft/class_5965$class_1_815;)Lnet/minecraft/class_5965$class_5966; + ARG 1 stage METHOD method_34787 build ()Lnet/minecraft/class_5965; METHOD method_34788 deviationChecker (Lnet/minecraft/class_5965$class_5967;)Lnet/minecraft/class_5965$class_5966; ARG 1 deviationChecker From 363ebdc7b6a31c44fb74fe6a0ea0644150405818 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 15 Apr 2026 23:09:21 -0400 Subject: [PATCH 14/14] Add name for class_1_790 --- mappings/net/minecraft/client/render/WorldExtractor.mapping | 6 ++++++ .../render/chunk/ChunkSectionTracker.mapping} | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) rename mappings/net/minecraft/{class_1_790.mapping => client/render/chunk/ChunkSectionTracker.mapping} (93%) diff --git a/mappings/net/minecraft/client/render/WorldExtractor.mapping b/mappings/net/minecraft/client/render/WorldExtractor.mapping index 6e7d775947..7cc10013c8 100644 --- a/mappings/net/minecraft/client/render/WorldExtractor.mapping +++ b/mappings/net/minecraft/client/render/WorldExtractor.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1_816 net/minecraft/client/render/WorldExtractor FIELD field_1_5793 client Lnet/minecraft/class_310; FIELD field_1_5794 pitchd2 D FIELD field_1_5795 yawd2 D + FIELD field_1_5796 sectionTracker Lnet/minecraft/class_1_790; FIELD field_1_5797 rebuildChunks Z FIELD field_1_5798 recreateTerrainSampler Z FIELD field_1_5799 clearWorldRenderer Z @@ -25,12 +26,17 @@ CLASS net/minecraft/class_1_816 net/minecraft/client/render/WorldExtractor ARG 2 flags METHOD method_1_4999 startGizmos ()Lnet/minecraft/class_12180$class_12181; METHOD method_1_5000 getRenderedSectionCount ()I + METHOD method_1_5001 getEntityRenderStats ()Ljava/lang/String; METHOD method_1_5002 render (Lnet/minecraft/class_9779;Lnet/minecraft/class_4184;F)V ARG 1 tickCounter ARG 2 camera ARG 3 tickProgress METHOD method_1_5003 renderBlockBreaking (Lnet/minecraft/class_4184;Lnet/minecraft/class_11658;)V + ARG 1 camera + ARG 2 worldRenderStateOut METHOD method_1_5004 renderBlockOutline (Lnet/minecraft/class_4184;Lnet/minecraft/class_11658;)V + ARG 1 camera + ARG 2 worldRenderStateOut METHOD method_1_5005 getAndUpdateRenderState (Lnet/minecraft/class_1297;F)Lnet/minecraft/class_10017; ARG 1 entity ARG 2 tickProgress diff --git a/mappings/net/minecraft/class_1_790.mapping b/mappings/net/minecraft/client/render/chunk/ChunkSectionTracker.mapping similarity index 93% rename from mappings/net/minecraft/class_1_790.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkSectionTracker.mapping index d8c7c74c4b..2fa5d6716b 100644 --- a/mappings/net/minecraft/class_1_790.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkSectionTracker.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1_790 +CLASS net/minecraft/class_1_790 net/minecraft/client/render/chunk/ChunkSectionTracker FIELD field_1_5600 storage Lnet/minecraft/class_1_797; METHOD (Lnet/minecraft/class_5539;I)V ARG 1 world