oko/OpenNAW
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add chat and nations

Browse source
This commit is contained in:
Anya 2022-04-21 17:56:50 -07:00
parent bcc487623b
commit 6e3f2af410
6 changed files with 74 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pom.xml
View file

@ -69,14 +69,9 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version>
<version>1.18.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>

4
src/main/java/moe/oko/opennaw/OpenNAW.java
View file

@ -1,6 +1,7 @@
package moe.oko.opennaw;
import moe.oko.opennaw.command.NationCommand;
import moe.oko.opennaw.util.ChatHandler;
import moe.oko.opennaw.util.GroupHandler;
import moe.oko.opennaw.util.NationHandler;
import net.luckperms.api.LuckPerms;
@ -34,8 +35,9 @@ public final class OpenNAW extends JavaPlugin {
info("OpenNAW is enabled!");
// Register Commands
// Register Commands & Events
this.getCommand("nation").setExecutor(new NationCommand());
getServer().getPluginManager().registerEvents(new ChatHandler(), this);
}
@Override

14
src/main/java/moe/oko/opennaw/command/NationCommand.java
View file

@ -2,8 +2,6 @@ package moe.oko.opennaw.command;
import moe.oko.opennaw.OpenNAW;
import moe.oko.opennaw.util.CommandHelper;
import net.luckperms.api.model.group.Group;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
@ -22,7 +20,7 @@ public class NationCommand implements TabExecutor {
if (args.length < 1) { return false; }
List<String> nationList = OpenNAW.getInstance().getNationHandler().getNationList();
var nationList = OpenNAW.getInstance().getNationHandler().getNationList();
switch (args[0]) {
case "add" -> {
@ -31,7 +29,7 @@ public class NationCommand implements TabExecutor {
return true;
}
Group group = OpenNAW.getInstance().getGroupHandler().getGroupFromString(args[2]);
var group = OpenNAW.getInstance().getGroupHandler().getGroupFromString(args[2]);
if (group == null) {
sender.sendMessage("Group " + args[2] + " does not exist");
@ -42,7 +40,7 @@ public class NationCommand implements TabExecutor {
sender.sendMessage("Created nation " + args[1]);
}
case "list" -> {
final String msg = nationList.size() == 0
final var msg = nationList.size() == 0
? "There are no nations"
: "There are " + nationList.size() + " nations: " + nationList;
sender.sendMessage(msg);
@ -52,7 +50,7 @@ public class NationCommand implements TabExecutor {
sender.sendMessage("Removed nation " + args[1]);
}
case "join" -> {
OfflinePlayer player = args.length < 3
var player = args.length < 3
? ((Player) sender).getPlayer()
: OpenNAW.getInstance().getServer().getOfflinePlayer(args[2]);
@ -61,13 +59,13 @@ public class NationCommand implements TabExecutor {
return true;
}
Group group = OpenNAW.getInstance().getNationHandler().getNationGroup(args[1]);
var group = OpenNAW.getInstance().getNationHandler().getNationGroup(args[1]);
OpenNAW.getInstance().getGroupHandler().addPlayerToGroup(player, group);
sender.sendMessage("Added " + player.getName() + " to nation " + args[1]);
}
case "leave" -> {
OfflinePlayer player = args.length < 3
var player = args.length < 3
? ((Player) sender).getPlayer()
: OpenNAW.getInstance().getServer().getOfflinePlayer(args[2]);
OpenNAW.getInstance().getGroupHandler().removePlayerFromGroup(player);

19
src/main/java/moe/oko/opennaw/model/City.java Normal file
View file

@ -0,0 +1,19 @@
package moe.oko.opennaw.model;
import org.bukkit.Location;
public class City {
private String name;
private String resource;
private Nation owner;
private Location point;
private short health;
public City(String name, String resource, Location location) {
this.name = name;
this.resource = resource;
this.owner = null;
this.point = location;
this.health = 500;
}
}

36
src/main/java/moe/oko/opennaw/util/ChatHandler.java Normal file
View file

@ -0,0 +1,36 @@
package moe.oko.opennaw.util;
import io.papermc.paper.event.player.AsyncChatEvent;
import moe.oko.opennaw.OpenNAW;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
public class ChatHandler implements Listener {
@EventHandler(priority = EventPriority.HIGHEST)
public void onChat(AsyncChatEvent e) {
var legacyComponentSerializer = LegacyComponentSerializer.builder().character('&').hexColors().build();
var player = e.getPlayer();
Audience audience;
var nationString = "[" + OpenNAW.getInstance().getGroupHandler().getPrefixFromPlayer(player) + "&r] ";
var prefix = legacyComponentSerializer.deserialize(nationString);
var message = e.message();
e.setCancelled(true);
audience = Audience.audience(Bukkit.getOnlinePlayers());
audience.sendMessage(prefix
.append(player.displayName().color(TextColor.fromHexString("#939597")))
.append(Component.text(": "))
.append(message));
}
}

13
src/main/java/moe/oko/opennaw/util/GroupHandler.java
View file

@ -7,13 +7,10 @@ import net.luckperms.api.node.Node;
import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
public record GroupHandler(LuckPerms luckPerms) {
public Group getGroupFromString(String s) {
return this.luckPerms.getGroupManager().getGroup(s);
}
public void addPlayerToGroup(OfflinePlayer player, Group group) {
this.luckPerms.getUserManager().modifyUser(player.getUniqueId(), (User user) -> {
@ -34,4 +31,12 @@ public record GroupHandler(LuckPerms luckPerms) {
user.data().clear(NodeType.INHERITANCE::matches);
});
}
public Group getGroupFromString(String s) {
return this.luckPerms.getGroupManager().getGroup(s);
}
public String getPrefixFromPlayer(Player player) {
var user = this.luckPerms.getUserManager().getUser(player.getUniqueId());
return user.getCachedData().getMetaData().getPrefix();
}
}