feat: support ModelEngine

typst-io · Apr 29, 2024 · 8d51cca · 8d51cca
1 parent 5a9a899
commit 8d51cca
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -6,12 +6,12 @@ In gradle:
 
 groovy
 ```
-compileOnly 'io.typst:bukkit-glow:2.0.0'
+compileOnly 'io.typst:bukkit-glow:2.1.0'
 ```
 
 kts
 ```
-compileOnly("io.typst:bukkit-glow:2.0.0")
+compileOnly("io.typst:bukkit-glow:2.1.0")
 ```
 
 In plugin.yml:
@@ -29,3 +29,6 @@ GlowAPI glow = new GlowAPI(); // No cost for construction
 glow.setGlowing(receiver, target, color);
 glow.removeGlowing(receiver, target);
 ```
+
+## Support plugins
+- [ModelEngine](https://git.mythiccraft.io/mythiccraft/model-engine-4/-/wikis/Modeling)
diff --git a/build.gradle b/build.gradle
@@ -6,20 +6,22 @@ plugins {
 }
 
 group = 'io.typst'
-version = '2.0.0'
+version = '2.1.0'
 
 repositories {
     mavenCentral()
     maven { url "https://repo.papermc.io/repository/maven-public/" }
     maven { url 'https://jitpack.io' }
     maven { url "https://repo.dmulloy2.net/repository/public/" }
+    maven { url 'https://mvn.lumine.io/repository/maven-public/' }
 }
 
 dependencies {
     compileOnly spigot('1.20.2')
     compileOnly fileTree(include: '*.jar', dir: 'libs')
     compileOnly lombok('1.18.32')
     compileOnly protocolLib('5.1.0')
+    compileOnly 'com.ticxo.modelengine:ModelEngine:R4.0.6'
     annotationProcessor lombok('1.18.32')
     testImplementation platform('org.junit:junit-bom:5.10.0')
     testImplementation 'org.junit.jupiter:junit-jupiter'
@@ -28,6 +30,7 @@ dependencies {
 spigot {
     name 'BukkitGlow'
     depends 'ProtocolLib'
+    softDepends 'ModelEngine'
 }
 
 test {

diff --git a/src/main/java/io/typst/bukkit/glow/GlowAPI.java b/src/main/java/io/typst/bukkit/glow/GlowAPI.java
@@ -1,7 +1,10 @@
 package io.typst.bukkit.glow;
 
 
+import io.typst.bukkit.glow.modelengine.ModelEngineAccessor;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -11,23 +14,49 @@
 import java.util.UUID;
 
 public class GlowAPI {
-    public void setGlowing(Player target, Player receiver) {
-        setGlowing(target, receiver, ChatColor.WHITE);
-    }
 
-    private GlowService getServiceOrThrow() {
+    private static GlowService getServiceOrThrow() {
         GlowService service = JavaPlugin.getPlugin(GlowPlugin.class).getGlow();
         return Objects.requireNonNull(service);
     }
 
+    private static boolean checkModelEngine() {
+        return Bukkit.getPluginManager().isPluginEnabled("ModelEngine");
+    }
+
+    // TODO: should be removed
+    public void setGlowing(Player target, Player receiver) {
+        setGlowing((Entity) target, receiver);
+    }
+
+    public void setGlowing(Entity target, Player receiver) {
+        setGlowing(target, receiver, ChatColor.WHITE);
+    }
+
+    // TODO: should be removed
     public void setGlowing(Player target, Player receiver, ChatColor color) {
+        setGlowing((Entity) target, receiver, color);
+    }
+
+    public void setGlowing(Entity target, Player receiver, ChatColor color) {
         GlowService service = getServiceOrThrow();
         service.setGlowing(target, receiver, color);
+        if (checkModelEngine()) {
+            ModelEngineAccessor.setGlowing(target.getUniqueId(), color);
+        }
     }
 
+    // TODO: should be removed
     public void removeGlowing(Player target, Player receiver) {
+        removeGlowing((Entity) target, receiver);
+    }
+
+    public void removeGlowing(Entity target, Player receiver) {
         GlowService service = getServiceOrThrow();
         service.removeGlowing(target, receiver);
+        if (checkModelEngine()) {
+            ModelEngineAccessor.removeGlowing(target.getUniqueId());
+        }
     }
 
     public boolean hasGlowingView(UUID receiverId) {

diff --git a/src/main/java/io/typst/bukkit/glow/GlowEngine.java b/src/main/java/io/typst/bukkit/glow/GlowEngine.java
@@ -7,11 +7,9 @@
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.WrappedDataValue;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.ServicePriority;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/src/main/java/io/typst/bukkit/glow/GlowService.java b/src/main/java/io/typst/bukkit/glow/GlowService.java
@@ -5,6 +5,7 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.bukkit.ChatColor;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
@@ -28,16 +29,16 @@ public Optional<PlayerGlowData> getPlayerGlowData(String targetName, UUID receiv
                         .get(targetName));
     }
 
-    public void setGlowing(Player target, Player receiver, ChatColor color) {
+    public void setGlowing(Entity target, Player receiver, ChatColor color) {
         // update internal state
         Map<String, PlayerGlowData> view = views.computeIfAbsent(receiver.getUniqueId(), k -> new HashMap<>());
+        // TODO: this name can be replaced by entity id?
         view.put(target.getName(), new PlayerGlowData(target.getName(), color));
 
         // send metadata packet
         PacketContainer metadataPacket = GlowPackets.createGlowingMetadataPacket(target, true);
         ProtocolLibrary.getProtocolManager().sendServerPacket(receiver, metadataPacket);
 
-
         // send team packet
         // - create team packet
         // - add player packet - X
@@ -50,7 +51,7 @@ public void setGlowing(Player target, Player receiver, ChatColor color) {
         ProtocolLibrary.getProtocolManager().sendServerPacket(receiver, teamCreationPacket);
     }
 
-    public void removeGlowing(Player target, Player receiver) {
+    public void removeGlowing(Entity target, Player receiver) {
         // update internal state
         Map<String, PlayerGlowData> view = views.getOrDefault(receiver.getUniqueId(), Collections.emptyMap());
         PlayerGlowData removedData = view.remove(target.getName());

diff --git a/src/main/java/io/typst/bukkit/glow/modelengine/ModelEngineAccessor.java b/src/main/java/io/typst/bukkit/glow/modelengine/ModelEngineAccessor.java
@@ -0,0 +1,34 @@
+package io.typst.bukkit.glow.modelengine;
+
+import com.ticxo.modelengine.api.ModelEngineAPI;
+import com.ticxo.modelengine.api.model.ActiveModel;
+import com.ticxo.modelengine.api.model.ModeledEntity;
+import org.bukkit.ChatColor;
+
+import java.util.UUID;
+
+/**
+ * for lazy access due the soft depend
+ */
+public class ModelEngineAccessor {
+    public static void setGlowing(UUID ownerId, ChatColor color) {
+        ModeledEntity modeledEntity = ModelEngineAPI.getModeledEntity(ownerId);
+        if (modeledEntity == null) {
+            return;
+        }
+        for (ActiveModel model : modeledEntity.getModels().values()) {
+            model.setGlowing(true);
+            model.setGlowColor((int) color.getChar());
+        }
+    }
+
+    public static void removeGlowing(UUID ownerId) {
+        ModeledEntity modeledEntity = ModelEngineAPI.getModeledEntity(ownerId);
+        if (modeledEntity == null) {
+            return;
+        }
+        for (ActiveModel model : modeledEntity.getModels().values()) {
+            model.setGlowing(false);
+        }
+    }
+}