From a4b74d172b6b96c1554beffe121edb1f11bf028b Mon Sep 17 00:00:00 2001 From: Eric Stokes Date: Sat, 9 Jul 2011 18:13:56 -0600 Subject: [PATCH] More progress --- .../MultiverseCore/command/commands/CoordCommand.java | 10 ++++++---- .../MultiverseCore/command/commands/CreateCommand.java | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java b/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java index d8335b92..d06e594a 100644 --- a/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java +++ b/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java @@ -1,15 +1,17 @@ package com.onarandombox.MultiverseCore.command.commands; +import java.util.List; + import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.command.BaseCommand; import com.onarandombox.utils.LocationManipulation; +import com.pneumaticraft.commandhandler.Command; -public class CoordCommand extends BaseCommand { +public class CoordCommand extends Command { private LocationManipulation locMan = new LocationManipulation(); @@ -24,12 +26,12 @@ public class CoordCommand extends BaseCommand { } @Override - public void execute(CommandSender sender, String[] args) { + public void runCommand(CommandSender sender, List args) { // Check if the command was sent from a Player. if (sender instanceof Player) { Player p = (Player) sender; p.sendMessage(ChatColor.RED + "World: " + ChatColor.WHITE + p.getWorld().getName()); - p.sendMessage(ChatColor.RED + "World Scale: " + ChatColor.WHITE + this.plugin.getMVWorld(p.getWorld().getName()).getScaling()); + p.sendMessage(ChatColor.RED + "World Scale: " + ChatColor.WHITE + ((MultiverseCore) this.plugin).getMVWorld(p.getWorld().getName()).getScaling()); p.sendMessage(ChatColor.RED + "Coordinates: " + ChatColor.WHITE + this.locMan.strCoords(p.getLocation())); p.sendMessage(ChatColor.RED + "Direction: " + ChatColor.WHITE + this.locMan.getDirection(p.getLocation())); p.sendMessage(ChatColor.RED + "Block: " + ChatColor.WHITE + Material.getMaterial(p.getWorld().getBlockTypeIdAt(p.getLocation()))); diff --git a/src/com/onarandombox/MultiverseCore/command/commands/CreateCommand.java b/src/com/onarandombox/MultiverseCore/command/commands/CreateCommand.java index 0dc7bd52..c0595bcb 100644 --- a/src/com/onarandombox/MultiverseCore/command/commands/CreateCommand.java +++ b/src/com/onarandombox/MultiverseCore/command/commands/CreateCommand.java @@ -1,16 +1,16 @@ package com.onarandombox.MultiverseCore.command.commands; import java.io.File; +import java.util.List; import org.bukkit.ChatColor; import org.bukkit.World.Environment; import org.bukkit.command.CommandSender; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.command.BaseCommand; -import com.onarandombox.MultiverseCore.command.CommandManager; +import com.pneumaticraft.commandhandler.Command; -public class CreateCommand extends BaseCommand { +public class CreateCommand extends Command { public CreateCommand(MultiverseCore plugin) { super(plugin); @@ -25,7 +25,7 @@ public class CreateCommand extends BaseCommand { } @Override - public void execute(CommandSender sender, String[] args) { + public void runCommand(CommandSender sender, List args) { if (args.length % 2 != 0) { sender.sendMessage("You must preface your SEED with -s OR your GENERATOR with -g. Type /mv for help"); return;