Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-27 18:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generalized commands handler so that other plugins (WorldGuard, CraftBook, etc.) can use it too.

Browse Source
This commit is contained in:
sk89q
2011-02-17 22:53:44 -08:00
parent 01f7be3ba3
commit e91c837949
25 changed files with 780 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/sk89q/worldedit/LocalPlayer.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit;
import java.io.File;
import com.sk89q.minecraft.util.commands.CommandsPlayer;
import com.sk89q.worldedit.bags.BlockBag;
import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.util.TargetBlock;
@ -28,7 +29,7 @@ import com.sk89q.worldedit.util.TargetBlock;
*
* @author sk89q
*/
public abstract class LocalPlayer {
public abstract class LocalPlayer implements CommandsPlayer {
/**
* Server.
*/

9
src/com/sk89q/worldedit/WorldEdit.java
View File

@ -29,6 +29,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.io.*;
import javax.script.ScriptException;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandsManager;
import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.LocalSession.CompassMode;
import com.sk89q.worldedit.bags.BlockBag;
@ -840,8 +842,11 @@ public class WorldEdit {
+ StringUtil.joinString(split, " "));
}
return commands.execute(split, this,
session, player, editSession);
Object[] methodArgs = new Object[] {
null, this, session, player, editSession
};
return commands.execute(split, player, methodArgs);
} finally {
session.remember(editSession);
editSession.flushQueue();

5
src/com/sk89q/worldedit/commands/BrushShapeCommands.java
View File

@ -19,8 +19,9 @@
package com.sk89q.worldedit.commands;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.CuboidClipboard;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalConfiguration;

5
src/com/sk89q/worldedit/commands/ChunkCommands.java
View File

@ -21,8 +21,9 @@ package com.sk89q.worldedit.commands;
import java.io.*;
import java.util.Set;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.data.NestedFileChunkStore;

5
src/com/sk89q/worldedit/commands/ClipboardCommands.java
View File

@ -21,8 +21,9 @@ package com.sk89q.worldedit.commands;
import java.io.File;
import java.io.IOException;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.data.DataException;

28
src/com/sk89q/worldedit/commands/CommandPermissions.java
View File

@ -1,28 +0,0 @@
// $Id$
/*
* WorldEdit
* Copyright (C) 2010 sk89q <http://www.sk89q.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.commands;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface CommandPermissions {
String[] value();
}

5
src/com/sk89q/worldedit/commands/GeneralCommands.java
View File

@ -19,8 +19,9 @@
package com.sk89q.worldedit.commands;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.ItemType;

5
src/com/sk89q/worldedit/commands/GenerationCommands.java
View File

@ -19,8 +19,9 @@
package com.sk89q.worldedit.commands;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.util.TreeGenerator;

5
src/com/sk89q/worldedit/commands/HistoryCommands.java
View File

@ -19,8 +19,9 @@
package com.sk89q.worldedit.commands;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
/**

5
src/com/sk89q/worldedit/commands/NavigationCommands.java
View File

@ -19,8 +19,9 @@
package com.sk89q.worldedit.commands;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
/**

5
src/com/sk89q/worldedit/commands/RegionCommands.java
View File

@ -20,8 +20,9 @@
package com.sk89q.worldedit.commands;
import java.util.Set;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.filters.GaussianKernel;

5
src/com/sk89q/worldedit/commands/ScriptingCommands.java
View File

@ -20,8 +20,9 @@
package com.sk89q.worldedit.commands;
import java.io.File;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
/**

5
src/com/sk89q/worldedit/commands/SelectionCommands.java
View File

@ -21,8 +21,9 @@ package com.sk89q.worldedit.commands;
import java.util.List;
import java.util.Set;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.data.ChunkStore;
import com.sk89q.worldedit.regions.Region;

5
src/com/sk89q/worldedit/commands/SnapshotCommands.java
View File

@ -22,8 +22,9 @@ package com.sk89q.worldedit.commands;
import java.io.File;
import java.io.IOException;
import java.util.logging.Logger;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.data.ChunkStore;
import com.sk89q.worldedit.data.DataException;

6
src/com/sk89q/worldedit/commands/SuperPickaxeCommands.java
View File

@ -19,8 +19,10 @@
package com.sk89q.worldedit.commands;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.NestedCommand;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.superpickaxe.*;

5
src/com/sk89q/worldedit/commands/UtilityCommands.java
View File

@ -20,8 +20,9 @@
package com.sk89q.worldedit.commands;
import java.util.Set;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.patterns.*;

4
src/com/sk89q/worldedit/commands/CommandsManager.java → src/com/sk89q/worldedit/commands/WorldEditCommandsManager.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.commands;
package com.sk89q.util.commands;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@ -27,13 +27,13 @@ import java.util.List;
import java.util.Map;
import com.sk89q.util.StringUtil;
import com.sk89q.util.commands.Command;
import com.sk89q.util.commands.CommandContext;
import com.sk89q.util.commands.NestedCommand;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.commands.CommandPermissions;
/**
* Manager for handling commands.

4
src/com/sk89q/worldedit/dev/DocumentationPrinter.java
View File

@ -23,9 +23,9 @@ import java.io.*;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.util.StringUtil;
import com.sk89q.util.commands.Command;
import com.sk89q.worldedit.commands.CommandPermissions;
public class DocumentationPrinter {
public static void main(String[] args) throws IOException {