AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-28 19:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

LuckPerms Integration (2/2)

Browse Source
This commit is contained in:
Paul Reilly
2023-03-30 15:26:35 -05:00
parent cc244fc4f7
commit 8a58782d99
87 changed files with 528 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
discord/src/main/java/me/totalfreedom/discord/TFD4JCommonsImpl.java
View File

@ -16,7 +16,7 @@ import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.api.TFD4JCommons;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.rank.GroupProvider;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.WordUtils;
@ -173,11 +173,11 @@ public class TFD4JCommonsImpl implements TFD4JCommons
return true;
}
if (admin.getRank().equals(Rank.ADMIN))
if (admin.getRank().equals(GroupProvider.ADMIN.getGroup()))
{
syncRolesAdminAssignment(member, adminRole, senioradminRole);
return true;
} else if (admin.getRank().equals(Rank.SENIOR_ADMIN))
} else if (admin.getRank().equals(GroupProvider.SENIOR_ADMIN.getGroup()))
{
syncRolesSeniorAssignment(member, adminRole, senioradminRole);
return true;

32
discord/src/main/java/me/totalfreedom/discord/listener/AdminChatListener.java
View File

@ -12,7 +12,7 @@ import me.totalfreedom.discord.util.SnowflakeEntry;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.rank.Displayable;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.rank.GroupProvider;
import me.totalfreedom.totalfreedommod.rank.Title;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
@ -126,38 +126,32 @@ public class AdminChatListener
{
Guild server = tfd4j.getBot().getGuildById().block();
// Server Owner
assert server != null;
if (server == null) throw new IllegalStateException();
return member.getRoles().map(role ->
{
if (role.getId().equals(SnowflakeEntry.OWNER_ROLE_ID.getSnowflake()))
{
return Title.OWNER;
}
else if (role.getId().equals(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake()))
} else if (role.getId().equals(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake()))
{
return Title.DEVELOPER;
}
else if (role.getId().equals(SnowflakeEntry.EXECUTIVE_ROLE_ID.getSnowflake()))
} else if (role.getId().equals(SnowflakeEntry.EXECUTIVE_ROLE_ID.getSnowflake()))
{
return Title.EXECUTIVE;
}
else if (role.getId().equals(SnowflakeEntry.ASSISTANT_EXECUTIVE_ROLE_ID.getSnowflake()))
} else if (role.getId().equals(SnowflakeEntry.ASSISTANT_EXECUTIVE_ROLE_ID.getSnowflake()))
{
return Title.ASSTEXEC;
}
else if (role.getId().equals(SnowflakeEntry.SENIOR_ADMIN_ROLE_ID.getSnowflake()))
} else if (role.getId().equals(SnowflakeEntry.SENIOR_ADMIN_ROLE_ID.getSnowflake()))
{
return Rank.SENIOR_ADMIN;
}
else if (role.getId().equals(SnowflakeEntry.ADMIN_ROLE_ID.getSnowflake()))
return GroupProvider.SENIOR_ADMIN.getGroup();
} else if (role.getId().equals(SnowflakeEntry.ADMIN_ROLE_ID.getSnowflake()))
{
return Rank.ADMIN;
}
else if (role.getId().equals(SnowflakeEntry.MASTERBUILDER_ROLE_ID.getSnowflake()))
return GroupProvider.ADMIN.getGroup();
} else if (role.getId().equals(SnowflakeEntry.MASTERBUILDER_ROLE_ID.getSnowflake()))
{
return Title.MASTER_BUILDER;
}
else
return GroupProvider.MASTER_BUILDER.getGroup();
} else
{
return null;
}

2
discord/src/main/java/me/totalfreedom/discord/listener/MinecraftListener.java
View File

@ -53,7 +53,7 @@ public class MinecraftListener
{
Boolean b = m.getMessage()
.getChannel()
.map(c -> c instanceof TextChannel)
.map(TextChannel.class::isInstance)
.block();
return b != null && b;
}).subscribe(this::doMessageBodyDetails);

2
discord/src/main/java/me/totalfreedom/discord/listener/PrivateMessageListener.java
View File

@ -24,7 +24,7 @@ public class PrivateMessageListener
.on(MessageCreateEvent.class)
.filter(event -> event.getMessage().getAuthor().orElse(null) != null)
.filter(event -> !event.getMessage().getAuthor().orElseThrow().getId().equals(tfd4j.getBot().getClient().getSelfId()))
.filter(event -> event.getMessage().getContent().strip().matches("[0-9][0-9][0-9][0-9][0-9]"))
.filter(event -> event.getMessage().getContent().strip().matches("\\d{5}"))
.subscribe(event ->
{
String code = event.getMessage().getContent().strip();

43
discord/src/main/java/me/totalfreedom/discord/util/TFM_Bridge.java
View File

@ -1,18 +1,12 @@
package me.totalfreedom.discord.util;
import discord4j.common.util.Snowflake;
import discord4j.core.object.entity.Guild;
import discord4j.core.object.entity.Member;
import discord4j.core.object.entity.Role;
import me.totalfreedom.discord.Bot;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.GroupProvider;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.rank.Title;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit;
public class TFM_Bridge
@ -37,33 +31,26 @@ public class TFM_Bridge
{
if (role.getId().equals(SnowflakeEntry.OWNER_ROLE_ID.getSnowflake()))
{
return Title.OWNER.getColoredTag();
}
else if (role.getId().equals(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake()))
return FUtil.miniMessage(Title.OWNER.getColoredTag());
} else if (role.getId().equals(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake()))
{
return Title.DEVELOPER.getColoredTag();
}
else if (role.getId().equals(SnowflakeEntry.EXECUTIVE_ROLE_ID.getSnowflake()))
return FUtil.miniMessage(Title.DEVELOPER.getColoredTag());
} else if (role.getId().equals(SnowflakeEntry.EXECUTIVE_ROLE_ID.getSnowflake()))
{
return Title.EXECUTIVE.getColoredTag();
}
else if (role.getId().equals(SnowflakeEntry.ASSISTANT_EXECUTIVE_ROLE_ID.getSnowflake()))
return FUtil.miniMessage(Title.EXECUTIVE.getColoredTag());
} else if (role.getId().equals(SnowflakeEntry.ASSISTANT_EXECUTIVE_ROLE_ID.getSnowflake()))
{
return Title.ASSTEXEC.getColoredTag();
}
else if (role.getId().equals(SnowflakeEntry.SENIOR_ADMIN_ROLE_ID.getSnowflake()))
return FUtil.miniMessage(Title.ASSTEXEC.getColoredTag());
} else if (role.getId().equals(SnowflakeEntry.SENIOR_ADMIN_ROLE_ID.getSnowflake()))
{
return GroupProvider.SENIOR_ADMIN.getGroup().getColoredTag().toString();
}
else if (role.getId().equals(SnowflakeEntry.ADMIN_ROLE_ID.getSnowflake()))
return FUtil.miniMessage(GroupProvider.SENIOR_ADMIN.getGroup().getColoredTag());
} else if (role.getId().equals(SnowflakeEntry.ADMIN_ROLE_ID.getSnowflake()))
{
return GroupProvider.ADMIN.getGroup().getColoredTag().toString();
}
else if (role.getId().equals(SnowflakeEntry.MASTERBUILDER_ROLE_ID.getSnowflake()))
return FUtil.miniMessage(GroupProvider.ADMIN.getGroup().getColoredTag());
} else if (role.getId().equals(SnowflakeEntry.MASTERBUILDER_ROLE_ID.getSnowflake()))
{
return GroupProvider.MASTER_BUILDER.getGroup().getColoredTag().toString());
}
else
return FUtil.miniMessage(GroupProvider.MASTER_BUILDER.getGroup().getColoredTag());
} else
{
return "";
}