diff --git a/build.gradle.kts b/build.gradle.kts index f8fec2f..4a867f6 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.1" description = "Serverside component for Axiom on Paper" java { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ba853d..fe9ac2c 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" 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; 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); } }