Mirrors/AxiomPaperPlugin
3
0
Fork 1
Mirror von https://github.com/Moulberry/AxiomPaperPlugin.git synchronisiert 2024-11-17 05:40:06 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität

Merge branch 'Moulberry:master' into master

Quellcode durchsuchen
Dieser Commit ist enthalten in:
TWME 2024-09-06 22:45:38 +08:00 committet von GitHub
Commit a995427c7a
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
4 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
build.gradle.kts
Datei anzeigen

@ -8,7 +8,7 @@ plugins {
} }
group = "com.moulberry.axiom" group = "com.moulberry.axiom"
version = "3.3.0" version = "4.0.1"
description = "Serverside component for Axiom on Paper" description = "Serverside component for Axiom on Paper"
java { java {

2
gradle/libs.versions.toml
Datei anzeigen

@ -3,7 +3,7 @@
bom-newest = "1.37" bom-newest = "1.37"
cloud-paper = "2.0.0-20240516.054251-69" cloud-paper = "2.0.0-20240516.054251-69"
coreprotect = "22.4" coreprotect = "22.4"
paper = "1.21-R0.1-SNAPSHOT" paper = "1.21.1-R0.1-SNAPSHOT"
plotsquared = "7.3.9-20240513.192211-13" plotsquared = "7.3.9-20240513.192211-13"
reflection-remapper = "0.1.2-20240315.033304-2" reflection-remapper = "0.1.2-20240315.033304-2"
viaversion-api = "5.0.1" viaversion-api = "5.0.1"

2
src/main/java/com/moulberry/axiom/annotations/ServerAnnotations.java
Datei anzeigen

@ -12,7 +12,7 @@ import net.minecraft.util.datafix.DataFixTypes;
import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.level.saveddata.SavedData;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.World; 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.PersistentDataAdapterContext;
import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType; import org.bukkit.persistence.PersistentDataType;

6
src/main/java/com/moulberry/axiom/annotations/data/ImageAnnotationData.java
Datei anzeigen

@ -5,7 +5,7 @@ import net.minecraft.network.FriendlyByteBuf;
import org.joml.Quaternionf; import org.joml.Quaternionf;
import org.joml.Vector3f; 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 @Override
public void setPosition(Vector3f position) { public void setPosition(Vector3f position) {
@ -31,6 +31,7 @@ public record ImageAnnotationData(String imageUrl, Vector3f position, Quaternion
friendlyByteBuf.writeByte(this.direction.get3DDataValue()); friendlyByteBuf.writeByte(this.direction.get3DDataValue());
friendlyByteBuf.writeFloat(this.fallbackYaw); friendlyByteBuf.writeFloat(this.fallbackYaw);
friendlyByteBuf.writeFloat(this.width); friendlyByteBuf.writeFloat(this.width);
friendlyByteBuf.writeFloat(this.opacity);
friendlyByteBuf.writeByte(this.billboardMode); friendlyByteBuf.writeByte(this.billboardMode);
} }
@ -46,8 +47,9 @@ public record ImageAnnotationData(String imageUrl, Vector3f position, Quaternion
Direction direction = Direction.from3DDataValue(friendlyByteBuf.readByte()); Direction direction = Direction.from3DDataValue(friendlyByteBuf.readByte());
float fallbackYaw = friendlyByteBuf.readFloat(); float fallbackYaw = friendlyByteBuf.readFloat();
float width = friendlyByteBuf.readFloat(); float width = friendlyByteBuf.readFloat();
float opacity = friendlyByteBuf.readFloat();
int billboardMode = friendlyByteBuf.readByte(); 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);
} }
} }