ChromaGaming/ButtonPresents
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Changed to the new command system

Browse source
This commit is contained in:
alisolarflare 2017-05-22 14:51:32 -04:00
parent 9b145bef9a
commit 99a0b25885
15 changed files with 118 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/buttondevteam/presents/architecture/Component.java
View file

@ -6,7 +6,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.chat.TBMCChatAPI;
import buttondevteam.presents.architecture.commands.BaseCommand;
import buttondevteam.lib.chat.TBMCCommandBase;
/**
* A Module class allows the compacting of projects into one single package.
@ -34,7 +34,7 @@ public abstract class Component{
* @param label Name of the command in plugin.yml
* @param commandExecutor Custom coded CommandExecutor class
*/
protected void registerCommand(JavaPlugin plugin, BaseCommand commandBase){
protected void registerCommand(JavaPlugin plugin, TBMCCommandBase commandBase){
TBMCChatAPI.AddCommand(plugin, commandBase);
//plugin.getCommand(commandBase.getClass().getSimpleName().toString()).setExecutor(commandBase);
}

2
src/main/java/buttondevteam/presents/architecture/commands/BaseCommand.java
View file

@ -8,8 +8,8 @@ import buttondevteam.lib.chat.TBMCCommandBase;
public abstract class BaseCommand extends TBMCCommandBase implements CommandExecutor{
/**replaces CommandExecutor functionality**/
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
// TODO Auto-generated method stub
return OnCommand(sender, label, args);
}
@Override

8
src/main/java/buttondevteam/presents/architecture/commands/ModCommand.java
View file

@ -1,5 +1,8 @@
package buttondevteam.presents.architecture.commands;
import buttondevteam.lib.chat.CommandClass;
@CommandClass(modOnly = true)
public abstract class ModCommand extends PlayerCommand{
@Override
@ -9,9 +12,4 @@ public abstract class ModCommand extends PlayerCommand{
"If you're a dev, write the help text you lazy bastard. -Ali"
};
}
@Override
public boolean GetModOnly() {
return true;
}
}

29
src/main/java/buttondevteam/presents/architecture/commands/PlayerCommand.java
View file

@ -1,30 +1,15 @@
package buttondevteam.presents.architecture.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public abstract class PlayerCommand extends BaseCommand{
/**replaces CommandExecutor functionality*/
@Override
public boolean onCommand(CommandSender sender, Command command, String string, String[] args){
return OnCommand(sender, string, args);
}
/**replaces TBMCCommandBase functionality*/
@Override
public boolean OnCommand(CommandSender sender, String alias, String[] args){
return OnCommand((Player) sender, alias, args);
}
public abstract boolean OnCommand(Player player, String alias, String[] args);
@Override
public boolean GetPlayerOnly() {
return true;
}
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.lib.chat.PlayerCommandBase;
@CommandClass(modOnly = false)
public abstract class PlayerCommand extends PlayerCommandBase{
public abstract boolean OnCommand(Player player, String alias, String[] args);
@Override
public boolean GetModOnly() {
return false;
}
@Override
public String[] GetHelpText(String alias){
return new String[] {

14
src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java
View file

@ -1,5 +1,8 @@
package buttondevteam.presents.architecture.commands;
import buttondevteam.lib.chat.CommandClass;
@CommandClass(modOnly = false)
public abstract class UniversalCommand extends BaseCommand{
@Override
public String[] GetHelpText(String alias){
@ -7,15 +10,4 @@ public abstract class UniversalCommand extends BaseCommand{
"This command doesn't have help text. ",
};
}
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
}

7
src/main/java/buttondevteam/presents/hello/commands/HelloCommand.java
View file

@ -2,8 +2,10 @@ package buttondevteam.presents.hello.commands;
import org.bukkit.command.CommandSender;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.UniversalCommand;
@CommandClass(modOnly = false, path="hello command")
public class HelloCommand extends UniversalCommand {
@Override
@ -11,9 +13,4 @@ public class HelloCommand extends UniversalCommand {
sender.sendMessage("Hello World!");
return false;
}
@Override
public String GetCommandPath(){
return "hello command";
}
}

5
src/main/java/buttondevteam/presents/hello/commands/HelloLoad.java
View file

@ -6,8 +6,10 @@ import java.util.List;
import org.bukkit.command.CommandSender;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.UniversalCommand;
@CommandClass(path = "hello load")
public class HelloLoad extends UniversalCommand {
@Override
@ -21,7 +23,4 @@ public class HelloLoad extends UniversalCommand {
}
return true;
}
public String GetCommandPath(){
return "hello load";
}
}

5
src/main/java/buttondevteam/presents/hello/commands/HelloSave.java
View file

@ -4,8 +4,10 @@ import java.util.Arrays;
import org.bukkit.command.CommandSender;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.UniversalCommand;
@CommandClass(path = "hello save")
public class HelloSave extends UniversalCommand {
@Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
@ -23,7 +25,4 @@ public class HelloSave extends UniversalCommand {
}
return false;
}
public String GetCommandPath(){
return "hello save";
}
}

7
src/main/java/buttondevteam/presents/hello/commands/HelloTime.java
View file

@ -6,8 +6,9 @@ import java.util.Date;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.UniversalCommand;
@CommandClass(path = "hello time")
public class HelloTime extends UniversalCommand {
final String path = "hellotime.lastincident";
@ -35,8 +36,4 @@ public class HelloTime extends UniversalCommand {
return dateformatter.format(dateTime);
}
public String GetCommandPath(){
return "hello time";
}
}

3
src/main/java/buttondevteam/presents/hello/effects/HelloBlock.java
View file

@ -16,8 +16,5 @@ public class HelloBlock extends PlayerCommand {
return false;
}
public String GetCommandPath(){
return "hello block";
}
}

13
src/main/java/buttondevteam/presents/hello/effects/HelloCow.java
View file

@ -3,8 +3,9 @@ package buttondevteam.presents.hello.effects;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.PlayerCommand;
@CommandClass(path = "hello cow")
public class HelloCow extends PlayerCommand {
@Override
@ -15,14 +16,4 @@ public class HelloCow extends PlayerCommand {
);
return true;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return true;
}
@Override
public String GetCommandPath(){
return "hello cow";
}
}

16
src/main/java/buttondevteam/presents/hello/effects/HelloItem.java
View file

@ -4,9 +4,11 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import buttondevteam.presents.architecture.commands.PlayerCommand;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.ModCommand;
public class HelloItem extends PlayerCommand {
@CommandClass(path = "hello item")
public class HelloItem extends ModCommand {
@Override
public boolean OnCommand(Player player, String alias, String[] args) {
@ -15,14 +17,6 @@ public class HelloItem extends PlayerCommand {
return true;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return true;
}
@Override
public String GetCommandPath(){
return "hello item";
}
}

5
src/main/java/buttondevteam/presents/hello/effects/HelloMagicPotato.java
View file

@ -8,8 +8,10 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.ModCommand;
@CommandClass(path = "hello magicpotato")
public class HelloMagicPotato extends ModCommand {
@Override
@ -31,7 +33,4 @@ public class HelloMagicPotato extends ModCommand {
return true;
}
public String GetCommandPath(){
return "hello magicpotato";
}
}

2
src/main/java/buttondevteam/presents/hello/effects/HelloParticle.java
View file

@ -3,8 +3,10 @@ package buttondevteam.presents.hello.effects;
import org.bukkit.Particle;
import org.bukkit.entity.Player;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.PlayerCommand;
@CommandClass(path = "hello particle")
public class HelloParticle extends PlayerCommand {
@Override

5
src/main/java/buttondevteam/presents/hello/effects/HelloSound.java
View file

@ -3,8 +3,10 @@ package buttondevteam.presents.hello.effects;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import buttondevteam.lib.chat.CommandClass;
import buttondevteam.presents.architecture.commands.PlayerCommand;
@CommandClass(path = "hello sound")
public class HelloSound extends PlayerCommand{
@Override
@ -31,8 +33,5 @@ public class HelloSound extends PlayerCommand{
return false;
}
public String GetCommandPath(){
return "hello sound";
}
}