From e70c4d836b296f0eab99388fdb66c19c8c73d94b Mon Sep 17 00:00:00 2001 From: Cody <149296239+notdevcody@users.noreply.github.com> Date: Fri, 12 Apr 2024 00:03:15 +0200 Subject: [PATCH] Minor overhauls and version change to 2.0.0 --- pom.xml | 33 ++++++++------- .../org/bukkit/command/SimpleCommandMap.java | 12 +++--- .../uk/betacraft/uberbukkit/Uberbukkit.java | 16 +++++--- .../command}/CrackedAllowlistCommand.java | 2 +- .../uberbukkit/command}/FlushInvCommand.java | 2 +- .../uberbukkit/command/UberBukkitCommand.java | 23 +++++++++++ .../uberbukkit/command/UuidLookupCommand.java | 40 +++++++++++++++++++ 7 files changed, 98 insertions(+), 30 deletions(-) rename src/main/java/{org/bukkit/command/defaults => uk/betacraft/uberbukkit/command}/CrackedAllowlistCommand.java (97%) rename src/main/java/{org/bukkit/command/defaults => uk/betacraft/uberbukkit/command}/FlushInvCommand.java (98%) create mode 100644 src/main/java/uk/betacraft/uberbukkit/command/UberBukkitCommand.java create mode 100644 src/main/java/uk/betacraft/uberbukkit/command/UuidLookupCommand.java diff --git a/pom.xml b/pom.xml index 60918c1a..608d7a8a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ - 4.0.0 org.bukkit - project-poseidon + uberbukkit jar - 1.1.8 - Project-Poseidon + 2.0.0 + UberBukkit UTF-8 unknown @@ -73,7 +73,6 @@ ${project.basedir}/libs/ModLoaderMP.jar - org.avaje ebean @@ -120,20 +119,20 @@ gson 2.9.0 - + clean install - - - - - - - - - + + + + + + + + + org.apache.maven.plugins @@ -143,8 +142,8 @@ org.bukkit.craftbukkit.Main - Project-Posiden - RhysB + UberBukkit + Moresteck Bukkit ${api.version} Bukkit Team diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java index cf4b6e19..86097308 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -2,16 +2,17 @@ import org.bukkit.Server; import org.bukkit.command.defaults.*; +import uk.betacraft.uberbukkit.command.*; import java.util.*; import static org.bukkit.util.Java15Compat.Arrays_copyOfRange; public class SimpleCommandMap implements CommandMap { - protected final Map knownCommands = new HashMap(); - protected final Set aliases = new HashSet(); + protected final Map knownCommands = new HashMap<>(); + protected final Set aliases = new HashSet<>(); private final Server server; - protected static final Set fallbackCommands = new HashSet(); + protected static final Set fallbackCommands = new HashSet<>(); static { fallbackCommands.add(new ListCommand()); @@ -43,9 +44,10 @@ public SimpleCommandMap(final Server server) { } private void setDefaultCommands(final Server server) { - register("poseidon", new PoseidonCommand("poseidon")); - register("uberbukkit", new CrackedAllowlistCommand()); + register("uberbukkit", new UberBukkitCommand()); register("uberbukkit", new FlushInvCommand()); + register("uberbukkit", new UuidLookupCommand()); + register("uberbukkit", new CrackedAllowlistCommand()); register("bukkit", new VersionCommand("version")); register("bukkit", new ReloadCommand("reload")); register("bukkit", new PluginsCommand("plugins")); diff --git a/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java b/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java index 712880cf..a0f53d14 100644 --- a/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java +++ b/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java @@ -1,16 +1,16 @@ package uk.betacraft.uberbukkit; -import java.util.LinkedList; -import java.util.List; - -import org.bukkit.Bukkit; - import com.legacyminecraft.poseidon.PoseidonConfig; - import net.minecraft.server.MinecraftServer; +import org.bukkit.Bukkit; import uk.betacraft.uberbukkit.protocol.Protocol; +import java.util.LinkedList; +import java.util.List; + public class Uberbukkit { + // TODO: Change this automatically migration to Gradle + private static final String version = "2.0.0"; private static Integer pvn = null; private static List pvns = null; @@ -59,4 +59,8 @@ public static List getAllowedPVNs() { public static Protocol getProtocolHandler() { return Protocol.getProtocolClass(getTargetPVN()); } + + public static String getVersion() { + return version; + } } diff --git a/src/main/java/org/bukkit/command/defaults/CrackedAllowlistCommand.java b/src/main/java/uk/betacraft/uberbukkit/command/CrackedAllowlistCommand.java similarity index 97% rename from src/main/java/org/bukkit/command/defaults/CrackedAllowlistCommand.java rename to src/main/java/uk/betacraft/uberbukkit/command/CrackedAllowlistCommand.java index ec41854d..27418315 100644 --- a/src/main/java/org/bukkit/command/defaults/CrackedAllowlistCommand.java +++ b/src/main/java/uk/betacraft/uberbukkit/command/CrackedAllowlistCommand.java @@ -1,4 +1,4 @@ -package org.bukkit.command.defaults; +package uk.betacraft.uberbukkit.command; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/main/java/org/bukkit/command/defaults/FlushInvCommand.java b/src/main/java/uk/betacraft/uberbukkit/command/FlushInvCommand.java similarity index 98% rename from src/main/java/org/bukkit/command/defaults/FlushInvCommand.java rename to src/main/java/uk/betacraft/uberbukkit/command/FlushInvCommand.java index 0bb495e0..c9ace7e5 100644 --- a/src/main/java/org/bukkit/command/defaults/FlushInvCommand.java +++ b/src/main/java/uk/betacraft/uberbukkit/command/FlushInvCommand.java @@ -1,4 +1,4 @@ -package org.bukkit.command.defaults; +package uk.betacraft.uberbukkit.command; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/uk/betacraft/uberbukkit/command/UberBukkitCommand.java b/src/main/java/uk/betacraft/uberbukkit/command/UberBukkitCommand.java new file mode 100644 index 00000000..9ec9ea1c --- /dev/null +++ b/src/main/java/uk/betacraft/uberbukkit/command/UberBukkitCommand.java @@ -0,0 +1,23 @@ +package uk.betacraft.uberbukkit.command; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import uk.betacraft.uberbukkit.Uberbukkit; + +public class UberBukkitCommand extends Command { + public UberBukkitCommand() { + super("uberbukkit"); + this.description = "Shows information about the UberBukkit version ran on the server"; + this.usageMessage = "/uberbukkit"; + } + + @Override + public boolean execute(CommandSender sender, String commandLabel, String[] args) { + sender.sendMessage(ChatColor.GRAY + "This server is running " + ChatColor.RED + "UberBukkit " + ChatColor.GOLD + Uberbukkit.getVersion()); + sender.sendMessage(ChatColor.GRAY + "Based on Project Poseidon " + ChatColor.AQUA + Bukkit.getServer().getPoseidonVersion()); + + return true; + } +} diff --git a/src/main/java/uk/betacraft/uberbukkit/command/UuidLookupCommand.java b/src/main/java/uk/betacraft/uberbukkit/command/UuidLookupCommand.java new file mode 100644 index 00000000..eb49cf8f --- /dev/null +++ b/src/main/java/uk/betacraft/uberbukkit/command/UuidLookupCommand.java @@ -0,0 +1,40 @@ +package uk.betacraft.uberbukkit.command; + +import com.projectposeidon.api.PoseidonUUID; +import com.projectposeidon.api.UUIDType; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; + +import java.util.UUID; + +public class UuidLookupCommand extends Command { + public UuidLookupCommand() { + super("uuidlookup"); + this.usageMessage = "/uuidlookup "; + } + + @Override + public boolean execute(CommandSender sender, String commandLabel, String[] args) { + if (args.length != 1) { + sender.sendMessage(ChatColor.GRAY + "Usage: " + ChatColor.WHITE + "/uuidlookup " + ChatColor.AQUA + ""); + return true; + } + + UUID uuid = PoseidonUUID.getPlayerUUIDFromCache(args[0], true); + if (uuid == null) { + uuid = PoseidonUUID.getPlayerUUIDFromCache(args[0], false); + } + + if (uuid == null) { + sender.sendMessage(ChatColor.GRAY + "Unable to locate the UUID of the player called " + ChatColor.AQUA + args[0] + ChatColor.GRAY + "! Please remember usernames are cap sensitive"); + return true; + } + + UUIDType uuidType = PoseidonUUID.getPlayerUUIDCacheStatus(args[0]); + sender.sendMessage(ChatColor.GRAY + "uuidlookup > " + ChatColor.AQUA + args[0] + ChatColor.GRAY + " - " + ChatColor.GOLD + "UUID Type: " + ChatColor.YELLOW + uuidType.toString()); + sender.sendMessage(ChatColor.GRAY + "uuidlookup > " + ChatColor.YELLOW + "UUID: " + ChatColor.WHITE + uuid); + + return true; + } +}