AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-05 21:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

staff -> admins

Browse Source 
* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
This commit is contained in:
speed
2020-12-03 19:28:53 -05:00
parent aae1f524ea
commit 293ea04c56
205 changed files with 1667 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
View File

@ -17,7 +17,7 @@ import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import net.dv8tion.jda.api.EmbedBuilder;
@ -298,7 +298,7 @@ public class Discord extends FreedomService
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(PlayerJoinEvent event)
{
if (!plugin.sl.isVanished(event.getPlayer().getName()))
if (!plugin.al.isVanished(event.getPlayer().getName()))
{
messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**");
}
@ -307,7 +307,7 @@ public class Discord extends FreedomService
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerLeave(PlayerQuitEvent event)
{
if (!plugin.sl.isVanished(event.getPlayer().getName()))
if (!plugin.al.isVanished(event.getPlayer().getName()))
{
messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**");
}
@ -428,7 +428,7 @@ public class Discord extends FreedomService
return true;
}
public static boolean syncRoles(StaffMember staffMember, String discordID)
public static boolean syncRoles(Admin admin, String discordID)
{
if (discordID == null)
{
@ -462,7 +462,7 @@ public class Discord extends FreedomService
return false;
}
if (!staffMember.isActive())
if (!admin.isActive())
{
if (member.getRoles().contains(adminRole))
{
@ -475,7 +475,7 @@ public class Discord extends FreedomService
return true;
}
if (staffMember.getRank().equals(Rank.ADMIN))
if (admin.getRank().equals(Rank.ADMIN))
{
if (!member.getRoles().contains(adminRole))
{
@ -487,7 +487,7 @@ public class Discord extends FreedomService
}
return true;
}
else if (staffMember.getRank().equals(Rank.SENIOR_ADMIN))
else if (admin.getRank().equals(Rank.SENIOR_ADMIN))
{
if (!member.getRoles().contains(senioradminRole))
{

7
src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java
View File

@ -17,6 +17,7 @@ import org.bukkit.entity.Player;
public class DiscordToAdminChatListener extends ListenerAdapter
{
DiscordToMinecraftListener dtml = new DiscordToMinecraftListener();
public void onMessageReceived(MessageReceivedEvent event)
{
String chat_channel_id = ConfigEntry.DISCORD_ADMINCHAT_CHANNEL_ID.getString();
@ -26,7 +27,7 @@ public class DiscordToAdminChatListener extends ListenerAdapter
{
Member member = event.getMember();
String tag = dtml.getDisplay(member);
StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "STAFF" + ChatColor.DARK_GRAY + "]");
StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "ADMIN" + ChatColor.DARK_GRAY + "]");
Message msg = event.getMessage();
if (tag != null)
{
@ -56,7 +57,7 @@ public class DiscordToAdminChatListener extends ListenerAdapter
}
for (Player player : Bukkit.getOnlinePlayers())
{
if (TotalFreedomMod.getPlugin().sl.isStaff(player))
if (TotalFreedomMod.getPlugin().al.isAdmin(player))
{
player.spigot().sendMessage(builder.create());
}
@ -65,4 +66,4 @@ public class DiscordToAdminChatListener extends ListenerAdapter
}
}
}
}
}

10
src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java
View File

@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.discord;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
@ -24,10 +24,10 @@ public class PrivateMessageListener extends ListenerAdapter
player.setDiscordID(event.getMessage().getAuthor().getId());
player.setVerification(true);
StaffMember staffMember = TotalFreedomMod.plugin().sl.getEntryByName(name);
if (staffMember != null)
Admin admin = TotalFreedomMod.plugin().al.getEntryByName(name);
if (admin != null)
{
Discord.syncRoles(staffMember, player.getDiscordID());
Discord.syncRoles(admin, player.getDiscordID());
}
TotalFreedomMod.plugin().pl.save(player);
Discord.LINK_CODES.remove(code);
@ -41,4 +41,4 @@ public class PrivateMessageListener extends ListenerAdapter
}
}
}
}
}