Merge remote-tracking branch 'origin/origin' into origin

Dueris · May 24, 2024 · d033730 · d033730
2 parents b04675f + aa264bc
commit d033730
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,4 @@
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/V7V4O31UU)
 
-<h2 align="left"><strong font-size="202px">Sponsored by BisectHosting!</strong></h2>
-<a href="https://bisecthosting.com/DUERIS"><img src="https://i.ibb.co/Rg0qD2V/a03f0848-c1da-4967-9c40-f56cc36ef03c.webp" alt="a03f0848-c1da-4967-9c40-f56cc36ef03c" border="0"></a>
 </div>
diff --git a/origins/build.gradle.kts b/origins/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     compileOnly("org.reflections:reflections:0.9.12") // - in DependencyLoader - shaded in calio
     compileOnly("org.mineskin:java-client:1.2.4-SNAPSHOT") // - in DependencyLoader
     // Optional Hook
-    compileOnly("org.geysermc.geyser:api:2.2.0-SNAPSHOT")
+    compileOnly("org.geysermc.floodgate:api:2.2.2-SNAPSHOT")
     compileOnly("net.skinsrestorer:skinsrestorer-api:15.0.4")
     compileOnly("me.clip:placeholderapi:2.11.4")
 
@@ -78,4 +78,4 @@ publishing {
             }
         }
     }
-}
+}
diff --git a/origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/Phasing.java b/origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/Phasing.java
@@ -39,7 +39,7 @@
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
-import org.geysermc.geyser.api.GeyserApi;
+import org.geysermc.floodgate.api.FloodgateApi;
 
 import java.util.*;
 
@@ -90,7 +90,7 @@ protected static void resyncJavaPlayer(ServerPlayer player) {
 
 	public static boolean isBedrock(Player p) {
 		if (Bukkit.getPluginManager().isPluginEnabled("floodgate")) {
-			return GeyserApi.api().connectionByUuid(p.getUniqueId()) != null;
+			return FloodgateApi.getInstance().isFloodgateId(p.getUniqueId());
 		} else {
 			return false;
 		}
@@ -350,4 +350,4 @@ public void moveEvent(PlayerMoveEvent e) {
 	public FactoryJsonObject getPhaseDownCondition() {
 		return phaseDownCondition;
 	}
-}
+}