From 91775dd2ecc3f3e70dd422f68cf6d06e74db5d49 Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 15 Oct 2018 18:07:29 +0100 Subject: Start work on commands refactoring Long term goals are: - tab completion - auto generate usage/info messages --- .../spark/forge/ForgeClientCommandHandler.java | 70 ----------- .../spark/forge/ForgeClientSparkPlatform.java | 70 +++++++++++ .../me/lucko/spark/forge/ForgeCommandHandler.java | 137 --------------------- .../spark/forge/ForgeServerCommandHandler.java | 73 ----------- .../spark/forge/ForgeServerSparkPlatform.java | 73 +++++++++++ .../me/lucko/spark/forge/ForgeSparkPlatform.java | 137 +++++++++++++++++++++ .../java/me/lucko/spark/forge/SparkForgeMod.java | 4 +- 7 files changed, 282 insertions(+), 282 deletions(-) delete mode 100644 spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java create mode 100644 spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java delete mode 100644 spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java delete mode 100644 spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java create mode 100644 spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java create mode 100644 spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java (limited to 'spark-forge/src/main/java') diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java deleted file mode 100644 index 7706b42..0000000 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * This file is part of spark. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.lucko.spark.forge; - -import me.lucko.spark.sampler.TickCounter; - -import net.minecraft.client.Minecraft; -import net.minecraft.command.ICommandSender; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.client.ClientCommandHandler; -import net.minecraftforge.fml.common.gameevent.TickEvent; - -import java.util.Collections; -import java.util.List; - -public class ForgeClientCommandHandler extends ForgeCommandHandler { - - public static void register() { - ClientCommandHandler.instance.registerCommand(new ForgeClientCommandHandler()); - } - - @Override - protected void broadcast(ITextComponent msg) { - Minecraft.getMinecraft().player.sendMessage(msg); - } - - @Override - protected TickCounter newTickCounter() { - return new ForgeTickCounter(TickEvent.Type.CLIENT); - } - - @Override - public String getLabel() { - return "sparkclient"; - } - - @Override - public String getName() { - return "sparkclient"; - } - - @Override - public List getAliases() { - return Collections.singletonList("cprofiler"); - } - - @Override - public boolean checkPermission(MinecraftServer server, ICommandSender sender) { - return true; - } -} diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java new file mode 100644 index 0000000..d073497 --- /dev/null +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java @@ -0,0 +1,70 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package me.lucko.spark.forge; + +import me.lucko.spark.sampler.TickCounter; + +import net.minecraft.client.Minecraft; +import net.minecraft.command.ICommandSender; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.client.ClientCommandHandler; +import net.minecraftforge.fml.common.gameevent.TickEvent; + +import java.util.Collections; +import java.util.List; + +public class ForgeClientSparkPlatform extends ForgeSparkPlatform { + + public static void register() { + ClientCommandHandler.instance.registerCommand(new ForgeClientSparkPlatform()); + } + + @Override + protected void broadcast(ITextComponent msg) { + Minecraft.getMinecraft().player.sendMessage(msg); + } + + @Override + public TickCounter newTickCounter() { + return new ForgeTickCounter(TickEvent.Type.CLIENT); + } + + @Override + public String getLabel() { + return "sparkclient"; + } + + @Override + public String getName() { + return "sparkclient"; + } + + @Override + public List getAliases() { + return Collections.singletonList("cprofiler"); + } + + @Override + public boolean checkPermission(MinecraftServer server, ICommandSender sender) { + return true; + } +} diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java deleted file mode 100644 index baf670d..0000000 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * This file is part of spark. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.lucko.spark.forge; - -import com.google.common.util.concurrent.ThreadFactoryBuilder; - -import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.sampler.ThreadDumper; - -import net.kyori.text.TextComponent; -import net.kyori.text.serializer.ComponentSerializers; -import net.minecraft.command.CommandException; -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.event.ClickEvent; -import net.minecraftforge.fml.common.Mod; - -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.annotation.Nullable; - -@SuppressWarnings("NullableProblems") -public abstract class ForgeCommandHandler extends CommandHandler implements ICommand { - - private final ExecutorService worker = Executors.newSingleThreadExecutor( - new ThreadFactoryBuilder().setNameFormat("spark-forge-async-worker").build() - ); - - @Override - public String getVersion() { - return SparkForgeMod.class.getAnnotation(Mod.class).version(); - } - - @SuppressWarnings("deprecation") - protected ITextComponent colorize(String message) { - TextComponent component = ComponentSerializers.LEGACY.deserialize(message, '&'); - return ITextComponent.Serializer.jsonToComponent(ComponentSerializers.JSON.serialize(component)); - } - - protected abstract void broadcast(ITextComponent msg); - - @Override - protected void sendMessage(ICommandSender sender, String message) { - sender.sendMessage(colorize(message)); - } - - @Override - protected void sendMessage(String message) { - ITextComponent msg = colorize(message); - broadcast(msg); - } - - @Override - protected void sendLink(String url) { - TextComponentString msg = new TextComponentString(url); - Style style = msg.getStyle(); - style.setColor(TextFormatting.GRAY); - style.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)); - msg.setStyle(style); - - broadcast(msg); - } - - @Override - protected void runAsync(Runnable r) { - worker.execute(r); - } - - @Override - protected ThreadDumper getDefaultThreadDumper() { - return new ThreadDumper.Specific(new long[]{Thread.currentThread().getId()}); - } - - // implement ICommand - - @Override - public String getUsage(ICommandSender iCommandSender) { - return "/" + getLabel(); - } - - @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { - if (!checkPermission(server, sender)) { - TextComponentString msg = new TextComponentString("You do not have permission to use this command."); - Style style = msg.getStyle(); - style.setColor(TextFormatting.GRAY); - msg.setStyle(style); - - sender.sendMessage(msg); - return; - } - - handleCommand(sender, args); - } - - @Override - public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos blockPos) { - return Collections.emptyList(); - } - - @Override - public boolean isUsernameIndex(String[] strings, int i) { - return false; - } - - @Override - public int compareTo(ICommand o) { - return getLabel().compareTo(o.getName()); - } -} diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java deleted file mode 100644 index 7f119e0..0000000 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of spark. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.lucko.spark.forge; - -import me.lucko.spark.sampler.TickCounter; - -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.gameevent.TickEvent; - -import java.util.Collections; -import java.util.List; - -public class ForgeServerCommandHandler extends ForgeCommandHandler { - - @Override - protected void broadcast(ITextComponent msg) { - FMLCommonHandler.instance().getMinecraftServerInstance().sendMessage(msg); - - List players = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayers(); - for (EntityPlayerMP player : players) { - if (player.canUseCommand(4, "spark.profiler")) { - player.sendMessage(msg); - } - } - } - - @Override - protected TickCounter newTickCounter() { - return new ForgeTickCounter(TickEvent.Type.SERVER); - } - - @Override - public String getLabel() { - return "spark"; - } - - @Override - public String getName() { - return "spark"; - } - - @Override - public List getAliases() { - return Collections.singletonList("profiler"); - } - - @Override - public boolean checkPermission(MinecraftServer server, ICommandSender sender) { - return sender.canUseCommand(4, "spark.profiler"); - } -} diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java new file mode 100644 index 0000000..6b64b95 --- /dev/null +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java @@ -0,0 +1,73 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package me.lucko.spark.forge; + +import me.lucko.spark.sampler.TickCounter; + +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.gameevent.TickEvent; + +import java.util.Collections; +import java.util.List; + +public class ForgeServerSparkPlatform extends ForgeSparkPlatform { + + @Override + protected void broadcast(ITextComponent msg) { + FMLCommonHandler.instance().getMinecraftServerInstance().sendMessage(msg); + + List players = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayers(); + for (EntityPlayerMP player : players) { + if (player.canUseCommand(4, "spark.profiler")) { + player.sendMessage(msg); + } + } + } + + @Override + public TickCounter newTickCounter() { + return new ForgeTickCounter(TickEvent.Type.SERVER); + } + + @Override + public String getLabel() { + return "spark"; + } + + @Override + public String getName() { + return "spark"; + } + + @Override + public List getAliases() { + return Collections.singletonList("profiler"); + } + + @Override + public boolean checkPermission(MinecraftServer server, ICommandSender sender) { + return sender.canUseCommand(4, "spark.profiler"); + } +} diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java new file mode 100644 index 0000000..542c782 --- /dev/null +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java @@ -0,0 +1,137 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package me.lucko.spark.forge; + +import com.google.common.util.concurrent.ThreadFactoryBuilder; + +import me.lucko.spark.common.SparkPlatform; +import me.lucko.spark.sampler.ThreadDumper; + +import net.kyori.text.TextComponent; +import net.kyori.text.serializer.ComponentSerializers; +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommand; +import net.minecraft.command.ICommandSender; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraftforge.fml.common.Mod; + +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import javax.annotation.Nullable; + +@SuppressWarnings("NullableProblems") +public abstract class ForgeSparkPlatform extends SparkPlatform implements ICommand { + + private final ExecutorService worker = Executors.newSingleThreadExecutor( + new ThreadFactoryBuilder().setNameFormat("spark-forge-async-worker").build() + ); + + @Override + public String getVersion() { + return SparkForgeMod.class.getAnnotation(Mod.class).version(); + } + + @SuppressWarnings("deprecation") + protected ITextComponent colorize(String message) { + TextComponent component = ComponentSerializers.LEGACY.deserialize(message, '&'); + return ITextComponent.Serializer.jsonToComponent(ComponentSerializers.JSON.serialize(component)); + } + + protected abstract void broadcast(ITextComponent msg); + + @Override + public void sendMessage(ICommandSender sender, String message) { + sender.sendMessage(colorize(message)); + } + + @Override + public void sendMessage(String message) { + ITextComponent msg = colorize(message); + broadcast(msg); + } + + @Override + public void sendLink(String url) { + TextComponentString msg = new TextComponentString(url); + Style style = msg.getStyle(); + style.setColor(TextFormatting.GRAY); + style.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)); + msg.setStyle(style); + + broadcast(msg); + } + + @Override + public void runAsync(Runnable r) { + worker.execute(r); + } + + @Override + public ThreadDumper getDefaultThreadDumper() { + return new ThreadDumper.Specific(new long[]{Thread.currentThread().getId()}); + } + + // implement ICommand + + @Override + public String getUsage(ICommandSender iCommandSender) { + return "/" + getLabel(); + } + + @Override + public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + if (!checkPermission(server, sender)) { + TextComponentString msg = new TextComponentString("You do not have permission to use this command."); + Style style = msg.getStyle(); + style.setColor(TextFormatting.GRAY); + msg.setStyle(style); + + sender.sendMessage(msg); + return; + } + + executeCommand(sender, args); + } + + @Override + public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos blockPos) { + return Collections.emptyList(); + } + + @Override + public boolean isUsernameIndex(String[] strings, int i) { + return false; + } + + @Override + public int compareTo(ICommand o) { + return getLabel().compareTo(o.getName()); + } +} diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/SparkForgeMod.java b/spark-forge/src/main/java/me/lucko/spark/forge/SparkForgeMod.java index fb62718..133ec09 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/SparkForgeMod.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/SparkForgeMod.java @@ -38,13 +38,13 @@ public class SparkForgeMod { @EventHandler public void init(FMLInitializationEvent e) { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - ForgeClientCommandHandler.register(); + ForgeClientSparkPlatform.register(); } } @EventHandler public void serverInit(FMLServerStartingEvent e) { - e.registerServerCommand(new ForgeServerCommandHandler()); + e.registerServerCommand(new ForgeServerSparkPlatform()); } } -- cgit