From 8f713fd30cf70601ace6260f741127f6277c21c5 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 23 Jan 2024 19:52:03 -0600 Subject: [PATCH] uncomment prism support --- server/build.gradle.kts | 4 +-- server/src/main/java/dev/plex/Plex.java | 32 +++++++++++++------ .../java/dev/plex/command/impl/BanCMD.java | 10 ++++-- .../main/java/dev/plex/hook/PrismHook.java | 4 +-- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 59666d9..746cd1a 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -10,7 +10,7 @@ plugins { repositories { maven(url = uri("https://maven.playpro.com")) -// maven(url = uri("https://nexus.darkhelmet.network/repository/maven-snapshots")) + maven(url = uri("https://nexus.telesphoreo.me/repository/plex-modules/")) } dependencies { @@ -28,7 +28,7 @@ dependencies { exclude("org.bukkit", "bukkit") } compileOnly("net.coreprotect:coreprotect:22.2") -// compileOnly("network.darkhelmet:prism:3.3.1") + compileOnly("network.darkhelmet.prism:Prism-Api:1.0.0") implementation("org.bstats:bstats-base:3.0.2") implementation("org.bstats:bstats-bukkit:3.0.2") diff --git a/server/src/main/java/dev/plex/Plex.java b/server/src/main/java/dev/plex/Plex.java index c487fa0..4e32e12 100644 --- a/server/src/main/java/dev/plex/Plex.java +++ b/server/src/main/java/dev/plex/Plex.java @@ -6,7 +6,7 @@ import dev.plex.config.Config; import dev.plex.handlers.CommandHandler; import dev.plex.handlers.ListenerHandler; import dev.plex.hook.CoreProtectHook; -//import dev.plex.hook.PrismHook; +import dev.plex.hook.PrismHook; import dev.plex.module.ModuleManager; import dev.plex.player.PlexPlayer; import dev.plex.punishment.PunishmentManager; @@ -17,9 +17,14 @@ import dev.plex.storage.StorageType; import dev.plex.storage.player.SQLPlayerData; import dev.plex.storage.punishment.SQLNotes; import dev.plex.storage.punishment.SQLPunishment; -import dev.plex.util.*; +import dev.plex.util.BuildInfo; +import dev.plex.util.BungeeUtil; +import dev.plex.util.PlexLog; +import dev.plex.util.PlexUtils; +import dev.plex.util.UpdateChecker; import dev.plex.util.redis.MessageUtil; import dev.plex.world.CustomWorld; +import java.io.File; import lombok.Getter; import lombok.Setter; import net.milkbowl.vault.chat.Chat; @@ -29,8 +34,6 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; -import java.io.File; - @Getter @Setter public class Plex extends JavaPlugin @@ -62,7 +65,7 @@ public class Plex extends JavaPlugin private Chat chat; private CoreProtectHook coreProtectHook; -// private PrismHook prismHook; + private PrismHook prismHook; public static Plex get() { @@ -131,15 +134,24 @@ public class Plex extends JavaPlugin permissions = setupPermissions(); chat = setupChat(); - if (plugin.getServer().getPluginManager().isPluginEnabled("CoreProtect")) { + if (plugin.getServer().getPluginManager().isPluginEnabled("CoreProtect")) + { PlexLog.log("Hooked into CoreProtect!"); coreProtectHook = new CoreProtectHook(this); - } else { + } + else + { PlexLog.debug("Not hooking into CoreProtect"); } -// if (plugin.getServer().getPluginManager().isPluginEnabled("Prism")) { -// prismHook = new PrismHook(this); -// } + if (plugin.getServer().getPluginManager().isPluginEnabled("Prism")) + { + PlexLog.log("Hooked into Prism!"); + prismHook = new PrismHook(this); + } + else + { + PlexLog.debug("Not hooking into Prism"); + } updateChecker = new UpdateChecker(); PlexLog.log("Update checking enabled"); diff --git a/server/src/main/java/dev/plex/command/impl/BanCMD.java b/server/src/main/java/dev/plex/command/impl/BanCMD.java index 926f98a..bd1fc97 100644 --- a/server/src/main/java/dev/plex/command/impl/BanCMD.java +++ b/server/src/main/java/dev/plex/command/impl/BanCMD.java @@ -15,7 +15,13 @@ import dev.plex.util.BungeeUtil; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; +import java.time.Instant; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import net.kyori.adventure.text.Component; +import network.darkhelmet.prism.api.PrismParameters; +import network.darkhelmet.prism.api.Result; +import network.darkhelmet.prism.api.actions.PrismProcessType; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -91,7 +97,7 @@ public class BanCMD extends PlexCommand if (rollBack) { - /*if (plugin.getPrismHook().hasPrism()) { + if (plugin.getPrismHook().hasPrism()) { PrismParameters parameters = plugin.getPrismHook().prismApi().createParameters(); parameters.addActionType("block-place"); parameters.addActionType("block-break"); @@ -113,7 +119,7 @@ public class BanCMD extends PlexCommand } }); } - else */ + else if (plugin.getCoreProtectHook().hasCoreProtect()) { PlexLog.debug("Testing coreprotect"); diff --git a/server/src/main/java/dev/plex/hook/PrismHook.java b/server/src/main/java/dev/plex/hook/PrismHook.java index c3d2669..cf4a6d4 100644 --- a/server/src/main/java/dev/plex/hook/PrismHook.java +++ b/server/src/main/java/dev/plex/hook/PrismHook.java @@ -1,7 +1,7 @@ -/* package dev.plex.hook; import dev.plex.Plex; +import network.darkhelmet.prism.api.PrismApi; import org.bukkit.plugin.Plugin; public class PrismHook @@ -31,4 +31,4 @@ public class PrismHook return prismApi; } } -*/ +