Command /ctgstats need to be fixed

LICENSE.txt

@@ -0,0 +1,11 @@
+http://opensource.org/licenses/BSD-3-Clause
+
+Copyright (c) 2013, Justin Kilpatrick, CivCraft
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of CivCraft nor the names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bin/META-INF/MANIFEST.MF

@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
-
+Manifest-Version: 1.0
+

config.yml

@@ -4,6 +4,7 @@ general:
   autoModeReset: 30
   redstoneDistance: 9
   groupsAllowed: 60
+  reinforcedCrops: true
 materials:
 - name: STONE
   strength: 25
@@ -23,8 +24,10 @@ additionalSecurable:
 - BEACON
 - ANVIL
 nonReinforceable:
+- BEDROCK
+- ENDER_PORTAL_FRAME
 - SAPLING
-- GRASS
+- LONG_GRASS
 - DEAD_BUSH
 - PISTON_EXTENSION
 - PISTON_MOVING_PIECE
@@ -59,3 +62,22 @@ database:
 caching:
   max_age: 300000
   max_chunks: 10000
+
+# Possible verboseMessages:
+# - InteractionAttempt
+# - ReinDelegation
+# - AdminReinBypass
+# - ReinBypass
+# - RedstoneOpen
+# - GolemCreated
+# - NullGroup
+# - AdminReinLocked
+# - ReinLocked
+# - CropTrample
+# - ReinOvergrowth
+# - ReinCreated
+# - ReinDmg
+# - ReinDestroyed
+# - Enabled
+# - Disabled
+verboseMessages:

plugin.yml

@@ -1,6 +1,6 @@
 name: Citadel
 main: com.untamedears.citadel.Citadel
-version: 2.0.1
+version: 2.5.25
 description: Reinforce your structures!
 author: chrisrico, jonnyd (aka Gu3rr1lla)
 database: false
@@ -29,6 +29,10 @@ commands:
     aliases: cti
     description: While in this mode, punching a block gives you information about it's reinforcement and security level.
     usage: /ctinfo (or /cti)
+  ctinsecure:
+    aliases: ctis
+    description: While in this mode, punching a reinforcement toggles its insecure status.
+    usage: /ctinsecure (or /ctis)
   ctoff:
     aliases: cto
     description: Turns off reinforcement, fortification, and info mode.
@@ -112,21 +116,53 @@ commands:
     aliases: ctgi
     description: Displays information about a group.
     usage: /ctgroupinfo (or /ctgi) <group-name>
-  ctcon:
-    description: Restricted.
-    usage: /ctcon
-    permission: citadel.console
   ctgstats:
     aliases: ctgst
-    description: Displayers group statistics
+    description: Displays group statistics
     usage: /ctgstats <group-name>
+  ctcon:
+    description: Restricted console commands
+    usage: /ctcon
     permission: citadel.console
   ctpstats:
     aliases: ctpst
     description: Displayers player statistics
     usage: /ctpstats <player-name>
-    permission: citadel.console
+    permission: citadel.admin.ctpstats
+  ctdiscipline:
+    aliases: ctadg
+    description: Disciplines a group
+    usage: /ctdiscipline [del] <group-name>
+    permission: citadel.admin.ctdiscipline
+  ctreprieve:
+    aliases: ctarg
+    description: Reprieves a group
+    usage: /ctreprieve <group-name>
+    permission: citadel.admin.ctreprieve
+  ctacid:
+    description: Trigger acid block to eat a reinforcement
+    usage: /ctacid
+    permission: citadel.ctacid
+  ctmature:
+    description: Instantly mature a reinforcement
+    usage: /ctmature
 permissions:
   citadel.console:
     description: Console commands for Citadel
-    default: false
+    default: false
+  citadel.admin:
+    description: Grants permission to Citadels admin commands.
+    default: op
+    children:
+      citadel.admin.ctgstats: true
+      citadel.admin.ctpstats: true
+      citadel.admin.ctdiscipline: true
+      citadel.admin.ctreprieve: true
+      citadel.admin.ctinfodetails: true
+      citadel.admin.accesssecurable: true
+      citadel.admin.cttransfer: true
+      citadel.admin.reassignreinforcements: true
+      citadel.admin.bypassmode: true
+  citadel.ctacid:
+    description: Allow /ctacid
+    default: true

pom.xml

@@ -1,73 +1,56 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.untamedears.citadel</groupId>
-    <artifactId>citadel</artifactId>
-    <version>2.0.2</version>
-    <packaging>jar</packaging>
-
-    <name>Citadel</name>
-    <description>Bukkit Server Plugin</description>
-    <inceptionYear>2012</inceptionYear>
-    <build>
-        <sourceDirectory>${basedir}/src</sourceDirectory>
-        <plugins>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.untamedears</groupId>
+  <artifactId>Citadel</artifactId>
+  <packaging>jar</packaging>
+  <version>2.5.25-SNAPSHOT</version>
+  <name>Citadel</name>
+  <url>https://github.com/ttk2/Citadel</url>
+
+  <build>
+    <pluginManagement>
+      <plugins>
         <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
-            <configuration>
-                <source>1.6</source>
-                <target>1.6</target>
-            </configuration>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+          <configuration>
+            <source>1.6</source>
+            <target>1.6</target>
+          </configuration>
         </plugin>
-       </plugins>
-    </build>
+      </plugins>
+    </pluginManagement>
 
-    <properties>
-        <project.build.sourceEncoding>CP1252</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.3.2-R1.0</version>
-        </dependency>
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
-        </repository>
-    </repositories>
+    <sourceDirectory>${basedir}/src</sourceDirectory>
 
-    <!--
-    <scm>
-        <connection>scm:git:</connection>
-        <developerConnection>scm:git:</developerConnection>
-    </scm>
-    -->
-
-    <!--
-    <repositories>
-        <repository>
-            <id>lennardf1989</id>
-            <url>http://github.lennardf1989.com/repository/</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.lennardf1989</groupId>
-            <artifactId>bukkitex</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    -->
-
+    <resources>
+      <resource>
+        <directory>${basedir}</directory>
+        <includes>
+          <include>LICENSE.txt</include>
+          <include>*.yml</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.2-R0.3</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>bukkit-repo</id>
+      <url>http://repo.bukkit.org/content/groups/public/</url>
+    </repository>
+  </repositories>
+
 </project>