From f76a031bf709fbe1f5a7cab47fbda5f453c0dc96 Mon Sep 17 00:00:00 2001 From: Moulberry Date: Wed, 4 Sep 2024 00:56:14 +0800 Subject: [PATCH 1/4] Fix using wrong import --- .../java/com/moulberry/axiom/annotations/ServerAnnotations.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/moulberry/axiom/annotations/ServerAnnotations.java b/src/main/java/com/moulberry/axiom/annotations/ServerAnnotations.java index a7a118b..5d2a217 100644 --- a/src/main/java/com/moulberry/axiom/annotations/ServerAnnotations.java +++ b/src/main/java/com/moulberry/axiom/annotations/ServerAnnotations.java @@ -12,7 +12,7 @@ import net.minecraft.util.datafix.DataFixTypes; import net.minecraft.world.level.saveddata.SavedData; import org.bukkit.NamespacedKey; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.persistence.PersistentDataAdapterContext; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; From 30b9107da2722db019c3d88dc721308aa7351d4d Mon Sep 17 00:00:00 2001 From: Moulberry Date: Wed, 4 Sep 2024 00:57:12 +0800 Subject: [PATCH 2/4] Change version to 4.0.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e51fc4b..5c8c0b1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "com.moulberry.axiom" -version = "3.3.0" +version = "4.0.0" description = "Serverside component for Axiom on Paper" java { From 4316634ecf77dea6a1b990de1800b0e933f60ff8 Mon Sep 17 00:00:00 2001 From: Moulberry Date: Wed, 4 Sep 2024 01:21:01 +0800 Subject: [PATCH 3/4] Bump version from 1.21 to 1.21.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41e9a0b..47af617 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ bom-newest = "1.37" cloud-paper = "2.0.0-20240516.054251-69" coreprotect = "22.4" -paper = "1.21-R0.1-SNAPSHOT" +paper = "1.21.1-R0.1-SNAPSHOT" plotsquared = "7.3.9-20240513.192211-13" reflection-remapper = "0.1.2-20240315.033304-2" viaversion-api = "5.0.1" From 342e38038f638979a1c4608249df9b5b7ba43569 Mon Sep 17 00:00:00 2001 From: Moulberry Date: Wed, 4 Sep 2024 14:28:04 +0800 Subject: [PATCH 4/4] Update ImageAnnotationData to include opacity --- build.gradle.kts | 2 +- .../axiom/annotations/data/ImageAnnotationData.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5c8c0b1..5bcdbc5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "com.moulberry.axiom" -version = "4.0.0" +version = "4.0.1" description = "Serverside component for Axiom on Paper" java { diff --git a/src/main/java/com/moulberry/axiom/annotations/data/ImageAnnotationData.java b/src/main/java/com/moulberry/axiom/annotations/data/ImageAnnotationData.java index 8461a0e..03949a1 100644 --- a/src/main/java/com/moulberry/axiom/annotations/data/ImageAnnotationData.java +++ b/src/main/java/com/moulberry/axiom/annotations/data/ImageAnnotationData.java @@ -5,7 +5,7 @@ import net.minecraft.network.FriendlyByteBuf; import org.joml.Quaternionf; import org.joml.Vector3f; -public record ImageAnnotationData(String imageUrl, Vector3f position, Quaternionf rotation, Direction direction, float fallbackYaw, float width, int billboardMode) implements AnnotationData { +public record ImageAnnotationData(String imageUrl, Vector3f position, Quaternionf rotation, Direction direction, float fallbackYaw, float width, float opacity, int billboardMode) implements AnnotationData { @Override public void setPosition(Vector3f position) { @@ -31,6 +31,7 @@ public record ImageAnnotationData(String imageUrl, Vector3f position, Quaternion friendlyByteBuf.writeByte(this.direction.get3DDataValue()); friendlyByteBuf.writeFloat(this.fallbackYaw); friendlyByteBuf.writeFloat(this.width); + friendlyByteBuf.writeFloat(this.opacity); friendlyByteBuf.writeByte(this.billboardMode); } @@ -46,8 +47,9 @@ public record ImageAnnotationData(String imageUrl, Vector3f position, Quaternion Direction direction = Direction.from3DDataValue(friendlyByteBuf.readByte()); float fallbackYaw = friendlyByteBuf.readFloat(); float width = friendlyByteBuf.readFloat(); + float opacity = friendlyByteBuf.readFloat(); int billboardMode = friendlyByteBuf.readByte(); - return new ImageAnnotationData(imageUrl, new Vector3f(x, y, z), new Quaternionf(rotX, rotY, rotZ, rotW), direction, fallbackYaw, width, billboardMode); + return new ImageAnnotationData(imageUrl, new Vector3f(x, y, z), new Quaternionf(rotX, rotY, rotZ, rotW), direction, fallbackYaw, width, opacity, billboardMode); } }