Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enforcing sidedness for client package #3601

Draft
wants to merge 13 commits into
base: 1.20.1
Choose a base branch
from
Draft

Enforcing sidedness for client package #3601

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
388b5c4
Move ClientFieldsAreNonnullByDefault into client hierarchy
natanjunges Jul 2, 2023
e5c9572
Move ClientMethodsReturnNonnullByDefault into client hierarchy
natanjunges Jul 2, 2023
b227d0a
Move DeobfuscateClass into client hierarchy
natanjunges Jul 2, 2023
4cb31de
Move ParticleGroup out of client hierarchy
natanjunges Jul 2, 2023
b6eceac
Move SmoothUtil out of client hierarchy
natanjunges Jul 2, 2023
fe2488a
Move ClientEntityManager out of client hierarchy
natanjunges Jul 2, 2023
4ea8eb5
Update cross references of moved classes
natanjunges Jul 2, 2023
139f6c8
Move WorldGenerationProgressTracker out of client hierarchy
natanjunges Jul 2, 2023
e033c64
Move BundleTooltipData and TooltipData out of client hierarchy
natanjunges Jul 2, 2023
0c9a0a4
Move SkinOverlayOwner out of client hierarchy
natanjunges Jul 2, 2023
344ede0
Move ParticleUtil out of client hierarchy
natanjunges Jul 2, 2023
d5def76
Revert changes to yarn-mappings-v2.tiny
natanjunges Jul 3, 2023
6f0d73d
Merge branch 'FabricMC:1.20.1' into 1.20.1
natanjunges Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions filament/src/test/resources/projects/sharedData/yarn-mappings-v2.tiny
View file
Open in desktop
natanjunges marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <init> <init>
p 3 lastSectionPos
Expand Down Expand Up @@ -23875,7 +23875,7 @@ c net/minecraft/class_3952 net/minecraft/server/QueueingWorldGenerationProgressL
m (Lnet/minecraft/class_3949;Ljava/util/concurrent/Executor;)V <init> <init>
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 <init> <init>
p 1 radius
f I field_17478 radius
Expand Down Expand Up @@ -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 <init> <init>
p 1 outputSchema
Expand All @@ -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 <init> <init>
Expand Down Expand Up @@ -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<p>\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
Expand Down Expand Up @@ -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 <init> <init>
c Creates a particle group with a custom {@code max} particle count.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mappings/net/minecraft/client/item/TooltipData.mapping
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions mappings/net/minecraft/client/render/entity/feature/SkinOverlayOwner.mapping
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...n/ClientFieldsAreNonnullByDefault.mapping → ...n/ClientFieldsAreNonnullByDefault.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -7,5 +7,5 @@ CLASS net/minecraft/class_6178 net/minecraft/util/annotation/ClientFieldsAreNonn
COMMENT
COMMENT <p>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
6 changes: 3 additions & 3 deletions ...ientMethodsReturnNonnullByDefault.mapping → ...ientMethodsReturnNonnullByDefault.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -7,5 +7,5 @@ CLASS net/minecraft/class_6179 net/minecraft/util/annotation/ClientMethodsReturn
COMMENT
COMMENT <p>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
2 changes: 1 addition & 1 deletion .../util/annotation/DeobfuscateClass.mapping → .../util/annotation/DeobfuscateClass.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/SkinOverlayOwner.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/class_4582 net/minecraft/entity/SkinOverlayOwner
METHOD method_6872 shouldRenderOverlay ()Z
2 changes: 1 addition & 1 deletion ...aft/client/item/BundleTooltipData.mapping → ...ft/item/tooltip/BundleTooltipData.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <init> (Lnet/minecraft/class_2371;I)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/item/tooltip/TooltipData.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_5632 net/minecraft/item/tooltip/TooltipData
6 changes: 3 additions & 3 deletions ...aft/client/particle/ParticleGroup.mapping → .../minecraft/particle/ParticleGroup.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <init> (I)V
Expand Down
2 changes: 1 addition & 1 deletion ...inecraft/client/util/ParticleUtil.mapping → ...t/minecraft/particle/ParticleUtil.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ui/WorldGenerationProgressTracker.mapping → ...ld/WorldGenerationProgressTracker.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ CLASS net/minecraft/class_6319 net/minecraft/util/annotation/FieldsAreNonnullByD
COMMENT <p>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
2 changes: 1 addition & 1 deletion mappings/net/minecraft/util/annotation/FieldsAreNonnullByDefault2.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ CLASS net/minecraft/class_6037 net/minecraft/util/annotation/FieldsAreNonnullByD
COMMENT <p>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
2 changes: 1 addition & 1 deletion mappings/net/minecraft/util/annotation/MethodsReturnNonnullByDefault.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ CLASS net/minecraft/class_6328 net/minecraft/util/annotation/MethodsReturnNonnul
COMMENT <p>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
2 changes: 1 addition & 1 deletion .../minecraft/client/util/SmoothUtil.mapping → ...et/minecraft/util/math/SmoothUtil.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../client/world/ClientEntityManager.mapping → .../world/entity/ClientEntityManager.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down