Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Commit

Permalink
Integrations: fix and add vault integration
Browse files Browse the repository at this point in the history
  • Loading branch information
TheFaser committed Jul 31, 2023
1 parent 556a8e5 commit c0a65e9
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 6 deletions.
5 changes: 2 additions & 3 deletions src/main/java/net/flectone/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.flectone.custom.FTabCompleter;
import net.flectone.integrations.expansions.FExpansion;
import net.flectone.integrations.luckperms.FLuckPerms;
import net.flectone.integrations.vault.FVault;
import net.flectone.integrations.voicechats.simplevoicechat.RegisterSimpleVoiceChat;
import net.flectone.managers.FPlayerManager;
import net.flectone.managers.FileManager;
Expand All @@ -25,8 +26,6 @@ public final class Main extends JavaPlugin {

public static boolean isHavePlasmoVoice = false;

public static boolean isHaveVault = false;

public static boolean isHaveInteractiveChat = false;
public static FileManager config;
public static FileManager locale;
Expand Down Expand Up @@ -103,7 +102,7 @@ private void loadIcons() {

private void hookPlugins() {
if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
isHaveVault = true;
FVault.register();
getLogger().info("\uD83D\uDD12 Vault detected and hooked");
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/flectone/custom/FPlayer.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.flectone.custom;

import net.flectone.Main;
import net.flectone.integrations.vault.FVault;
import net.flectone.managers.FPlayerManager;
import net.flectone.utils.ObjectUtil;
import net.milkbowl.vault.chat.Chat;
Expand All @@ -18,7 +19,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

public class FPlayer {
Expand Down Expand Up @@ -343,8 +343,8 @@ private String getStreamFormatPrefix() {
}

public void getVaultPrefixSuffix() {
if (Main.isHaveVault) {
Chat provider = Objects.requireNonNull(Main.getInstance().getServer().getServicesManager().getRegistration(Chat.class)).getProvider();
if (FVault.registered) {
Chat provider = FVault.getProvider();

this.vaultPrefix = provider.getPlayerPrefix(player);
this.vaultSuffix = provider.getPlayerSuffix(player);
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/net/flectone/integrations/vault/FVault.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package net.flectone.integrations.vault;

import net.flectone.Main;
import net.milkbowl.vault.chat.Chat;
import org.bukkit.plugin.RegisteredServiceProvider;

public class FVault {

public static boolean registered = false;

private static Chat provider;

public static void register() {
RegisteredServiceProvider<Chat> chatProvider = Main.getInstance().getServer().getServicesManager()
.getRegistration(net.milkbowl.vault.chat.Chat.class);

if (chatProvider == null) {
Main.warning("⚠ Failed to load Vault Chat, you may not have LuckPerms installed");
return;
}

provider = chatProvider.getProvider();
registered = true;
}

public static Chat getProvider() {
return provider;
}

}

0 comments on commit c0a65e9

Please sign in to comment.