From ce0c5cae51270ee9defb4c20b2c3903a3d59f902 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Sat, 28 Nov 2020 14:44:50 +0100 Subject: [PATCH] client.util.math.Vector3f -> util.math.Vec3f (#1879) * client.util.math.Vector3f -> util.math.Vec3f * Vec to Vector * Revert "Vec to Vector" This reverts commit 844d3cb107c1af6d83840a2b67f1aa3217602565. * simple class docs * better word --- gradle.properties | 2 +- .../gui/screen/multiplayer/MultiplayerServerListWidget.mapping | 1 + mappings/net/minecraft/potion/PotionUtil.mapping | 1 + mappings/net/minecraft/util/math/Vec2f.mapping | 1 + mappings/net/minecraft/util/math/Vec3d.mapping | 1 + .../util/math/Vector3f.mapping => util/math/Vec3f.mapping} | 3 ++- mappings/net/minecraft/util/math/Vec3i.mapping | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) rename mappings/net/minecraft/{client/util/math/Vector3f.mapping => util/math/Vec3f.mapping} (94%) diff --git a/gradle.properties b/gradle.properties index 1dc8950877..f2dc62aea7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -enigma_version=0.21.4+build.225 +enigma_version=0.21.6+build.229 stitch_version=0.5.1+build.77 diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 88e84f89c3..4ba6b486bb 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_26583 CANNOT_CONNECT_TEXT Lnet/minecraft/class_2561; FIELD field_26586 NO_CONNECTION_TEXT Lnet/minecraft/class_2561; FIELD field_26587 PINGING_TEXT Lnet/minecraft/class_2561; + FIELD field_26849 INCOMPATIBLE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIIII)V ARG 1 screen ARG 2 client diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 5d555c314b..865218e0ef 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil + FIELD field_25817 NONE_TEXT Lnet/minecraft/class_2561; METHOD method_8055 getColor (Ljava/util/Collection;)I ARG 0 effects METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/util/math/Vec2f.mapping b/mappings/net/minecraft/util/math/Vec2f.mapping index 6949adb8dc..5b5201b315 100644 --- a/mappings/net/minecraft/util/math/Vec2f.mapping +++ b/mappings/net/minecraft/util/math/Vec2f.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_241 net/minecraft/util/math/Vec2f + COMMENT An immutable vector composed of 2 floats. FIELD field_1335 SOUTH_EAST_UNIT Lnet/minecraft/class_241; FIELD field_1336 SOUTH_UNIT Lnet/minecraft/class_241; FIELD field_1337 MAX_SOUTH_EAST Lnet/minecraft/class_241; diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 7ac26d9684..30318a1ae5 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d + COMMENT An immutable vector composed of 3 doubles. FIELD field_1350 z D FIELD field_1351 y D FIELD field_1352 x D diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/util/math/Vec3f.mapping similarity index 94% rename from mappings/net/minecraft/client/util/math/Vector3f.mapping rename to mappings/net/minecraft/util/math/Vec3f.mapping index 0e32fe12f7..f15191c8cd 100644 --- a/mappings/net/minecraft/client/util/math/Vector3f.mapping +++ b/mappings/net/minecraft/util/math/Vec3f.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f +CLASS net/minecraft/class_1160 net/minecraft/util/math/Vec3f + COMMENT A mutable vector composed of 3 floats. FIELD field_20702 NEGATIVE_X Lnet/minecraft/class_1160; FIELD field_20703 POSITIVE_X Lnet/minecraft/class_1160; FIELD field_20704 NEGATIVE_Y Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 2f7296177f..9381fa1c5b 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i + COMMENT A publicly read-only but mutable vector composed of 3 integers. FIELD field_11173 z I FIELD field_11174 y I FIELD field_11175 x I