From 388b5c4ad0c1b4b4e58ee426a7aaafdc40b8587f Mon Sep 17 00:00:00 2001 From: Natan Junges Date: Sun, 2 Jul 2023 18:11:12 -0300 Subject: [PATCH 01/12] Move ClientFieldsAreNonnullByDefault into client hierarchy --- .../util/annotation/ClientFieldsAreNonnullByDefault.mapping | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename mappings/net/minecraft/{ => client}/util/annotation/ClientFieldsAreNonnullByDefault.mapping (61%) diff --git a/mappings/net/minecraft/util/annotation/ClientFieldsAreNonnullByDefault.mapping b/mappings/net/minecraft/client/util/annotation/ClientFieldsAreNonnullByDefault.mapping similarity index 61% rename from mappings/net/minecraft/util/annotation/ClientFieldsAreNonnullByDefault.mapping rename to mappings/net/minecraft/client/util/annotation/ClientFieldsAreNonnullByDefault.mapping index fe0d0b465a..0af8fb947e 100644 --- a/mappings/net/minecraft/util/annotation/ClientFieldsAreNonnullByDefault.mapping +++ b/mappings/net/minecraft/client/util/annotation/ClientFieldsAreNonnullByDefault.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6178 net/minecraft/util/annotation/ClientFieldsAreNonnullByDefault +CLASS net/minecraft/class_6178 net/minecraft/client/util/annotation/ClientFieldsAreNonnullByDefault COMMENT Specifies that all fields in the annotated package/class are nonnull COMMENT unless nullability is specified with a separate annotation. COMMENT @@ -7,5 +7,5 @@ CLASS net/minecraft/class_6178 net/minecraft/util/annotation/ClientFieldsAreNonn COMMENT COMMENT

This annotation is used on the client exclusively. COMMENT - COMMENT @see FieldsAreNonnullByDefault - COMMENT @see FieldsAreNonnullByDefault2 + COMMENT @see net.minecraft.util.annotation.FieldsAreNonnullByDefault + COMMENT @see net.minecraft.util.annotation.FieldsAreNonnullByDefault2 From e5c95729bcd4d94f2a9eeeb0366926be1dd2b3ab Mon Sep 17 00:00:00 2001 From: Natan Junges Date: Sun, 2 Jul 2023 18:15:19 -0300 Subject: [PATCH 02/12] Move ClientMethodsReturnNonnullByDefault into client hierarchy --- .../annotation/ClientMethodsReturnNonnullByDefault.mapping | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename mappings/net/minecraft/{ => client}/util/annotation/ClientMethodsReturnNonnullByDefault.mapping (61%) diff --git a/mappings/net/minecraft/util/annotation/ClientMethodsReturnNonnullByDefault.mapping b/mappings/net/minecraft/client/util/annotation/ClientMethodsReturnNonnullByDefault.mapping similarity index 61% rename from mappings/net/minecraft/util/annotation/ClientMethodsReturnNonnullByDefault.mapping rename to mappings/net/minecraft/client/util/annotation/ClientMethodsReturnNonnullByDefault.mapping index 3816d878dc..6c0c41ea60 100644 --- a/mappings/net/minecraft/util/annotation/ClientMethodsReturnNonnullByDefault.mapping +++ b/mappings/net/minecraft/client/util/annotation/ClientMethodsReturnNonnullByDefault.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6179 net/minecraft/util/annotation/ClientMethodsReturnNonnullByDefault +CLASS net/minecraft/class_6179 net/minecraft/client/util/annotation/ClientMethodsReturnNonnullByDefault COMMENT Specifies that all methods in the annotated package/class return nonnull COMMENT values unless nullability is specified with a separate annotation. COMMENT @@ -7,5 +7,5 @@ CLASS net/minecraft/class_6179 net/minecraft/util/annotation/ClientMethodsReturn COMMENT COMMENT

This annotation is used on the client exclusively. COMMENT - COMMENT @see MethodsReturnNonnullByDefault - COMMENT @see MathMethodsReturnNonnullByDefault + COMMENT @see net.minecraft.util.annotation.MethodsReturnNonnullByDefault + COMMENT @see net.minecraft.util.annotation.MathMethodsReturnNonnullByDefault From b227d0a7b77fdc6a4424ff405b67453d1d9392c2 Mon Sep 17 00:00:00 2001 From: Natan Junges Date: Sun, 2 Jul 2023 18:17:39 -0300 Subject: [PATCH 03/12] Move DeobfuscateClass into client hierarchy --- .../{ => client}/util/annotation/DeobfuscateClass.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename mappings/net/minecraft/{ => client}/util/annotation/DeobfuscateClass.mapping (72%) diff --git a/mappings/net/minecraft/util/annotation/DeobfuscateClass.mapping b/mappings/net/minecraft/client/util/annotation/DeobfuscateClass.mapping similarity index 72% rename from mappings/net/minecraft/util/annotation/DeobfuscateClass.mapping rename to mappings/net/minecraft/client/util/annotation/DeobfuscateClass.mapping index b955f8efca..049180c2e0 100644 --- a/mappings/net/minecraft/util/annotation/DeobfuscateClass.mapping +++ b/mappings/net/minecraft/client/util/annotation/DeobfuscateClass.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6177 net/minecraft/util/annotation/DeobfuscateClass +CLASS net/minecraft/class_6177 net/minecraft/client/util/annotation/DeobfuscateClass COMMENT An annotation on classes. When a class is annotated, the class itself and its COMMENT fields and methods are not obfuscated. Mainly used by blaze3d. COMMENT From 4cb31debfa62830961d03707c8fcd812b9463f2b Mon Sep 17 00:00:00 2001 From: Natan Junges Date: Sun, 2 Jul 2023 18:23:22 -0300 Subject: [PATCH 04/12] Move ParticleGroup out of client hierarchy --- .../minecraft/{client => }/particle/ParticleGroup.mapping | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename mappings/net/minecraft/{client => }/particle/ParticleGroup.mapping (78%) diff --git a/mappings/net/minecraft/client/particle/ParticleGroup.mapping b/mappings/net/minecraft/particle/ParticleGroup.mapping similarity index 78% rename from mappings/net/minecraft/client/particle/ParticleGroup.mapping rename to mappings/net/minecraft/particle/ParticleGroup.mapping index 7c4c7e7512..972b80a921 100644 --- a/mappings/net/minecraft/client/particle/ParticleGroup.mapping +++ b/mappings/net/minecraft/particle/ParticleGroup.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_5878 net/minecraft/client/particle/ParticleGroup +CLASS net/minecraft/class_5878 net/minecraft/particle/ParticleGroup COMMENT A group for particles. This group imposes a limit on the numbers of COMMENT particles from this group rendered in a particle manager. Additional COMMENT particles will be discarded when attempted to be rendered. COMMENT - COMMENT @see Particle#getGroup() + COMMENT @see net.minecraft.client.particle.Particle#getGroup() FIELD field_29077 SPORE_BLOSSOM_AIR Lnet/minecraft/class_5878; - COMMENT The group for the {@linkplain net.minecraft.particle.ParticleTypes#SPORE_BLOSSOM_AIR + COMMENT The group for the {@linkplain ParticleTypes#SPORE_BLOSSOM_AIR COMMENT minecraft:spore_blossom_air} particle type. It has a count limit of 1000. FIELD field_29078 maxCount I METHOD (I)V From b6eceacaa858e28b838847958685908bbaa30df6 Mon Sep 17 00:00:00 2001 From: Natan Junges Date: Sun, 2 Jul 2023 18:27:37 -0300 Subject: [PATCH 05/12] Move SmoothUtil out of client hierarchy --- .../net/minecraft/{client/util => util/math}/SmoothUtil.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename mappings/net/minecraft/{client/util => util/math}/SmoothUtil.mapping (74%) diff --git a/mappings/net/minecraft/client/util/SmoothUtil.mapping b/mappings/net/minecraft/util/math/SmoothUtil.mapping similarity index 74% rename from mappings/net/minecraft/client/util/SmoothUtil.mapping rename to mappings/net/minecraft/util/math/SmoothUtil.mapping index 464f34aac2..5010118cd5 100644 --- a/mappings/net/minecraft/client/util/SmoothUtil.mapping +++ b/mappings/net/minecraft/util/math/SmoothUtil.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3540 net/minecraft/client/util/SmoothUtil +CLASS net/minecraft/class_3540 net/minecraft/util/math/SmoothUtil FIELD field_15758 movementLatency D FIELD field_15759 smoothedSum D FIELD field_15760 actualSum D From fe2488a82648c073ced4402f8f539ea460a6b312 Mon Sep 17 00:00:00 2001 From: Natan Junges Date: Sun, 2 Jul 2023 18:31:32 -0300 Subject: [PATCH 06/12] Move ClientEntityManager out of client hierarchy --- .../{client/world => world/entity}/ClientEntityManager.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename mappings/net/minecraft/{client/world => world/entity}/ClientEntityManager.mapping (96%) diff --git a/mappings/net/minecraft/client/world/ClientEntityManager.mapping b/mappings/net/minecraft/world/entity/ClientEntityManager.mapping similarity index 96% rename from mappings/net/minecraft/client/world/ClientEntityManager.mapping rename to mappings/net/minecraft/world/entity/ClientEntityManager.mapping index 5162717d8f..70875b4752 100644 --- a/mappings/net/minecraft/client/world/ClientEntityManager.mapping +++ b/mappings/net/minecraft/world/entity/ClientEntityManager.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager +CLASS net/minecraft/class_5582 net/minecraft/world/entity/ClientEntityManager FIELD field_27279 LOGGER Lorg/slf4j/Logger; FIELD field_27280 handler Lnet/minecraft/class_5576; FIELD field_27281 index Lnet/minecraft/class_5570; From 4ea8eb5aaf8009f717b5daf1221ccf133ccb7145 Mon Sep 17 00:00:00 2001 From: natanjunges Date: Sun, 2 Jul 2023 18:53:28 -0300 Subject: [PATCH 07/12] Update cross references of moved classes --- .../projects/sharedData/yarn-mappings-v2.tiny | 12 ++++++------ .../annotation/FieldsAreNonnullByDefault.mapping | 2 +- .../annotation/FieldsAreNonnullByDefault2.mapping | 2 +- .../annotation/MethodsReturnNonnullByDefault.mapping | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny index f2e15dd82d..33170bd75c 100644 --- a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny +++ b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny @@ -4421,7 +4421,7 @@ c net/minecraft/class_3748 net/minecraft/block/JigsawBlock p 0 info1 c net/minecraft/class_2417 net/minecraft/data/server/StoryTabAdvancementGenerator m (Ljava/util/function/Consumer;)V method_10347 accept -c net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager +c net/minecraft/class_5582 net/minecraft/world/entity/ClientEntityManager m (Lnet/minecraft/class_1923;)V method_31875 stopTicking p 1 pos m (Lnet/minecraft/class_1923;)V method_31869 startTicking @@ -4449,7 +4449,7 @@ c net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager f Lnet/minecraft/class_5573; field_27282 cache f Lorg/apache/logging/log4j/Logger; field_27279 LOGGER f Lnet/minecraft/class_5570; field_27281 index -c net/minecraft/class_5582$class_5583 net/minecraft/client/world/ClientEntityManager$Listener +c net/minecraft/class_5582$class_5583 net/minecraft/world/entity/ClientEntityManager$Listener f Lnet/minecraft/class_5582; field_27285 manager m (Lnet/minecraft/class_5582;Lnet/minecraft/class_5568;JLnet/minecraft/class_5572;)V p 3 lastSectionPos @@ -56914,10 +56914,10 @@ c net/minecraft/class_5875 net/minecraft/world/gen/feature/ScatteredOreFeature p 2 random p 3 origin p 4 spread -c net/minecraft/class_5878 net/minecraft/client/particle/ParticleGroup - c A group for particles. This group imposes a limit on the numbers of\nparticles from this group rendered in a particle manager. Additional\nparticles will be discarded when attempted to be rendered.\n\n@see Particle#getGroup() +c net/minecraft/class_5878 net/minecraft/particle/ParticleGroup + c A group for particles. This group imposes a limit on the numbers of\nparticles from this group rendered in a particle manager. Additional\nparticles will be discarded when attempted to be rendered.\n\n@see net.minecraft.client.particle.Particle#getGroup() f Lnet/minecraft/class_5878; field_29077 SPORE_BLOSSOM_AIR - c The group for the {@linkplain net.minecraft.particle.ParticleTypes#SPORE_BLOSSOM_AIR\nminecraft:spore_blossom_air} particle type. It has a count limit of 1000. + c The group for the {@linkplain ParticleTypes#SPORE_BLOSSOM_AIR\nminecraft:spore_blossom_air} particle type. It has a count limit of 1000. f I field_29078 maxCount m (I)V c Creates a particle group with a custom {@code max} particle count. @@ -66389,7 +66389,7 @@ c net/minecraft/class_4870 net/minecraft/client/realms/dto/Ops f Ljava/util/Set; field_22579 ops m (Ljava/lang/String;)Lnet/minecraft/class_4870; method_25039 parse p 0 json -c net/minecraft/class_3540 net/minecraft/client/util/SmoothUtil +c net/minecraft/class_3540 net/minecraft/util/math/SmoothUtil f D field_15760 actualSum m (DD)D method_15429 smooth p 3 smoother diff --git a/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault.mapping b/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault.mapping index 2f1f1523ec..447a0eee33 100644 --- a/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault.mapping +++ b/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault.mapping @@ -8,5 +8,5 @@ CLASS net/minecraft/class_6319 net/minecraft/util/annotation/FieldsAreNonnullByD COMMENT

A similar {@link FieldsAreNonnullByDefault2} exists; they don't coexist COMMENT on any package info class. COMMENT - COMMENT @see ClientFieldsAreNonnullByDefault + COMMENT @see net.minecraft.client.util.annotation.ClientFieldsAreNonnullByDefault COMMENT @see FieldsAreNonnullByDefault2 diff --git a/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault2.mapping b/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault2.mapping index 63afca55bf..4855c93a75 100644 --- a/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault2.mapping +++ b/mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault2.mapping @@ -8,5 +8,5 @@ CLASS net/minecraft/class_6037 net/minecraft/util/annotation/FieldsAreNonnullByD COMMENT

This is pretty much identical to {@link FieldsAreNonnullByDefault} that they COMMENT are used on different package info files and never coexist. COMMENT - COMMENT @see ClientFieldsAreNonnullByDefault + COMMENT @see net.minecraft.client.util.annotation.ClientFieldsAreNonnullByDefault COMMENT @see FieldsAreNonnullByDefault diff --git a/mappings/net/minecraft/util/annotation/MethodsReturnNonnullByDefault.mapping b/mappings/net/minecraft/util/annotation/MethodsReturnNonnullByDefault.mapping index 6bf06de210..f3bb2f22d7 100644 --- a/mappings/net/minecraft/util/annotation/MethodsReturnNonnullByDefault.mapping +++ b/mappings/net/minecraft/util/annotation/MethodsReturnNonnullByDefault.mapping @@ -5,5 +5,5 @@ CLASS net/minecraft/class_6328 net/minecraft/util/annotation/MethodsReturnNonnul COMMENT

While this annotation is meant to be a package/class annotation, it can COMMENT be applied to anything as it does not restrict its targets. COMMENT - COMMENT @see ClientMethodsReturnNonnullByDefault + COMMENT @see net.minecraft.client.util.annotation.ClientMethodsReturnNonnullByDefault COMMENT @see MathMethodsReturnNonnullByDefault From 139f6c86a751cf8a6dba75353e496f4c3ed51a78 Mon Sep 17 00:00:00 2001 From: natanjunges Date: Sun, 2 Jul 2023 19:25:13 -0300 Subject: [PATCH 08/12] Move WorldGenerationProgressTracker out of client hierarchy --- .../test/resources/projects/sharedData/yarn-mappings-v2.tiny | 2 +- .../gui => server/world}/WorldGenerationProgressTracker.mapping | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename mappings/net/minecraft/{client/gui => server/world}/WorldGenerationProgressTracker.mapping (86%) diff --git a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny index 33170bd75c..d2503af21a 100644 --- a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny +++ b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny @@ -23875,7 +23875,7 @@ c net/minecraft/class_3952 net/minecraft/server/QueueingWorldGenerationProgressL m (Lnet/minecraft/class_3949;Ljava/util/concurrent/Executor;)V p 1 progressListener f Lnet/minecraft/class_3846; field_17473 queue -c net/minecraft/class_3953 net/minecraft/client/gui/WorldGenerationProgressTracker +c net/minecraft/class_3953 net/minecraft/server/world/WorldGenerationProgressTracker m (I)V p 1 radius f I field_17478 radius diff --git a/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping b/mappings/net/minecraft/server/world/WorldGenerationProgressTracker.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping rename to mappings/net/minecraft/server/world/WorldGenerationProgressTracker.mapping index 1abd3e6770..90d14b8bbf 100644 --- a/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping +++ b/mappings/net/minecraft/server/world/WorldGenerationProgressTracker.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3953 net/minecraft/client/gui/WorldGenerationProgressTracker +CLASS net/minecraft/class_3953 net/minecraft/server/world/WorldGenerationProgressTracker FIELD field_17474 progressLogger Lnet/minecraft/class_3951; FIELD field_17475 chunkStatuses Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; FIELD field_17476 spawnPos Lnet/minecraft/class_1923; From e033c6476a807a25da1031c56fc4927ccd3e93bd Mon Sep 17 00:00:00 2001 From: natanjunges Date: Sun, 2 Jul 2023 19:34:42 -0300 Subject: [PATCH 09/12] Move BundleTooltipData and TooltipData out of client hierarchy --- .../test/resources/projects/sharedData/yarn-mappings-v2.tiny | 4 ++-- mappings/net/minecraft/client/item/TooltipData.mapping | 1 - .../{client/item => item/tooltip}/BundleTooltipData.mapping | 2 +- mappings/net/minecraft/item/tooltip/TooltipData.mapping | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 mappings/net/minecraft/client/item/TooltipData.mapping rename mappings/net/minecraft/{client/item => item/tooltip}/BundleTooltipData.mapping (79%) create mode 100644 mappings/net/minecraft/item/tooltip/TooltipData.mapping diff --git a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny index d2503af21a..ba1d0a10f3 100644 --- a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny +++ b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny @@ -34167,7 +34167,7 @@ c net/minecraft/class_1279 net/minecraft/util/snooper/SnooperListener p 1 snooper m (Lnet/minecraft/class_1276;)V method_35034 addInitialSnooperInfo p 1 snooper -c net/minecraft/class_5632 net/minecraft/client/item/TooltipData +c net/minecraft/class_5632 net/minecraft/item/tooltip/TooltipData c net/minecraft/class_4301 net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix m (Lcom/mojang/datafixers/schemas/Schema;Z)V p 1 outputSchema @@ -34187,7 +34187,7 @@ c net/minecraft/class_1278 net/minecraft/inventory/SidedInventory m (Lnet/minecraft/class_2350;)[I method_5494 getAvailableSlots c Gets the available slot positions that are reachable from a given side. p 1 side -c net/minecraft/class_5631 net/minecraft/client/item/BundleTooltipData +c net/minecraft/class_5631 net/minecraft/item/tooltip/BundleTooltipData m ()I method_32341 getBundleOccupancy f Lnet/minecraft/class_2371; field_27874 inventory m (Lnet/minecraft/class_2371;I)V diff --git a/mappings/net/minecraft/client/item/TooltipData.mapping b/mappings/net/minecraft/client/item/TooltipData.mapping deleted file mode 100644 index b6f4208c9d..0000000000 --- a/mappings/net/minecraft/client/item/TooltipData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5632 net/minecraft/client/item/TooltipData diff --git a/mappings/net/minecraft/client/item/BundleTooltipData.mapping b/mappings/net/minecraft/item/tooltip/BundleTooltipData.mapping similarity index 79% rename from mappings/net/minecraft/client/item/BundleTooltipData.mapping rename to mappings/net/minecraft/item/tooltip/BundleTooltipData.mapping index 303478f618..26f2f93bba 100644 --- a/mappings/net/minecraft/client/item/BundleTooltipData.mapping +++ b/mappings/net/minecraft/item/tooltip/BundleTooltipData.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5631 net/minecraft/client/item/BundleTooltipData +CLASS net/minecraft/class_5631 net/minecraft/item/tooltip/BundleTooltipData FIELD field_27874 inventory Lnet/minecraft/class_2371; FIELD field_28353 bundleOccupancy I METHOD (Lnet/minecraft/class_2371;I)V diff --git a/mappings/net/minecraft/item/tooltip/TooltipData.mapping b/mappings/net/minecraft/item/tooltip/TooltipData.mapping new file mode 100644 index 0000000000..841e9f9192 --- /dev/null +++ b/mappings/net/minecraft/item/tooltip/TooltipData.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5632 net/minecraft/item/tooltip/TooltipData From 0c9a0a43e2218e6d64524b25028f17c9f24d8625 Mon Sep 17 00:00:00 2001 From: natanjunges Date: Sun, 2 Jul 2023 19:41:14 -0300 Subject: [PATCH 10/12] Move SkinOverlayOwner out of client hierarchy --- .../test/resources/projects/sharedData/yarn-mappings-v2.tiny | 2 +- .../client/render/entity/feature/SkinOverlayOwner.mapping | 2 -- mappings/net/minecraft/entity/SkinOverlayOwner.mapping | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 mappings/net/minecraft/client/render/entity/feature/SkinOverlayOwner.mapping create mode 100644 mappings/net/minecraft/entity/SkinOverlayOwner.mapping diff --git a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny index ba1d0a10f3..11e9dcb8b3 100644 --- a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny +++ b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny @@ -61547,7 +61547,7 @@ c net/minecraft/class_3251 net/minecraft/server/network/ServerQueryNetworkHandle f Lnet/minecraft/server/MinecraftServer; field_14180 server f Lnet/minecraft/class_2535; field_14178 connection f Z field_14177 responseSent -c net/minecraft/class_4582 net/minecraft/client/render/entity/feature/SkinOverlayOwner +c net/minecraft/class_4582 net/minecraft/entity/SkinOverlayOwner m ()Z method_6872 shouldRenderOverlay c net/minecraft/class_3252 net/minecraft/world/gen/decorator/DepthAverageDecorator m (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_3277;I)I method_33871 getY diff --git a/mappings/net/minecraft/client/render/entity/feature/SkinOverlayOwner.mapping b/mappings/net/minecraft/client/render/entity/feature/SkinOverlayOwner.mapping deleted file mode 100644 index c6f6633e7f..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/SkinOverlayOwner.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4582 net/minecraft/client/render/entity/feature/SkinOverlayOwner - METHOD method_6872 shouldRenderOverlay ()Z diff --git a/mappings/net/minecraft/entity/SkinOverlayOwner.mapping b/mappings/net/minecraft/entity/SkinOverlayOwner.mapping new file mode 100644 index 0000000000..f0389e838a --- /dev/null +++ b/mappings/net/minecraft/entity/SkinOverlayOwner.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4582 net/minecraft/entity/SkinOverlayOwner + METHOD method_6872 shouldRenderOverlay ()Z From 344ede09ca31b029a6074a201fc0253427138ccb Mon Sep 17 00:00:00 2001 From: natanjunges Date: Sun, 2 Jul 2023 19:45:16 -0300 Subject: [PATCH 11/12] Move ParticleUtil out of client hierarchy --- .../test/resources/projects/sharedData/yarn-mappings-v2.tiny | 2 +- .../minecraft/{client/util => particle}/ParticleUtil.mapping | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename mappings/net/minecraft/{client/util => particle}/ParticleUtil.mapping (95%) diff --git a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny index 11e9dcb8b3..ea4b80a465 100644 --- a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny +++ b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny @@ -50211,7 +50211,7 @@ c net/minecraft/class_4615 net/minecraft/nbt/NbtTypes c Gets the associated {@linkplain NbtType NBT type} for a given {@code id}.\n

\nThis method does not support id aliases.\n\n@return the NBT type, or {@linkplain NbtType#createInvalid an invalid type} if there is no type with the given {@code id} p 0 id f [Lnet/minecraft/class_4614; field_21048 VALUES -c net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil +c net/minecraft/class_5945 net/minecraft/particle/ParticleUtil m (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;DLnet/minecraft/class_2394;Lnet/minecraft/class_6019;)V method_34683 spawnParticle p 3 variance p 2 pos diff --git a/mappings/net/minecraft/client/util/ParticleUtil.mapping b/mappings/net/minecraft/particle/ParticleUtil.mapping similarity index 95% rename from mappings/net/minecraft/client/util/ParticleUtil.mapping rename to mappings/net/minecraft/particle/ParticleUtil.mapping index 9ed9bfda50..7a8cdffb3d 100644 --- a/mappings/net/minecraft/client/util/ParticleUtil.mapping +++ b/mappings/net/minecraft/particle/ParticleUtil.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil +CLASS net/minecraft/class_5945 net/minecraft/particle/ParticleUtil METHOD method_34681 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2394;Lnet/minecraft/class_243;D)V ARG 0 world ARG 1 pos From d5def763d997d96d0d8289d03da36d5016c6e26f Mon Sep 17 00:00:00 2001 From: natanjunges Date: Mon, 3 Jul 2023 19:34:59 -0300 Subject: [PATCH 12/12] Revert changes to yarn-mappings-v2.tiny --- .../projects/sharedData/yarn-mappings-v2.tiny | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny index ea4b80a465..f2e15dd82d 100644 --- a/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny +++ b/filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny @@ -4421,7 +4421,7 @@ c net/minecraft/class_3748 net/minecraft/block/JigsawBlock p 0 info1 c net/minecraft/class_2417 net/minecraft/data/server/StoryTabAdvancementGenerator m (Ljava/util/function/Consumer;)V method_10347 accept -c net/minecraft/class_5582 net/minecraft/world/entity/ClientEntityManager +c net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager m (Lnet/minecraft/class_1923;)V method_31875 stopTicking p 1 pos m (Lnet/minecraft/class_1923;)V method_31869 startTicking @@ -4449,7 +4449,7 @@ c net/minecraft/class_5582 net/minecraft/world/entity/ClientEntityManager f Lnet/minecraft/class_5573; field_27282 cache f Lorg/apache/logging/log4j/Logger; field_27279 LOGGER f Lnet/minecraft/class_5570; field_27281 index -c net/minecraft/class_5582$class_5583 net/minecraft/world/entity/ClientEntityManager$Listener +c net/minecraft/class_5582$class_5583 net/minecraft/client/world/ClientEntityManager$Listener f Lnet/minecraft/class_5582; field_27285 manager m (Lnet/minecraft/class_5582;Lnet/minecraft/class_5568;JLnet/minecraft/class_5572;)V p 3 lastSectionPos @@ -23875,7 +23875,7 @@ c net/minecraft/class_3952 net/minecraft/server/QueueingWorldGenerationProgressL m (Lnet/minecraft/class_3949;Ljava/util/concurrent/Executor;)V p 1 progressListener f Lnet/minecraft/class_3846; field_17473 queue -c net/minecraft/class_3953 net/minecraft/server/world/WorldGenerationProgressTracker +c net/minecraft/class_3953 net/minecraft/client/gui/WorldGenerationProgressTracker m (I)V p 1 radius f I field_17478 radius @@ -34167,7 +34167,7 @@ c net/minecraft/class_1279 net/minecraft/util/snooper/SnooperListener p 1 snooper m (Lnet/minecraft/class_1276;)V method_35034 addInitialSnooperInfo p 1 snooper -c net/minecraft/class_5632 net/minecraft/item/tooltip/TooltipData +c net/minecraft/class_5632 net/minecraft/client/item/TooltipData c net/minecraft/class_4301 net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix m (Lcom/mojang/datafixers/schemas/Schema;Z)V p 1 outputSchema @@ -34187,7 +34187,7 @@ c net/minecraft/class_1278 net/minecraft/inventory/SidedInventory m (Lnet/minecraft/class_2350;)[I method_5494 getAvailableSlots c Gets the available slot positions that are reachable from a given side. p 1 side -c net/minecraft/class_5631 net/minecraft/item/tooltip/BundleTooltipData +c net/minecraft/class_5631 net/minecraft/client/item/BundleTooltipData m ()I method_32341 getBundleOccupancy f Lnet/minecraft/class_2371; field_27874 inventory m (Lnet/minecraft/class_2371;I)V @@ -50211,7 +50211,7 @@ c net/minecraft/class_4615 net/minecraft/nbt/NbtTypes c Gets the associated {@linkplain NbtType NBT type} for a given {@code id}.\n

\nThis method does not support id aliases.\n\n@return the NBT type, or {@linkplain NbtType#createInvalid an invalid type} if there is no type with the given {@code id} p 0 id f [Lnet/minecraft/class_4614; field_21048 VALUES -c net/minecraft/class_5945 net/minecraft/particle/ParticleUtil +c net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil m (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;DLnet/minecraft/class_2394;Lnet/minecraft/class_6019;)V method_34683 spawnParticle p 3 variance p 2 pos @@ -56914,10 +56914,10 @@ c net/minecraft/class_5875 net/minecraft/world/gen/feature/ScatteredOreFeature p 2 random p 3 origin p 4 spread -c net/minecraft/class_5878 net/minecraft/particle/ParticleGroup - c A group for particles. This group imposes a limit on the numbers of\nparticles from this group rendered in a particle manager. Additional\nparticles will be discarded when attempted to be rendered.\n\n@see net.minecraft.client.particle.Particle#getGroup() +c net/minecraft/class_5878 net/minecraft/client/particle/ParticleGroup + c A group for particles. This group imposes a limit on the numbers of\nparticles from this group rendered in a particle manager. Additional\nparticles will be discarded when attempted to be rendered.\n\n@see Particle#getGroup() f Lnet/minecraft/class_5878; field_29077 SPORE_BLOSSOM_AIR - c The group for the {@linkplain ParticleTypes#SPORE_BLOSSOM_AIR\nminecraft:spore_blossom_air} particle type. It has a count limit of 1000. + c The group for the {@linkplain net.minecraft.particle.ParticleTypes#SPORE_BLOSSOM_AIR\nminecraft:spore_blossom_air} particle type. It has a count limit of 1000. f I field_29078 maxCount m (I)V c Creates a particle group with a custom {@code max} particle count. @@ -61547,7 +61547,7 @@ c net/minecraft/class_3251 net/minecraft/server/network/ServerQueryNetworkHandle f Lnet/minecraft/server/MinecraftServer; field_14180 server f Lnet/minecraft/class_2535; field_14178 connection f Z field_14177 responseSent -c net/minecraft/class_4582 net/minecraft/entity/SkinOverlayOwner +c net/minecraft/class_4582 net/minecraft/client/render/entity/feature/SkinOverlayOwner m ()Z method_6872 shouldRenderOverlay c net/minecraft/class_3252 net/minecraft/world/gen/decorator/DepthAverageDecorator m (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_3277;I)I method_33871 getY @@ -66389,7 +66389,7 @@ c net/minecraft/class_4870 net/minecraft/client/realms/dto/Ops f Ljava/util/Set; field_22579 ops m (Ljava/lang/String;)Lnet/minecraft/class_4870; method_25039 parse p 0 json -c net/minecraft/class_3540 net/minecraft/util/math/SmoothUtil +c net/minecraft/class_3540 net/minecraft/client/util/SmoothUtil f D field_15760 actualSum m (DD)D method_15429 smooth p 3 smoother