7.1

.gitignore

@@ -0,0 +1,2 @@
+.idea
+*.iml

pom.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.iCo</groupId>
+    <artifactId>iConomy</artifactId>
+    <packaging>jar</packaging>
+    <version>7.1</version>
+
+    <name>iConomy</name>
+    <url>http://nexua.org/iconomy</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public</url>
+        </repository>
+        <repository>
+            <id>sk89q-mvn2</id>
+            <url>http://mvn2.sk89q.com/repo</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.181</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.nijikokun.bukkit</groupId>
+            <artifactId>Permissions</artifactId>
+            <version>2.7.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.7.9-R0.2</version>
+            <type>jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <defaultGoal>clean install</defaultGoal>
+        <finalName>${project.artifactId}</finalName>
+        <sourceDirectory>${basedir}/src/</sourceDirectory>
+
+        <directory>target</directory>
+        <outputDirectory>target/classes</outputDirectory>
+
+        <resources>
+            <resource>
+                <targetPath>./resources/</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/resources/</directory>
+                <includes>
+                    <include>**/*.yml</include>
+                    <include>**/*.sql</include>
+                </includes>
+            </resource>
+
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/resources/</directory>
+                <includes>
+                    <include>plugin.yml</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <version>2.5.1</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>org.bukkit:bukkit</exclude>
+                                </excludes>
+                                <includes>
+                                    <include>com.google.code.gson:gson</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/com/iCo6/Constants.java → src/com/iCo/Constants.java

@@ -1,9 +1,9 @@
-package com.iCo6;
+package com.iCo;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import org.bukkit.configuration.InvalidConfigurationException;
+
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -64,17 +64,17 @@ public static enum Nodes {
         InterestMax("System.Interest.Amount.Minimum", 2.0),
 
         DatabaseType("System.Database.Type", "MiniDB"),
-        DatabaseTable("System.Database.Table", "iConomy"),
-        DatabaseUrl("System.Database.URL", "mysql:\\\\localhost:3306\\iConomy"),
+        DatabaseTable("System.Database.Table", "iCo"),
+        DatabaseUrl("System.Database.URL", "mysql:\\\\localhost:3306\\iCo"),
         DatabaseUsername("System.Database.Username", "root"),
         DatabasePassword("System.Database.Password", ""),
         DatabaseMajorItem("System.Database.MajorItem", 266),
         DatabaseMinorItem("System.Database.MinorItem", 265),
 
         Convert("System.Database.Conversion.Enabled", false),
         ConvertFrom("System.Database.Conversion.Type", "H2DB"),
-        ConvertTable("System.Database.Conversion.Table", "iConomy"),
-        ConvertURL("System.Database.Conversion.URL", "mysql:\\\\localhost:3306\\iConomy"),
+        ConvertTable("System.Database.Conversion.Table", "iCo"),
+        ConvertURL("System.Database.Conversion.URL", "mysql:\\\\localhost:3306\\iCo"),
         ConvertUsername("System.Database.Conversion.Username", "root"),
         ConvertPassword("System.Database.Conversion.Password", ""),
         ConvertAll("System.Database.Conversion.All", true);

src/com/iCo6/IO/Database.java → src/com/iCo/IO/Database.java

@@ -1,13 +1,13 @@
-package com.iCo6.IO;
-
-import com.iCo6.Constants;
-import com.iCo6.IO.exceptions.MissingDriver;
-import com.iCo6.iConomy;
-import com.iCo6.util.Common;
-import com.iCo6.IO.mini.Mini;
-import com.iCo6.util.org.apache.commons.dbutils.DbUtils;
-import com.iCo6.util.org.apache.commons.dbutils.QueryRunner;
-import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler;
+package com.iCo.IO;
+
+import com.iCo.Constants;
+import com.iCo.IO.exceptions.MissingDriver;
+import com.iCo.iConomy;
+import com.iCo.util.Common;
+import com.iCo.IO.mini.Mini;
+import com.iCo.util.org.apache.commons.dbutils.DbUtils;
+import com.iCo.util.org.apache.commons.dbutils.QueryRunner;
+import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

src/com/iCo6/IO/InventoryDB.java → src/com/iCo/IO/InventoryDB.java

@@ -1,14 +1,14 @@
-package com.iCo6.IO;
-
-import com.iCo6.Constants;
-import com.iCo6.iConomy;
-import com.iCo6.util.nbt.ByteTag;
-import com.iCo6.util.nbt.CompoundTag;
-import com.iCo6.util.nbt.ListTag;
-import com.iCo6.util.nbt.NBTInputStream;
-import com.iCo6.util.nbt.NBTOutputStream;
-import com.iCo6.util.nbt.ShortTag;
-import com.iCo6.util.nbt.Tag;
+package com.iCo.IO;
+
+import com.iCo.Constants;
+import com.iCo.iConomy;
+import com.iCo.util.nbt.ByteTag;
+import com.iCo.util.nbt.CompoundTag;
+import com.iCo.util.nbt.ListTag;
+import com.iCo.util.nbt.NBTInputStream;
+import com.iCo.util.nbt.NBTOutputStream;
+import com.iCo.util.nbt.ShortTag;
+import com.iCo.util.nbt.Tag;
 
 import java.io.File;
 import java.io.FileInputStream;

src/com/iCo6/IO/exceptions/MissingDriver.java → src/com/iCo/IO/exceptions/MissingDriver.java

@@ -1,4 +1,4 @@
-package com.iCo6.IO.exceptions;
+package com.iCo.IO.exceptions;
 
 public class MissingDriver extends Exception {
     public MissingDriver(String file) {

src/com/iCo6/IO/mini/Arguments.java → src/com/iCo/IO/mini/Arguments.java

@@ -1,4 +1,4 @@
-package com.iCo6.IO.mini;
+package com.iCo.IO.mini;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

src/com/iCo6/IO/mini/Dict.java → src/com/iCo/IO/mini/Dict.java

@@ -1,4 +1,4 @@
-package com.iCo6.IO.mini;
+package com.iCo.IO.mini;
 
 public class Dict {
     // Main

src/com/iCo6/IO/mini/Mini.java → src/com/iCo/IO/mini/Mini.java

@@ -1,6 +1,6 @@
-package com.iCo6.IO.mini;
+package com.iCo.IO.mini;
 
-import com.iCo6.IO.mini.file.Manager;
+import com.iCo.IO.mini.file.Manager;
 import java.io.File;
 
 import java.util.ArrayList;

src/com/iCo6/IO/mini/file/Manager.java → src/com/iCo/IO/mini/file/Manager.java

@@ -1,4 +1,4 @@
-package com.iCo6.IO.mini.file;
+package com.iCo.IO.mini.file;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

src/com/iCo6/command/Handler.java → src/com/iCo/command/Handler.java

@@ -1,12 +1,12 @@
-package com.iCo6.command;
+package com.iCo.command;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import com.iCo6.iConomy;
-import com.iCo6.command.Parser.Argument;
-import com.iCo6.command.exceptions.InvalidUsage;
-import com.iCo6.util.Template;
+import com.iCo.iConomy;
+import com.iCo.command.Parser.Argument;
+import com.iCo.command.exceptions.InvalidUsage;
+import com.iCo.util.Template;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/com/iCo6/command/Parser.java → src/com/iCo/command/Parser.java

@@ -1,4 +1,4 @@
-package com.iCo6.command;
+package com.iCo.command;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

src/com/iCo6/command/exceptions/InvalidUsage.java → src/com/iCo/command/exceptions/InvalidUsage.java

@@ -1,4 +1,4 @@
-package com.iCo6.command.exceptions;
+package com.iCo.command.exceptions;
 
 public class InvalidUsage extends Exception {
     public InvalidUsage(String message) {

src/com/iCo6/command/exceptions/MissingFile.java → src/com/iCo/command/exceptions/MissingFile.java

@@ -1,4 +1,4 @@
-package com.iCo6.command.exceptions;
+package com.iCo.command.exceptions;
 
 public class MissingFile extends Exception {
     public MissingFile(String file) {

src/com/iCo6/handlers/Create.java → src/com/iCo/handlers/Create.java

@@ -1,16 +1,16 @@
-package com.iCo6.handlers;
+package com.iCo.handlers;
 
 import java.util.LinkedHashMap;
 
-import com.iCo6.command.Handler;
-import com.iCo6.command.Parser.Argument;
-import com.iCo6.command.exceptions.InvalidUsage;
+import com.iCo.command.Handler;
+import com.iCo.command.Parser.Argument;
+import com.iCo.command.exceptions.InvalidUsage;
 
-import com.iCo6.iConomy;
-import com.iCo6.system.Accounts;
+import com.iCo.iConomy;
+import com.iCo.system.Accounts;
 
-import com.iCo6.util.Messaging;
-import com.iCo6.util.Template;
+import com.iCo.util.Messaging;
+import com.iCo.util.Template;
 
 import org.bukkit.command.CommandSender;
 

src/com/iCo6/handlers/Empty.java → src/com/iCo/handlers/Empty.java

@@ -1,16 +1,16 @@
-package com.iCo6.handlers;
+package com.iCo.handlers;
 
 import java.util.LinkedHashMap;
 
-import com.iCo6.command.Handler;
-import com.iCo6.command.Parser.Argument;
-import com.iCo6.command.exceptions.InvalidUsage;
+import com.iCo.command.Handler;
+import com.iCo.command.Parser.Argument;
+import com.iCo.command.exceptions.InvalidUsage;
 
-import com.iCo6.iConomy;
-import com.iCo6.system.Accounts;
+import com.iCo.iConomy;
+import com.iCo.system.Accounts;
 
-import com.iCo6.util.Messaging;
-import com.iCo6.util.Template;
+import com.iCo.util.Messaging;
+import com.iCo.util.Template;
 
 import org.bukkit.command.CommandSender;
 

src/com/iCo6/handlers/Give.java → src/com/iCo/handlers/Give.java

@@ -1,17 +1,17 @@
-package com.iCo6.handlers;
+package com.iCo.handlers;
 
 import java.util.LinkedHashMap;
 
-import com.iCo6.command.Handler;
-import com.iCo6.command.Parser.Argument;
-import com.iCo6.command.exceptions.InvalidUsage;
+import com.iCo.command.Handler;
+import com.iCo.command.Parser.Argument;
+import com.iCo.command.exceptions.InvalidUsage;
 
-import com.iCo6.iConomy;
-import com.iCo6.system.Account;
-import com.iCo6.system.Accounts;
+import com.iCo.iConomy;
+import com.iCo.system.Account;
+import com.iCo.system.Accounts;
 
-import com.iCo6.util.Messaging;
-import com.iCo6.util.Template;
+import com.iCo.util.Messaging;
+import com.iCo.util.Template;
 
 import org.bukkit.command.CommandSender;
 

src/com/iCo6/handlers/Help.java → src/com/iCo/handlers/Help.java

@@ -1,13 +1,13 @@
-package com.iCo6.handlers;
+package com.iCo.handlers;
 
-import com.iCo6.Constants;
+import com.iCo.Constants;
 import java.util.LinkedHashMap;
 
-import com.iCo6.command.Handler;
-import com.iCo6.command.Parser.Argument;
-import com.iCo6.command.exceptions.InvalidUsage;
-import com.iCo6.iConomy;
-import com.iCo6.util.Messaging;
+import com.iCo.command.Handler;
+import com.iCo.command.Parser.Argument;
+import com.iCo.command.exceptions.InvalidUsage;
+import com.iCo.iConomy;
+import com.iCo.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 
@@ -25,7 +25,7 @@ public boolean perform(CommandSender sender, LinkedHashMap<String, Argument> arg
         // TODO: add support for checking help on single command.
 
         Messaging.send(sender, "`w ");
-        Messaging.send(sender, "`w iConomy (`y" + Constants.Nodes.CodeName.toString() + "`w)");
+        Messaging.send(sender, "`w iCo (`y" + Constants.Nodes.CodeName.toString() + "`w)");
         Messaging.send(sender, "`w ");
         Messaging.send(sender, "`S [] `wRequired, `S() `sOptional");
         Messaging.send(sender, "`w ");