diff --git a/.idea/misc.xml b/.idea/misc.xml index 1014481..e405a1f 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml index df2c815..31ba17d 100644 --- a/BuildConfigUpdater/BuildConfigUpdater.iml +++ b/BuildConfigUpdater/BuildConfigUpdater.iml @@ -12,6 +12,7 @@ + diff --git a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml deleted file mode 100644 index 25360d4..0000000 --- a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ButtonCore/src/main/java/buttondevteam/core/ThorpeCommand.java b/ButtonCore/src/main/java/buttondevteam/core/ChromaCommand.java similarity index 81% rename from ButtonCore/src/main/java/buttondevteam/core/ThorpeCommand.java rename to ButtonCore/src/main/java/buttondevteam/core/ChromaCommand.java index 91f2d5c..f17dbf8 100644 --- a/ButtonCore/src/main/java/buttondevteam/core/ThorpeCommand.java +++ b/ButtonCore/src/main/java/buttondevteam/core/ChromaCommand.java @@ -6,11 +6,11 @@ import buttondevteam.lib.chat.ICommand2MC; import org.bukkit.command.CommandSender; @CommandClass -public class ThorpeCommand extends ICommand2MC { +public class ChromaCommand extends ICommand2MC { @Command2.Subcommand //TODO: Main permissions (groups) like 'mod' public void reload(CommandSender sender) { if (MainPlugin.Instance.tryReloadConfig()) - sender.sendMessage("§bConfig reloaded."); + sender.sendMessage("§bCore config reloaded."); else sender.sendMessage("§cFailed to reload config. Check console."); } diff --git a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java index 01132f9..d5b690b 100755 --- a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java +++ b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java @@ -97,7 +97,7 @@ public class MainPlugin extends ButtonPlugin { Component.registerComponent(this, new VotifierComponent(economy)); ComponentManager.enableComponents(); getCommand2MC().registerCommand(new ComponentCommand()); - getCommand2MC().registerCommand(new ThorpeCommand()); + getCommand2MC().registerCommand(new ChromaCommand()); TBMCCoreAPI.RegisterEventsForExceptions(new PlayerListener(), this); TBMCCoreAPI.RegisterEventsForExceptions(getCommand2MC(), this); ChromaGamerBase.addConverter(commandSender -> Optional.ofNullable(commandSender instanceof ConsoleCommandSender || commandSender instanceof BlockCommandSender diff --git a/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java index 097b90a..d29a9e8 100755 --- a/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java +++ b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java @@ -93,7 +93,7 @@ public class PlayerListener implements Listener { String msg = MainPlugin.Instance.chatFormat().get() .replace("{channel}", event.getChannel().DisplayName().get()) .replace("{origin}", event.getOrigin().substring(0, 1)) - .replace("{name}", ThorpeUtils.getDisplayName(event.getSender())) + .replace("{name}", ChromaUtils.getDisplayName(event.getSender())) .replace("{message}", event.getMessage()); for (Player player : Bukkit.getOnlinePlayers()) if (event.shouldSendTo(player)) diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java b/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java index a9b9970..12cc43b 100644 --- a/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java +++ b/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java @@ -98,8 +98,8 @@ public class SpawnComponent extends Component implements PluginMessa Bukkit.getScheduler().runTask(getPlugin(), () -> { //Delay it a bit ByteArrayDataOutput outt = ByteStreams.newDataOutput(); - outt.writeUTF("Forward"); // So BungeeCord knows to forward it - outt.writeUTF("ALL"); + outt.writeUTF("ForwardToPlayer"); // So BungeeCord knows to forward it + outt.writeUTF(player.getName()); outt.writeUTF("ChromaCore-Spawn"); // The channel name to check if this your data ByteArrayOutputStream msgbytes = new ByteArrayOutputStream(); diff --git a/ButtonCore/src/main/java/buttondevteam/lib/ThorpeUtils.java b/ButtonCore/src/main/java/buttondevteam/lib/ChromaUtils.java similarity index 97% rename from ButtonCore/src/main/java/buttondevteam/lib/ThorpeUtils.java rename to ButtonCore/src/main/java/buttondevteam/lib/ChromaUtils.java index bf19323..7fa3105 100644 --- a/ButtonCore/src/main/java/buttondevteam/lib/ThorpeUtils.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/ChromaUtils.java @@ -9,8 +9,8 @@ import org.bukkit.event.Event; import java.util.function.Supplier; -public final class ThorpeUtils { - private ThorpeUtils() {} +public final class ChromaUtils { + private ChromaUtils() {} public static String getDisplayName(CommandSender sender) { if (sender instanceof IHaveFancyName) diff --git a/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java b/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java index b14f7c6..2d74f3e 100644 --- a/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java @@ -1,7 +1,7 @@ package buttondevteam.lib.architecture; import buttondevteam.core.MainPlugin; -import buttondevteam.lib.ThorpeUtils; +import buttondevteam.lib.ChromaUtils; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -101,7 +101,7 @@ public class ConfigData { return hmm; } if (val instanceof Number && def != null) - val = ThorpeUtils.convertNumber((Number) val, + val = ChromaUtils.convertNumber((Number) val, (Class) def.getClass()); if (val instanceof List && def != null && def.getClass().isArray()) val = ((List) val).toArray((T[]) Array.newInstance(def.getClass().getComponentType(), 0)); diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java index f6f3798..eea8a2b 100644 --- a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java @@ -1,8 +1,8 @@ package buttondevteam.lib.chat; import buttondevteam.core.MainPlugin; +import buttondevteam.lib.ChromaUtils; import buttondevteam.lib.TBMCCoreAPI; -import buttondevteam.lib.ThorpeUtils; import buttondevteam.lib.player.ChromaGamerBase; import com.google.common.base.Defaults; import com.google.common.primitives.Primitives; @@ -60,7 +60,7 @@ public abstract class Command2 String[] helpText() default {}; /** - * The main permission which allows using this command (individual access can be still granted with "thorpe.command.X"). + * The main permission which allows using this command (individual access can be still granted with "chroma.command.X"). * Used to be "tbmc.admin". The {@link #MOD_GROUP} is provided to use with this. */ String permGroup() default ""; //TODO @@ -208,7 +208,7 @@ public abstract class Command2 } else if (Number.class.isAssignableFrom(cl) || cl.isPrimitive()) { try { //noinspection unchecked - Number n = ThorpeUtils.convertNumber(NumberFormat.getInstance().parse(param), (Class) cl); + Number n = ChromaUtils.convertNumber(NumberFormat.getInstance().parse(param), (Class) cl); params.add(n); } catch (ParseException e) { sender.sendMessage("§c'" + param + "' is not a number."); diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java index e111d77..809cc46 100644 --- a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java @@ -24,7 +24,7 @@ public class Command2MC extends Command2 implemen @Override public void registerCommand(ICommand2MC command) { super.registerCommand(command, '/'); - var perm = "thorpe.command." + command.getCommandPath().replace(' ', '.'); + var perm = "chroma.command." + command.getCommandPath().replace(' ', '.'); if (Bukkit.getPluginManager().getPermission(perm) == null) //Check needed for plugin reset Bukkit.getPluginManager().addPermission(new Permission(perm, modOnly(command) ? PermissionDefault.OP : PermissionDefault.TRUE)); //Allow commands by default, unless it's mod only - TODO: Test @@ -32,7 +32,7 @@ public class Command2MC extends Command2 implemen if (!method.isAnnotationPresent(Subcommand.class)) continue; String pg = permGroup(command, method); if (pg.length() == 0) continue; - perm = "thorpe." + pg; + perm = "chroma." + pg; if (Bukkit.getPluginManager().getPermission(perm) == null) //It may occur multiple times Bukkit.getPluginManager().addPermission(new Permission(perm, //pg.equals(Subcommand.MOD_GROUP) ? PermissionDefault.OP : PermissionDefault.TRUE)); //Allow commands by default, unless it's mod only @@ -50,8 +50,8 @@ public class Command2MC extends Command2 implemen String pg; boolean p = true; String[] perms = { - "thorpe.command." + command.getCommandPath().replace(' ', '.'), - (pg = permGroup(command, method)).length() > 0 ? "thorpe." + pg : null, + "chroma.command." + command.getCommandPath().replace(' ', '.'), + (pg = permGroup(command, method)).length() > 0 ? "chroma." + pg : null, modOnly(command) ? "tbmc.admin" : null }; for (String perm : perms) { diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/CommandClass.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/CommandClass.java index bc17204..327ebe7 100755 --- a/ButtonCore/src/main/java/buttondevteam/lib/chat/CommandClass.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/CommandClass.java @@ -46,7 +46,7 @@ public @interface CommandClass { String[] helpText() default {}; /** - * The main permission which allows using this command (individual access can be still granted with "thorpe.command.X"). + * The main permission which allows using this command (individual access can be still granted with "chroma.command.X"). * Used to be "tbmc.admin" */ String permGroup() default ""; //TODO: A single annotation instead of these two diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java index 92dece9..b6b160b 100755 --- a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java @@ -287,7 +287,7 @@ public class TBMCChatAPI { Bukkit.getPluginManager().callEvent(event); return event.isCancelled(); }; - return ThorpeUtils.doItAsync(task, false); //Not cancelled if async + return ChromaUtils.doItAsync(task, false); //Not cancelled if async } /** @@ -307,7 +307,7 @@ public class TBMCChatAPI { if (!Arrays.asList(exceptions).contains("Minecraft")) Bukkit.getConsoleSender().sendMessage("[" + channel.DisplayName().get() + "] " + message); TBMCSystemChatEvent event = new TBMCSystemChatEvent(channel, message, rtr.score, rtr.groupID, exceptions, target); - return ThorpeUtils.callEventAsync(event); + return ChromaUtils.callEventAsync(event); } private static RecipientTestResult getScoreOrSendError(Channel channel, CommandSender sender) { diff --git a/ButtonProcessor/ButtonProcessor.iml b/ButtonProcessor/ButtonProcessor.iml index b606543..35bfd14 100755 --- a/ButtonProcessor/ButtonProcessor.iml +++ b/ButtonProcessor/ButtonProcessor.iml @@ -13,8 +13,6 @@ - -