Teleport async, i love you

Anon8281 · Jun 25, 2023 · fc52e46 · fc52e46
1 parent 85124ef
commit fc52e46
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -57,6 +57,11 @@
             <groupId>com.github.Anon8281</groupId>
             <artifactId>UniversalScheduler</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -131,15 +136,16 @@
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
-                    <artifactSet>
-                        <includes>
-                            <include>${project.groupId}:*</include>
-                            <include>org.bstats</include>
-                            <include>me.filoghost.updatechecker</include>
-                            <include>me.filoghost.fcommons</include>
-                            <include>com.github.Anon8281:UniversalScheduler</include>
-                        </includes>
-                    </artifactSet>
+<!--                    <artifactSet>-->
+<!--                        <includes>-->
+<!--                            <include>${project.groupId}:*</include>-->
+<!--                            <include>org.bstats</include>-->
+<!--                            <include>me.filoghost.updatechecker</include>-->
+<!--                            <include>me.filoghost.fcommons</include>-->
+<!--                            <include>com.github.Anon8281:UniversalScheduler</include>-->
+<!--                            <include>io.papermc.lib:*</include>-->
+<!--                        </includes>-->
+<!--                    </artifactSet>-->
                     <filters>
                         <filter>
                             <artifact>*:*</artifact>
@@ -165,6 +171,10 @@
                             <pattern>com.github.Anon8281.universalScheduler</pattern>
                             <shadedPattern>me.filoghost.holographicdisplays.plugin.lib.universalScheduler</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>io.papermc.lib</pattern>
+                            <shadedPattern>me.filoghost.holographicdisplays.plugin.lib.paperlib</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>

diff --git a/...rc/main/java/me/filoghost/holographicdisplays/plugin/commands/InternalHologramEditor.java b/...rc/main/java/me/filoghost/holographicdisplays/plugin/commands/InternalHologramEditor.java
@@ -5,9 +5,11 @@
  */
 package me.filoghost.holographicdisplays.plugin.commands;
 
+import io.papermc.lib.PaperLib;
 import me.filoghost.fcommons.Strings;
 import me.filoghost.fcommons.command.validation.CommandException;
 import me.filoghost.fcommons.command.validation.CommandValidate;
+import me.filoghost.fcommons.logging.Log;
 import me.filoghost.holographicdisplays.api.Position;
 import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
 import me.filoghost.holographicdisplays.plugin.config.ConfigManager;
@@ -19,6 +21,7 @@
 import me.filoghost.holographicdisplays.plugin.internal.hologram.InternalHologramManager;
 import me.filoghost.holographicdisplays.plugin.util.FileUtils;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.jetbrains.annotations.NotNull;
@@ -86,10 +89,8 @@ public void saveChanges(InternalHologram hologram, ChangeType changeType) {
     }
 
     public void teleportLookingDown(Player player, Location location) {
-        HolographicDisplays.getScheduler().runTask(()->{
             location.setPitch(90); // Look down
-            player.teleport(location, TeleportCause.PLUGIN);
-        });
+            PaperLib.teleportAsync(player, location, TeleportCause.PLUGIN);
     }
 
     public Path getUserReadableFile(String fileName) throws CommandException {

diff --git a/pom.xml b/pom.xml
@@ -76,6 +76,11 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencyManagement>
@@ -256,6 +261,13 @@
                 <version>0.1.3</version>
                 <scope>compile</scope>
             </dependency>
+
+            <dependency>
+                <groupId>io.papermc</groupId>
+                <artifactId>paperlib</artifactId>
+                <version>1.0.7</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>