AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-10 07:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuck intellij

Browse Source
This commit is contained in:
Telesphoreo
2020-08-15 17:42:46 -05:00
parent e77d92407c
commit 53038ca3b2
185 changed files with 1242 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import java.io.IOException;
import java.time.Instant;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Random;
@ -15,7 +14,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import javax.security.auth.login.LoginException;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank;
@ -380,7 +379,7 @@ public class Discord extends FreedomService
return true;
}
public static boolean syncRoles(Admin admin, String discordID)
public static boolean syncRoles(StaffMember staffMember, String discordID)
{
if (discordID == null)
{
@ -400,87 +399,87 @@ public class Discord extends FreedomService
return false;
}
Role superAdminRole = server.getRoleById(ConfigEntry.DISCORD_SUPER_ROLE_ID.getString());
if (superAdminRole == null)
Role trialModRole = server.getRoleById(ConfigEntry.DISCORD_TRIAL_MOD_ROLE_ID.getString());
if (trialModRole == null)
{
FLog.severe("The specified Super Admin role does not exist!");
FLog.severe("The specified Trial Mod role does not exist!");
return false;
}
Role telnetAdminRole = server.getRoleById(ConfigEntry.DISCORD_TELNET_ROLE_ID.getString());
if (telnetAdminRole == null)
Role modRole = server.getRoleById(ConfigEntry.DISCORD_MOD_ROLE_ID.getString());
if (modRole == null)
{
FLog.severe("The specified Telnet Admin role does not exist!");
FLog.severe("The specified Mod role does not exist!");
return false;
}
Role seniorAdminRole = server.getRoleById(ConfigEntry.DISCORD_SENIOR_ROLE_ID.getString());
if (seniorAdminRole == null)
Role adminRole = server.getRoleById(ConfigEntry.DISCORD_ADMIN_ROLE_ID.getString());
if (adminRole == null)
{
FLog.severe("The specified Senior Admin role does not exist!");
FLog.severe("The specified Admin role does not exist!");
return false;
}
if (!admin.isActive())
if (!staffMember.isActive())
{
if (member.getRoles().contains(superAdminRole))
if (member.getRoles().contains(trialModRole))
{
server.removeRoleFromMember(member, superAdminRole).complete();
server.removeRoleFromMember(member, trialModRole).complete();
}
if (member.getRoles().contains(telnetAdminRole))
if (member.getRoles().contains(modRole))
{
server.removeRoleFromMember(member, telnetAdminRole).complete();
server.removeRoleFromMember(member, modRole).complete();
}
if (member.getRoles().contains(seniorAdminRole))
if (member.getRoles().contains(adminRole))
{
server.removeRoleFromMember(member, seniorAdminRole).complete();
server.removeRoleFromMember(member, adminRole).complete();
}
return true;
}
if (admin.getRank().equals(Rank.SUPER_ADMIN))
if (staffMember.getRank().equals(Rank.TRIAL_MOD))
{
if (!member.getRoles().contains(superAdminRole))
if (!member.getRoles().contains(trialModRole))
{
server.addRoleToMember(member, superAdminRole).complete();
server.addRoleToMember(member, trialModRole).complete();
}
if (member.getRoles().contains(telnetAdminRole))
if (member.getRoles().contains(modRole))
{
server.removeRoleFromMember(member, telnetAdminRole).complete();
server.removeRoleFromMember(member, modRole).complete();
}
if (member.getRoles().contains(seniorAdminRole))
if (member.getRoles().contains(adminRole))
{
server.removeRoleFromMember(member, seniorAdminRole).complete();
server.removeRoleFromMember(member, adminRole).complete();
}
return true;
}
else if (admin.getRank().equals(Rank.TELNET_ADMIN))
else if (staffMember.getRank().equals(Rank.MOD))
{
if (!member.getRoles().contains(telnetAdminRole))
if (!member.getRoles().contains(modRole))
{
server.addRoleToMember(member, telnetAdminRole).complete();
server.addRoleToMember(member, modRole).complete();
}
if (member.getRoles().contains(superAdminRole))
if (member.getRoles().contains(trialModRole))
{
server.removeRoleFromMember(member, superAdminRole).complete();
server.removeRoleFromMember(member, trialModRole).complete();
}
if (member.getRoles().contains(seniorAdminRole))
if (member.getRoles().contains(adminRole))
{
server.removeRoleFromMember(member, seniorAdminRole).complete();
server.removeRoleFromMember(member, adminRole).complete();
}
return true;
}
else if (admin.getRank().equals(Rank.SENIOR_ADMIN))
else if (staffMember.getRank().equals(Rank.ADMIN))
{
if (!member.getRoles().contains(seniorAdminRole))
if (!member.getRoles().contains(adminRole))
{
server.addRoleToMember(member, seniorAdminRole).complete();
server.addRoleToMember(member, adminRole).complete();
}
if (member.getRoles().contains(superAdminRole))
if (member.getRoles().contains(trialModRole))
{
server.removeRoleFromMember(member, superAdminRole).complete();
server.removeRoleFromMember(member, trialModRole).complete();
}
if (member.getRoles().contains(telnetAdminRole))
if (member.getRoles().contains(modRole))
{
server.removeRoleFromMember(member, telnetAdminRole).complete();
server.removeRoleFromMember(member, modRole).complete();
}
return true;
}

12
src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java
View File

@ -66,19 +66,19 @@ public class DiscordToMinecraftListener extends ListenerAdapter
return Title.ASSISTANT_EXECUTIVE.getColoredTag();
}
// Senior Admins
else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_SENIOR_ROLE_ID.getString())))
else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_ADMIN_ROLE_ID.getString())))
{
return Rank.SENIOR_ADMIN.getColoredTag();
return Rank.ADMIN.getColoredTag();
}
// Telnet Admins
else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_TELNET_ROLE_ID.getString())))
else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_MOD_ROLE_ID.getString())))
{
return Rank.TELNET_ADMIN.getColoredTag();
return Rank.MOD.getColoredTag();
}
// Super Admins
else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_SUPER_ROLE_ID.getString())))
else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_TRIAL_MOD_ROLE_ID.getString())))
{
return Rank.SUPER_ADMIN.getColoredTag();
return Rank.TRIAL_MOD.getColoredTag();
}
// Master Builders
else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_MASTER_BUILDER_ROLE_ID.getString())))

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

@ -1,7 +1,7 @@
package me.totalfreedom.totalfreedommod.discord;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.player.PlayerData;
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);
Admin admin = TotalFreedomMod.plugin().al.getEntryByName(name);
if (admin != null)
StaffMember staffMember = TotalFreedomMod.plugin().sl.getEntryByName(name);
if (staffMember != null)
{
Discord.syncRoles(admin, player.getDiscordID());
Discord.syncRoles(staffMember, player.getDiscordID());
}
TotalFreedomMod.plugin().pl.save(player);
Discord.LINK_CODES.remove(code);