diff --git a/mappings/net/minecraft/client/util/math/AffineTransformation.mapping b/mappings/net/minecraft/util/math/AffineTransformation.mapping
similarity index 84%
rename from mappings/net/minecraft/client/util/math/AffineTransformation.mapping
rename to mappings/net/minecraft/util/math/AffineTransformation.mapping
index edcff5141e..3bfbd95ed3 100644
--- a/mappings/net/minecraft/client/util/math/AffineTransformation.mapping
+++ b/mappings/net/minecraft/util/math/AffineTransformation.mapping
@@ -1,4 +1,6 @@
-CLASS net/minecraft/class_4590 net/minecraft/client/util/math/AffineTransformation
+CLASS net/minecraft/class_4590 net/minecraft/util/math/AffineTransformation
+	COMMENT @implNote Even though this is used only on the client, it accesses protected
+	COMMENT fields from {@link Matrix4f}, which requires them to be in the same package.
 	FIELD field_20900 matrix Lnet/minecraft/class_1159;
 	FIELD field_20901 initialized Z
 	FIELD field_20902 translation Lnet/minecraft/class_1160;
diff --git a/mappings/net/minecraft/client/util/math/AffineTransformations.mapping b/mappings/net/minecraft/util/math/AffineTransformations.mapping
similarity index 82%
rename from mappings/net/minecraft/client/util/math/AffineTransformations.mapping
rename to mappings/net/minecraft/util/math/AffineTransformations.mapping
index 97001bd2d3..1d0a25bddf 100644
--- a/mappings/net/minecraft/client/util/math/AffineTransformations.mapping
+++ b/mappings/net/minecraft/util/math/AffineTransformations.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4609 net/minecraft/client/util/math/AffineTransformations
+CLASS net/minecraft/class_4609 net/minecraft/util/math/AffineTransformations
 	FIELD field_21021 DIRECTION_ROTATIONS Ljava/util/Map;
 	FIELD field_21022 INVERTED_DIRECTION_ROTATIONS Ljava/util/Map;
 	FIELD field_21023 LOGGER Lorg/apache/logging/log4j/Logger;
diff --git a/mappings/net/minecraft/client/util/math/Vector4f.mapping b/mappings/net/minecraft/util/math/Vector4f.mapping
similarity index 78%
rename from mappings/net/minecraft/client/util/math/Vector4f.mapping
rename to mappings/net/minecraft/util/math/Vector4f.mapping
index 1b2c38dfb3..2c2e1f8f93 100644
--- a/mappings/net/minecraft/client/util/math/Vector4f.mapping
+++ b/mappings/net/minecraft/util/math/Vector4f.mapping
@@ -1,4 +1,6 @@
-CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f
+CLASS net/minecraft/class_1162 net/minecraft/util/math/Vector4f
+	COMMENT @implNote Even though this is used only on the client, it accesses protected
+	COMMENT fields from {@link Matrix4f}, which requires them to be in the same package.
 	FIELD field_21486 x F
 	FIELD field_21487 y F
 	FIELD field_21488 z F