Merge branch 'master' of https://github.com/aufdemrand/Denizen

DenizenScript · Oct 14, 2013 · a578c4b · a578c4b
2 parents 20fb7d3 + 0c9a226
commit a578c4b
Show file tree

Hide file tree

Showing 8 changed files with 347 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -98,6 +98,12 @@
     		<type>jar</type>
             <scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.sk89q</groupId>
+			<artifactId>worldedit</artifactId>
+			<version>5.5.8</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.sk89q</groupId>
 			<artifactId>worldguard</artifactId>
@@ -118,7 +124,7 @@
 
 	<ciManagement>
 		<system>jenkins</system>
-		<url>http://ci.citizensnpcs.com</url>
+		<url>http://ci.citizensnpcs.co</url>
 	</ciManagement>
 	<scm>
 		<connection>scm:git:git://github.com/aufdemrand/Denizen.git</connection>
@@ -211,5 +217,5 @@
         </plugins>
     </build>
 
-	<url>http://wiki.citizensnpcs.com/Denizen</url>
+	<url>http://wiki.citizensnpcs.co/Denizen</url>
 </project>
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -166,6 +166,7 @@ public void onEnable() {
         String directory = URLDecoder.decode(System.getProperty("user.dir"));
         new File(directory + "/plugins/Denizen/scripts").mkdirs();
         new File(directory + "/plugins/Denizen/midi").mkdirs();
+        new File(directory + "/plugins/Denizen/schematics").mkdirs();
 
         // Ensure the example Denizen.mid sound file is available
         if (!new File(directory + "/plugins/Denizen/midi/Denizen.mid").exists()) {

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
@@ -1800,6 +1800,42 @@ public void registerCoreMembers() {
                 "RUNTASK", "runtask [<name>] (instantly) (queue(:<name>)) (delay:<#>) (define:<element>|...)", 1);
 
 
+        // <--[command]
+        // @Name Schematic
+        // @Usage schematic [load/unload/rotate/paste] [name:<name>] (angle:<#>) (<location>) (noair)
+        // @Required 2
+        // @Stable unstable
+        // @Short Loads, edits, or pastes a WorldEdit schematic.
+        // @Author mcmonkey
+        // @Description
+        // Todo
+        // @Tags
+        // <schematic[<name>].height>
+        // <schematic[<name>].length>
+        // <schematic[<name>].width>
+        // <schematic[<name>].block[<location>]>
+        // <schematic[<name>].origin>
+        // <schematic[<name>].offset>
+        // <schematic[<name>].blocks>
+        // @Usage
+        // Use to load a schematic
+        // - schematic load name:MySchematic
+        //
+        // @Usage
+        // Use to unload a schematic
+        // - schematic unload name:MySchematic
+        //
+        // @Usage
+        // Use to rotate a loaded schematic
+        // - schematic rotate name:MySchematic angle:90
+        //
+        // @Usage
+        // Use to paste a loaded schematic
+        // - schematic paste name:MySchematic <player.location> noair
+        // -->
+        registerCoreMember(SchematicCommand.class,
+                "SCHEMATIC", "schematic [load/unload/rotate/paste] [name:<name>] (angle:<#>) (<location>) (noair)", 2);
+
         // <--[command]
         // @Name Scoreboard
         // @Usage scoreboard ({add}/remove) (viewers:<player>|...) (lines:<player>/<text>|...) (id:<value>/{main}) (objective:<value>) (criteria:<criteria>/{dummy}) (score:<#>) (displayslot:<value>/{sidebar})

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/_templateCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/_templateCommand.java
@@ -34,13 +34,13 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
 
         for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) {
 
-        // if (!scriptEntry.hasObject("required_integer")
-        //  && arg.matchesPrimitive(aH.PrimitiveType.Integer))
-        //  scriptEntry.addObject("required_integer", arg.asElement());
+            // if (!scriptEntry.hasObject("required_integer")
+            //  && arg.matchesPrimitive(aH.PrimitiveType.Integer))
+            //  scriptEntry.addObject("required_integer", arg.asElement());
 
-        // if (!scriptEntry.hasObject("required_location")
-        //  && arg.matchesArgumentType(dLocation.class))
-        //  scriptEntry.addObject("required_location", arg.asType(dLocation.class));
+            // if (!scriptEntry.hasObject("required_location")
+            //  && arg.matchesArgumentType(dLocation.class))
+            //  scriptEntry.addObject("required_location", arg.asType(dLocation.class));
 
         }
 
@@ -58,13 +58,14 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
 
         // Fetch required objects
 
-        // Element required_integer = (Element) scriptEntry.getObject("required_integer");
+        // Element required_integer = scriptEntry.getElement("required_integer");
         // dLocation required_location = (dLocation) scriptEntry.getObject("required_location");
 
 
         // Debug the execution
 
-        // dB.report(getName(), required_integer.debug() + required_location.debug());
+        // dB.report(getName(), required_integer.debug()
+        //                    + required_location.debug());
 
 
         // Do the execution

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/EquipCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/EquipCommand.java
@@ -25,7 +25,7 @@
  * @author David Cernat
  */
 
-public class EquipCommand extends AbstractCommand{
+public class EquipCommand extends AbstractCommand {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {