diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..29b636a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea +*.iml \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..27e3d8a --- /dev/null +++ b/pom.xml @@ -0,0 +1,122 @@ + + + 4.0.0 + + com.iCo + iConomy + jar + 7.1 + + iConomy + http://nexua.org/iconomy + + + UTF-8 + + + + + bukkit-repo + http://repo.bukkit.org/content/groups/public + + + sk89q-mvn2 + http://mvn2.sk89q.com/repo + + + + + + com.h2database + h2 + 1.4.181 + + + + com.nijikokun.bukkit + Permissions + 2.7.4 + + + + org.bukkit + bukkit + 1.7.9-R0.2 + jar + + + + com.google.code.gson + gson + 2.2.3 + + + + + clean install + ${project.artifactId} + ${basedir}/src/ + + target + target/classes + + + + ./resources/ + true + ${basedir}/src/resources/ + + **/*.yml + **/*.sql + + + + + . + true + ${basedir}/src/resources/ + + plugin.yml + + + + + + + maven-compiler-plugin + org.apache.maven.plugins + 2.5.1 + + 1.6 + 1.6 + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.0 + + + package + + shade + + + + + org.bukkit:bukkit + + + com.google.code.gson:gson + + + + + + + + + \ No newline at end of file diff --git a/src/com/iCo6/Constants.java b/src/com/iCo/Constants.java similarity index 94% rename from src/com/iCo6/Constants.java rename to src/com/iCo/Constants.java index 57323ee..f6acb1f 100644 --- a/src/com/iCo6/Constants.java +++ b/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,8 +64,8 @@ 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), @@ -73,8 +73,8 @@ public static enum Nodes { 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); diff --git a/src/com/iCo6/IO/Database.java b/src/com/iCo/IO/Database.java similarity index 93% rename from src/com/iCo6/IO/Database.java rename to src/com/iCo/IO/Database.java index 4a9f548..11707e3 100644 --- a/src/com/iCo6/IO/Database.java +++ b/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; diff --git a/src/com/iCo6/IO/InventoryDB.java b/src/com/iCo/IO/InventoryDB.java similarity index 95% rename from src/com/iCo6/IO/InventoryDB.java rename to src/com/iCo/IO/InventoryDB.java index cf5ac30..e7a9fac 100644 --- a/src/com/iCo6/IO/InventoryDB.java +++ b/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; diff --git a/src/com/iCo6/IO/exceptions/MissingDriver.java b/src/com/iCo/IO/exceptions/MissingDriver.java similarity index 81% rename from src/com/iCo6/IO/exceptions/MissingDriver.java rename to src/com/iCo/IO/exceptions/MissingDriver.java index 3c1b5a7..cce2fed 100644 --- a/src/com/iCo6/IO/exceptions/MissingDriver.java +++ b/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) { diff --git a/src/com/iCo6/IO/mini/Arguments.java b/src/com/iCo/IO/mini/Arguments.java similarity index 99% rename from src/com/iCo6/IO/mini/Arguments.java rename to src/com/iCo/IO/mini/Arguments.java index 876738e..46e99f4 100644 --- a/src/com/iCo6/IO/mini/Arguments.java +++ b/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; diff --git a/src/com/iCo6/IO/mini/Dict.java b/src/com/iCo/IO/mini/Dict.java similarity index 90% rename from src/com/iCo6/IO/mini/Dict.java rename to src/com/iCo/IO/mini/Dict.java index 43d5e32..55543aa 100644 --- a/src/com/iCo6/IO/mini/Dict.java +++ b/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 diff --git a/src/com/iCo6/IO/mini/Mini.java b/src/com/iCo/IO/mini/Mini.java similarity index 99% rename from src/com/iCo6/IO/mini/Mini.java rename to src/com/iCo/IO/mini/Mini.java index 945b835..eac59f4 100644 --- a/src/com/iCo6/IO/mini/Mini.java +++ b/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; diff --git a/src/com/iCo6/IO/mini/file/Manager.java b/src/com/iCo/IO/mini/file/Manager.java similarity index 99% rename from src/com/iCo6/IO/mini/file/Manager.java rename to src/com/iCo/IO/mini/file/Manager.java index 18dec1d..ec8e90d 100644 --- a/src/com/iCo6/IO/mini/file/Manager.java +++ b/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; diff --git a/src/com/iCo6/command/Handler.java b/src/com/iCo/command/Handler.java similarity index 88% rename from src/com/iCo6/command/Handler.java rename to src/com/iCo/command/Handler.java index 821289e..09b2834 100644 --- a/src/com/iCo6/command/Handler.java +++ b/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; diff --git a/src/com/iCo6/command/Parser.java b/src/com/iCo/command/Parser.java similarity index 99% rename from src/com/iCo6/command/Parser.java rename to src/com/iCo/command/Parser.java index 1be4ab5..cc5cf1b 100644 --- a/src/com/iCo6/command/Parser.java +++ b/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; diff --git a/src/com/iCo6/command/exceptions/InvalidUsage.java b/src/com/iCo/command/exceptions/InvalidUsage.java similarity index 80% rename from src/com/iCo6/command/exceptions/InvalidUsage.java rename to src/com/iCo/command/exceptions/InvalidUsage.java index 597257b..66d74ef 100644 --- a/src/com/iCo6/command/exceptions/InvalidUsage.java +++ b/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) { diff --git a/src/com/iCo6/command/exceptions/MissingFile.java b/src/com/iCo/command/exceptions/MissingFile.java similarity index 80% rename from src/com/iCo6/command/exceptions/MissingFile.java rename to src/com/iCo/command/exceptions/MissingFile.java index 1f66b23..9a02db6 100644 --- a/src/com/iCo6/command/exceptions/MissingFile.java +++ b/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) { diff --git a/src/com/iCo6/handlers/Create.java b/src/com/iCo/handlers/Create.java similarity index 83% rename from src/com/iCo6/handlers/Create.java rename to src/com/iCo/handlers/Create.java index 79e1c0d..7f86e8f 100644 --- a/src/com/iCo6/handlers/Create.java +++ b/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; diff --git a/src/com/iCo6/handlers/Empty.java b/src/com/iCo/handlers/Empty.java similarity index 72% rename from src/com/iCo6/handlers/Empty.java rename to src/com/iCo/handlers/Empty.java index 264f8ec..80cad19 100644 --- a/src/com/iCo6/handlers/Empty.java +++ b/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; diff --git a/src/com/iCo6/handlers/Give.java b/src/com/iCo/handlers/Give.java similarity index 85% rename from src/com/iCo6/handlers/Give.java rename to src/com/iCo/handlers/Give.java index 8c56684..6ace3f3 100644 --- a/src/com/iCo6/handlers/Give.java +++ b/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; diff --git a/src/com/iCo6/handlers/Help.java b/src/com/iCo/handlers/Help.java similarity index 81% rename from src/com/iCo6/handlers/Help.java rename to src/com/iCo/handlers/Help.java index 52f5d30..d6f3f96 100644 --- a/src/com/iCo6/handlers/Help.java +++ b/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 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 "); diff --git a/src/com/iCo6/handlers/Money.java b/src/com/iCo/handlers/Money.java similarity index 83% rename from src/com/iCo6/handlers/Money.java rename to src/com/iCo/handlers/Money.java index e914b96..6db0e92 100644 --- a/src/com/iCo6/handlers/Money.java +++ b/src/com/iCo/handlers/Money.java @@ -1,14 +1,14 @@ -package com.iCo6.handlers; - -import com.iCo6.Constants; -import com.iCo6.command.Handler; -import com.iCo6.command.Parser.Argument; -import com.iCo6.command.exceptions.InvalidUsage; -import com.iCo6.iConomy; -import com.iCo6.system.Account; -import com.iCo6.system.Accounts; -import com.iCo6.util.Messaging; -import com.iCo6.util.Template; +package com.iCo.handlers; + +import com.iCo.Constants; +import com.iCo.command.Handler; +import com.iCo.command.Parser.Argument; +import com.iCo.command.exceptions.InvalidUsage; +import com.iCo.iConomy; +import com.iCo.system.Account; +import com.iCo.system.Accounts; +import com.iCo.util.Messaging; +import com.iCo.util.Template; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/com/iCo6/handlers/Payment.java b/src/com/iCo/handlers/Payment.java similarity index 89% rename from src/com/iCo6/handlers/Payment.java rename to src/com/iCo/handlers/Payment.java index 7489d59..ec14c8f 100644 --- a/src/com/iCo6/handlers/Payment.java +++ b/src/com/iCo/handlers/Payment.java @@ -1,19 +1,19 @@ -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.iCo6.system.Holdings; -import com.iCo6.util.Common; +import com.iCo.iConomy; +import com.iCo.system.Account; +import com.iCo.system.Accounts; +import com.iCo.system.Holdings; +import com.iCo.util.Common; -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; import org.bukkit.entity.Player; diff --git a/src/com/iCo6/handlers/Purge.java b/src/com/iCo/handlers/Purge.java similarity index 72% rename from src/com/iCo6/handlers/Purge.java rename to src/com/iCo/handlers/Purge.java index ef6cade..d2a0929 100644 --- a/src/com/iCo6/handlers/Purge.java +++ b/src/com/iCo/handlers/Purge.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; diff --git a/src/com/iCo6/handlers/Remove.java b/src/com/iCo/handlers/Remove.java similarity index 83% rename from src/com/iCo6/handlers/Remove.java rename to src/com/iCo/handlers/Remove.java index 828e58e..9589969 100644 --- a/src/com/iCo6/handlers/Remove.java +++ b/src/com/iCo/handlers/Remove.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; diff --git a/src/com/iCo6/handlers/Set.java b/src/com/iCo/handlers/Set.java similarity index 85% rename from src/com/iCo6/handlers/Set.java rename to src/com/iCo/handlers/Set.java index 3c88679..5026e33 100644 --- a/src/com/iCo6/handlers/Set.java +++ b/src/com/iCo/handlers/Set.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; diff --git a/src/com/iCo6/handlers/Status.java b/src/com/iCo/handlers/Status.java similarity index 87% rename from src/com/iCo6/handlers/Status.java rename to src/com/iCo/handlers/Status.java index 7b36976..6a43598 100644 --- a/src/com/iCo6/handlers/Status.java +++ b/src/com/iCo/handlers/Status.java @@ -1,15 +1,15 @@ -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.iCo6.iConomy; -import com.iCo6.system.Account; -import com.iCo6.system.Accounts; -import com.iCo6.util.Messaging; -import com.iCo6.util.Template; +import com.iCo.command.Handler; +import com.iCo.command.Parser.Argument; +import com.iCo.command.exceptions.InvalidUsage; +import com.iCo.iConomy; +import com.iCo.system.Account; +import com.iCo.system.Accounts; +import com.iCo.util.Messaging; +import com.iCo.util.Template; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/com/iCo6/handlers/Take.java b/src/com/iCo/handlers/Take.java similarity index 85% rename from src/com/iCo6/handlers/Take.java rename to src/com/iCo/handlers/Take.java index ade71b1..c13badd 100644 --- a/src/com/iCo6/handlers/Take.java +++ b/src/com/iCo/handlers/Take.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; diff --git a/src/com/iCo6/handlers/Top.java b/src/com/iCo/handlers/Top.java similarity index 77% rename from src/com/iCo6/handlers/Top.java rename to src/com/iCo/handlers/Top.java index 7664f7c..8bebf81 100644 --- a/src/com/iCo6/handlers/Top.java +++ b/src/com/iCo/handlers/Top.java @@ -1,13 +1,13 @@ -package com.iCo6.handlers; - -import com.iCo6.command.Handler; -import com.iCo6.command.Parser.Argument; -import com.iCo6.command.exceptions.InvalidUsage; -import com.iCo6.iConomy; -import com.iCo6.system.Account; -import com.iCo6.system.Accounts; -import com.iCo6.util.Messaging; -import com.iCo6.util.Template; +package com.iCo.handlers; + +import com.iCo.command.Handler; +import com.iCo.command.Parser.Argument; +import com.iCo.command.exceptions.InvalidUsage; +import com.iCo.iConomy; +import com.iCo.system.Account; +import com.iCo.system.Accounts; +import com.iCo.util.Messaging; +import com.iCo.util.Template; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/com/iCo6/iConomy.java b/src/com/iCo/iConomy.java similarity index 85% rename from src/com/iCo6/iConomy.java rename to src/com/iCo/iConomy.java index 62f72f0..d0ccfa0 100644 --- a/src/com/iCo6/iConomy.java +++ b/src/com/iCo/iConomy.java @@ -1,4 +1,4 @@ -package com.iCo6; +package com.iCo; import java.io.File; import java.io.IOException; @@ -7,27 +7,27 @@ import com.nijikokun.bukkit.Permissions.Permissions; -import com.iCo6.Constants.Drivers; -import com.iCo6.command.Handler; -import com.iCo6.command.Parser; -import com.iCo6.command.exceptions.InvalidUsage; -import com.iCo6.handlers.*; -import com.iCo6.IO.Database; -import com.iCo6.IO.Database.Type; -import com.iCo6.IO.exceptions.MissingDriver; -import com.iCo6.listeners.players; -import com.iCo6.system.Account; -import com.iCo6.system.Accounts; -import com.iCo6.system.Interest; -import com.iCo6.system.Queried; -import com.iCo6.util.Common; -import com.iCo6.util.Messaging; -import com.iCo6.util.Template; -import com.iCo6.util.Thrun; -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; -import com.iCo6.util.wget; +import com.iCo.Constants.Drivers; +import com.iCo.command.Handler; +import com.iCo.command.Parser; +import com.iCo.command.exceptions.InvalidUsage; +import com.iCo.handlers.*; +import com.iCo.IO.Database; +import com.iCo.IO.Database.Type; +import com.iCo.IO.exceptions.MissingDriver; +import com.iCo.listeners.players; +import com.iCo.system.Account; +import com.iCo.system.Accounts; +import com.iCo.system.Interest; +import com.iCo.system.Queried; +import com.iCo.util.Common; +import com.iCo.util.Messaging; +import com.iCo.util.Template; +import com.iCo.util.Thrun; +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 com.iCo.util.wget; import java.sql.Connection; import java.sql.DriverManager; @@ -39,7 +39,6 @@ import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Player; import org.bukkit.permissions.Permission; import org.bukkit.plugin.Plugin; @@ -50,9 +49,9 @@ import org.h2.jdbcx.JdbcConnectionPool; /** - * iConomy by Team iCo + * iCo by Team iCo * - * @copyright Copyright AniGaiku LLC (C) 2010-2012 + * @copyright Copyright Nexua LLC (C) 2015 * @author Nijikokun * @author SpaceManiac * @@ -78,7 +77,7 @@ public class iConomy extends JavaPlugin { public Permissions Permissions; private boolean testedPermissions = false; - public static boolean TerminalSupport = false; + public static boolean TerminalSupport = true; public static File directory; public static Database Database; public static Server Server; @@ -98,10 +97,6 @@ public void onEnable() { // Server & Terminal Support Server = getServer(); - if(getServer().getServerName().equalsIgnoreCase("craftbukkit")) { - TerminalSupport = ((CraftServer)getServer()).getReader().getTerminal().isANSISupported(); - } - // Get general plugin information info = getDescription(); @@ -143,62 +138,62 @@ public void onEnable() { if(driver != null) if(!(new File("lib", driver.getFilename()).exists())) { - System.out.println("[iConomy] Downloading " + driver.getFilename() + "..."); + System.out.println("[iCo] Downloading " + driver.getFilename() + "..."); wget.fetch(driver.getUrl(), driver.getFilename()); - System.out.println("[iConomy] Finished Downloading."); + System.out.println("[iCo] Finished Downloading."); } } // Setup Commands Commands.add("/money +name", new Money(this)); - Commands.setPermission("money", "iConomy.holdings"); - Commands.setPermission("money+", "iConomy.holdings.others"); + Commands.setPermission("money", "iCo.holdings"); + Commands.setPermission("money+", "iCo.holdings.others"); Commands.setHelp("money", new String[] { "", "Check your balance." }); Commands.setHelp("money+", new String[] { " [name]", "Check others balance." }); Commands.add("/money -h|?|help +command", new Help(this)); - Commands.setPermission("help", "iConomy.help"); + Commands.setPermission("help", "iCo.help"); Commands.setHelp("help", new String[] { " (command)", "For Help & Information." }); Commands.add("/money -t|top", new Top(this)); - Commands.setPermission("top", "iConomy.top"); + Commands.setPermission("top", "iCo.top"); Commands.setHelp("top", new String[] { "", "View top economical accounts." }); Commands.add("/money -p|pay +name +amount:empty", new Payment(this)); - Commands.setPermission("pay", "iConomy.payment"); + Commands.setPermission("pay", "iCo.payment"); Commands.setHelp("pay", new String[] { " [name] [amount]", "Send money to others." }); Commands.add("/money -c|create +name", new Create(this)); - Commands.setPermission("create", "iConomy.accounts.create"); + Commands.setPermission("create", "iCo.accounts.create"); Commands.setHelp("create", new String[] { " [name]", "Create an account." }); Commands.add("/money -r|remove +name", new Remove(this)); - Commands.setPermission("remove", "iConomy.accounts.remove"); + Commands.setPermission("remove", "iCo.accounts.remove"); Commands.setHelp("remove", new String[] { " [name]", "Remove an account." }); Commands.add("/money -g|give +name +amount:empty", new Give(this)); - Commands.setPermission("give", "iConomy.accounts.give"); + Commands.setPermission("give", "iCo.accounts.give"); Commands.setHelp("give", new String[] { " [name] [amount]", "Give money." }); Commands.add("/money -t|take +name +amount:empty", new Take(this)); - Commands.setPermission("take", "iConomy.accounts.take"); + Commands.setPermission("take", "iCo.accounts.take"); Commands.setHelp("take", new String[] { " [name] [amount]", "Take money." }); Commands.add("/money -s|set +name +amount:empty", new Set(this)); - Commands.setPermission("set", "iConomy.accounts.set"); + Commands.setPermission("set", "iCo.accounts.set"); Commands.setHelp("set", new String[] { " [name] [amount]", "Set account balance." }); Commands.add("/money -u|status +name +status:empty", new Status(this)); - Commands.setPermission("status", "iConomy.accounts.status"); - Commands.setPermission("status+", "iConomy.accounts.status.set"); + Commands.setPermission("status", "iCo.accounts.status"); + Commands.setPermission("status+", "iCo.accounts.status.set"); Commands.setHelp("status", new String[] { " [name] (status)", "Check/Set account status." }); Commands.add("/money -x|purge", new Purge(this)); - Commands.setPermission("purge", "iConomy.accounts.purge"); + Commands.setPermission("purge", "iCo.accounts.purge"); Commands.setHelp("purge", new String[] { "", "Purge all accounts with initial holdings." }); Commands.add("/money -e|empty", new Empty(this)); - Commands.setPermission("empty", "iConomy.accounts.empty"); + Commands.setPermission("empty", "iCo.accounts.empty"); Commands.setHelp("empty", new String[] { "", "Empty database of accounts." }); // Setup Database. @@ -224,12 +219,12 @@ public void onEnable() { try{ run.update(c, SQL); } catch (SQLException ex) { - System.out.println("[iConomy] Error creating database: " + ex); + System.out.println("[iCo] Error creating database: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } } } else { @@ -379,15 +374,15 @@ public Object handle(ResultSet rs) throws SQLException { } }); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(old); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } - System.out.println("[iConomy] Conversion complete. Please update your configuration, change convert to false!"); + System.out.println("[iCo] Conversion complete. Please update your configuration, change convert to false!"); } }); @@ -425,7 +420,7 @@ public boolean hasPermissions(CommandSender sender, String command) { Player player = (Player)sender; if(player == null) { - System.out.println("[iConomy] Cannot execute command with false player"); + System.out.println("[iCo] Cannot execute command with false player"); return false; } @@ -442,7 +437,7 @@ public boolean hasPermissions(CommandSender sender, String command) { if (Perms != null) { if (Perms.isEnabled()) { this.Permissions = ((Permissions)Perms); - System.out.println("[iConomy] hooked into Permissions."); + System.out.println("[iCo] hooked into Permissions."); } } diff --git a/src/com/iCo6/listeners/players.java b/src/com/iCo/listeners/players.java similarity index 89% rename from src/com/iCo6/listeners/players.java rename to src/com/iCo/listeners/players.java index f7d09d6..c6945b8 100644 --- a/src/com/iCo6/listeners/players.java +++ b/src/com/iCo/listeners/players.java @@ -1,6 +1,6 @@ -package com.iCo6.listeners; +package com.iCo.listeners; -import com.iCo6.system.Accounts; +import com.iCo.system.Accounts; import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.event.EventHandler; diff --git a/src/com/iCo6/system/Account.java b/src/com/iCo/system/Account.java similarity index 92% rename from src/com/iCo6/system/Account.java rename to src/com/iCo/system/Account.java index be1e1b8..fde2287 100644 --- a/src/com/iCo6/system/Account.java +++ b/src/com/iCo/system/Account.java @@ -1,8 +1,8 @@ -package com.iCo6.system; +package com.iCo.system; -import com.iCo6.iConomy; -import com.iCo6.util.Messaging; -import com.iCo6.util.Template; +import com.iCo.iConomy; +import com.iCo.util.Messaging; +import com.iCo.util.Template; import org.bukkit.entity.Player; diff --git a/src/com/iCo6/system/Accounts.java b/src/com/iCo/system/Accounts.java similarity index 95% rename from src/com/iCo6/system/Accounts.java rename to src/com/iCo/system/Accounts.java index 9e676c0..cd48db0 100644 --- a/src/com/iCo6/system/Accounts.java +++ b/src/com/iCo/system/Accounts.java @@ -1,6 +1,6 @@ -package com.iCo6.system; +package com.iCo.system; -import com.iCo6.Constants; +import com.iCo.Constants; import java.util.List; public class Accounts { diff --git a/src/com/iCo6/system/Holdings.java b/src/com/iCo/system/Holdings.java similarity index 93% rename from src/com/iCo6/system/Holdings.java rename to src/com/iCo/system/Holdings.java index e071f54..cbe4478 100644 --- a/src/com/iCo6/system/Holdings.java +++ b/src/com/iCo/system/Holdings.java @@ -1,11 +1,11 @@ -package com.iCo6.system; - -import com.iCo6.Constants; -import com.iCo6.iConomy; -import com.iCo6.system.events.HoldingsUpdate; -import com.iCo6.util.Common; -import com.iCo6.util.Messaging; -import com.iCo6.util.Template; +package com.iCo.system; + +import com.iCo.Constants; +import com.iCo.iConomy; +import com.iCo.system.events.HoldingsUpdate; +import com.iCo.util.Common; +import com.iCo.util.Messaging; +import com.iCo.util.Template; import java.text.DecimalFormat; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/com/iCo6/system/Interest.java b/src/com/iCo/system/Interest.java similarity index 96% rename from src/com/iCo6/system/Interest.java rename to src/com/iCo/system/Interest.java index dd21a53..9e21dad 100644 --- a/src/com/iCo6/system/Interest.java +++ b/src/com/iCo/system/Interest.java @@ -1,10 +1,10 @@ -package com.iCo6.system; +package com.iCo.system; -import com.iCo6.Constants; +import com.iCo.Constants; import org.bukkit.entity.Player; -import com.iCo6.iConomy; -import com.iCo6.util.Template; +import com.iCo.iConomy; +import com.iCo.util.Template; import java.text.DecimalFormat; import java.util.LinkedHashMap; diff --git a/src/com/iCo6/system/Queried.java b/src/com/iCo/system/Queried.java similarity index 90% rename from src/com/iCo6/system/Queried.java rename to src/com/iCo/system/Queried.java index f0973b2..3ab2ed2 100644 --- a/src/com/iCo6/system/Queried.java +++ b/src/com/iCo/system/Queried.java @@ -1,21 +1,20 @@ -package com.iCo6.system; +package com.iCo.system; -import com.iCo6.Constants; -import com.iCo6.IO.InventoryDB; -import com.iCo6.iConomy; -import com.iCo6.IO.mini.Arguments; -import com.iCo6.IO.mini.Mini; -import com.iCo6.util.Thrun; +import com.iCo.Constants; +import com.iCo.IO.InventoryDB; +import com.iCo.iConomy; +import com.iCo.IO.mini.Arguments; +import com.iCo.IO.mini.Mini; +import com.iCo.util.Thrun; -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; +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.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -133,12 +132,12 @@ static List accountList() { String t = Constants.Nodes.DatabaseTable.toString(); accounts = run.query(c, "SELECT username FROM " + t, returnList); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } return accounts; @@ -168,12 +167,12 @@ static List topAccounts(int amount) { String t = Constants.Nodes.DatabaseTable.toString(); total = run.query(c, "SELECT username FROM " + t + " WHERE status <> 1 ORDER BY balance DESC LIMIT " + amount, returnList); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } } @@ -240,12 +239,12 @@ static boolean createAccount(String name, Double balance, Integer status) { if(amount > 0) created = true; } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } return false; @@ -276,12 +275,12 @@ static boolean removeAccount(String name) { if(amount > 0) removed = true; } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } return removed; @@ -310,12 +309,12 @@ static boolean hasAccount(String name) { String t = Constants.Nodes.DatabaseTable.toString(); exists = run.query(c, "SELECT id FROM " + t + " WHERE username=?", returnBoolean, name.toLowerCase()); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } return exists; @@ -350,12 +349,12 @@ static double getBalance(String name) { String t = Constants.Nodes.DatabaseTable.toString(); balance = run.query(c, "SELECT balance FROM " + t + " WHERE username=?", returnBalance, name.toLowerCase()); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } return balance; @@ -439,12 +438,12 @@ else if(gainer.getTotalExperience() > 0) String t = Constants.Nodes.DatabaseTable.toString(); int update = run.update(c, "UPDATE " + t + " SET balance=? WHERE username=?", balance, name.toLowerCase()); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } } @@ -518,12 +517,12 @@ public void run() { try{ run.batch(c, query, parameters); } catch (SQLException ex) { - System.out.println("[iConomy] Error with batching: " + ex); + System.out.println("[iCo] Error with batching: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } } }); @@ -560,12 +559,12 @@ public void run() { String t = Constants.Nodes.DatabaseTable.toString(); Integer amount = run.update(c, "DELETE FROM " + t + " WHERE balance=?", Constants.Nodes.Balance.getDouble()); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } } }); @@ -600,12 +599,12 @@ public void run() { String t = Constants.Nodes.DatabaseTable.toString(); Integer amount = run.update(c, "TRUNCATE TABLE " + t); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } } }); @@ -634,12 +633,12 @@ static Integer getStatus(String name) { String t = Constants.Nodes.DatabaseTable.toString(); status = run.query(c, "SELECT status FROM " + t + " WHERE username=?", returnStatus, name.toLowerCase()); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } return status; @@ -673,12 +672,12 @@ static void setStatus(String name, int status) { String t = Constants.Nodes.DatabaseTable.toString(); int update = run.update(c, "UPDATE " + t + " SET status=? WHERE username=?", status, name.toLowerCase()); } catch (SQLException ex) { - System.out.println("[iConomy] Error issueing SQL query: " + ex); + System.out.println("[iCo] Error issueing SQL query: " + ex); } finally { DbUtils.close(c); } } catch (SQLException ex) { - System.out.println("[iConomy] Database Error: " + ex); + System.out.println("[iCo] Database Error: " + ex); } } } diff --git a/src/com/iCo6/system/Transaction.java b/src/com/iCo/system/Transaction.java similarity index 98% rename from src/com/iCo6/system/Transaction.java rename to src/com/iCo/system/Transaction.java index 11bb638..ca95485 100644 --- a/src/com/iCo6/system/Transaction.java +++ b/src/com/iCo/system/Transaction.java @@ -1,4 +1,4 @@ -package com.iCo6.system; +package com.iCo.system; public class Transaction { public long time = 0L; diff --git a/src/com/iCo6/system/Transactions.java b/src/com/iCo/system/Transactions.java similarity index 86% rename from src/com/iCo6/system/Transactions.java rename to src/com/iCo/system/Transactions.java index 6687c9b..48cf127 100644 --- a/src/com/iCo6/system/Transactions.java +++ b/src/com/iCo/system/Transactions.java @@ -1,10 +1,10 @@ -package com.iCo6.system; +package com.iCo.system; -import com.iCo6.Constants; -import com.iCo6.IO.mini.Arguments; -import com.iCo6.iConomy; -import com.iCo6.util.Common; -import com.iCo6.IO.mini.Mini; +import com.iCo.Constants; +import com.iCo.IO.mini.Arguments; +import com.iCo.iConomy; +import com.iCo.util.Common; +import com.iCo.IO.mini.Mini; public class Transactions { /** diff --git a/src/com/iCo6/system/events/AccountCreation.java b/src/com/iCo/system/events/AccountCreation.java similarity index 95% rename from src/com/iCo6/system/events/AccountCreation.java rename to src/com/iCo/system/events/AccountCreation.java index 3423fbf..db8544e 100644 --- a/src/com/iCo6/system/events/AccountCreation.java +++ b/src/com/iCo/system/events/AccountCreation.java @@ -1,4 +1,4 @@ -package com.iCo6.system.events; +package com.iCo.system.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/com/iCo6/system/events/AccountRemoval.java b/src/com/iCo/system/events/AccountRemoval.java similarity index 95% rename from src/com/iCo6/system/events/AccountRemoval.java rename to src/com/iCo/system/events/AccountRemoval.java index 98b8b49..5167dcd 100644 --- a/src/com/iCo6/system/events/AccountRemoval.java +++ b/src/com/iCo/system/events/AccountRemoval.java @@ -1,4 +1,4 @@ -package com.iCo6.system.events; +package com.iCo.system.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/com/iCo6/system/events/AccountReset.java b/src/com/iCo/system/events/AccountReset.java similarity index 95% rename from src/com/iCo6/system/events/AccountReset.java rename to src/com/iCo/system/events/AccountReset.java index a31f95a..d1216b3 100644 --- a/src/com/iCo6/system/events/AccountReset.java +++ b/src/com/iCo/system/events/AccountReset.java @@ -1,4 +1,4 @@ -package com.iCo6.system.events; +package com.iCo.system.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/com/iCo6/system/events/HoldingsSet.java b/src/com/iCo/system/events/HoldingsSet.java similarity index 95% rename from src/com/iCo6/system/events/HoldingsSet.java rename to src/com/iCo/system/events/HoldingsSet.java index 0607cc7..5be3d8d 100644 --- a/src/com/iCo6/system/events/HoldingsSet.java +++ b/src/com/iCo/system/events/HoldingsSet.java @@ -1,4 +1,4 @@ -package com.iCo6.system.events; +package com.iCo.system.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/com/iCo6/system/events/HoldingsUpdate.java b/src/com/iCo/system/events/HoldingsUpdate.java similarity index 97% rename from src/com/iCo6/system/events/HoldingsUpdate.java rename to src/com/iCo/system/events/HoldingsUpdate.java index aff9aee..afab5b3 100644 --- a/src/com/iCo6/system/events/HoldingsUpdate.java +++ b/src/com/iCo/system/events/HoldingsUpdate.java @@ -1,4 +1,4 @@ -package com.iCo6.system.events; +package com.iCo.system.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/com/iCo6/util/Common.java b/src/com/iCo/util/Common.java similarity index 97% rename from src/com/iCo6/util/Common.java rename to src/com/iCo/util/Common.java index 6e7f65d..da893f2 100644 --- a/src/com/iCo6/util/Common.java +++ b/src/com/iCo/util/Common.java @@ -1,7 +1,7 @@ -package com.iCo6.util; +package com.iCo.util; -import com.iCo6.Constants; -import com.iCo6.iConomy; +import com.iCo.Constants; +import com.iCo.iConomy; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -174,7 +174,7 @@ public static void extract(String... names) { while ((length = input.read(buf)) > 0) output.write(buf, 0, length); - System.out.println("[iConomy] Default setup file written: " + name); + System.out.println("[iCo] Default setup file written: " + name); } catch (Exception e) { } finally { try { if (input != null) input.close(); diff --git a/src/com/iCo6/util/Messaging.java b/src/com/iCo/util/Messaging.java similarity index 99% rename from src/com/iCo6/util/Messaging.java rename to src/com/iCo/util/Messaging.java index a3c5b3c..97efa15 100644 --- a/src/com/iCo6/util/Messaging.java +++ b/src/com/iCo/util/Messaging.java @@ -1,6 +1,6 @@ -package com.iCo6.util; +package com.iCo.util; -import com.iCo6.iConomy; +import com.iCo.iConomy; import java.util.LinkedHashMap; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/com/iCo6/util/Template.java b/src/com/iCo/util/Template.java similarity index 99% rename from src/com/iCo6/util/Template.java rename to src/com/iCo/util/Template.java index 5439ff3..de9c7f8 100644 --- a/src/com/iCo6/util/Template.java +++ b/src/com/iCo/util/Template.java @@ -1,4 +1,4 @@ -package com.iCo6.util; +package com.iCo.util; import java.io.File; import java.io.IOException; diff --git a/src/com/iCo6/util/Thrun.java b/src/com/iCo/util/Thrun.java similarity index 93% rename from src/com/iCo6/util/Thrun.java rename to src/com/iCo/util/Thrun.java index d87e216..b6716e1 100644 --- a/src/com/iCo6/util/Thrun.java +++ b/src/com/iCo/util/Thrun.java @@ -1,4 +1,4 @@ -package com.iCo6.util; +package com.iCo.util; public class Thrun extends Thread { private final Runnable r; diff --git a/src/com/iCo6/util/nbt/ByteArrayTag.java b/src/com/iCo/util/nbt/ByteArrayTag.java similarity index 97% rename from src/com/iCo6/util/nbt/ByteArrayTag.java rename to src/com/iCo/util/nbt/ByteArrayTag.java index 612803e..409c48c 100644 --- a/src/com/iCo6/util/nbt/ByteArrayTag.java +++ b/src/com/iCo/util/nbt/ByteArrayTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_Byte_Array} tag. diff --git a/src/com/iCo6/util/nbt/ByteTag.java b/src/com/iCo/util/nbt/ByteTag.java similarity index 96% rename from src/com/iCo6/util/nbt/ByteTag.java rename to src/com/iCo/util/nbt/ByteTag.java index a3bb30c..8a0bd90 100644 --- a/src/com/iCo6/util/nbt/ByteTag.java +++ b/src/com/iCo/util/nbt/ByteTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_Byte} tag. diff --git a/src/com/iCo6/util/nbt/CompoundTag.java b/src/com/iCo/util/nbt/CompoundTag.java similarity index 97% rename from src/com/iCo6/util/nbt/CompoundTag.java rename to src/com/iCo/util/nbt/CompoundTag.java index dc65596..bb72b44 100644 --- a/src/com/iCo6/util/nbt/CompoundTag.java +++ b/src/com/iCo/util/nbt/CompoundTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; import java.util.Collections; import java.util.Map; diff --git a/src/com/iCo6/util/nbt/DoubleTag.java b/src/com/iCo/util/nbt/DoubleTag.java similarity index 96% rename from src/com/iCo6/util/nbt/DoubleTag.java rename to src/com/iCo/util/nbt/DoubleTag.java index a8d73b8..d21130a 100644 --- a/src/com/iCo6/util/nbt/DoubleTag.java +++ b/src/com/iCo/util/nbt/DoubleTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_Double} tag. diff --git a/src/com/iCo6/util/nbt/EndTag.java b/src/com/iCo/util/nbt/EndTag.java similarity index 92% rename from src/com/iCo6/util/nbt/EndTag.java rename to src/com/iCo/util/nbt/EndTag.java index a3dd048..92dec25 100644 --- a/src/com/iCo6/util/nbt/EndTag.java +++ b/src/com/iCo/util/nbt/EndTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_End} tag. diff --git a/src/com/iCo6/util/nbt/FloatTag.java b/src/com/iCo/util/nbt/FloatTag.java similarity index 96% rename from src/com/iCo6/util/nbt/FloatTag.java rename to src/com/iCo/util/nbt/FloatTag.java index 0027dcb..6f41349 100644 --- a/src/com/iCo6/util/nbt/FloatTag.java +++ b/src/com/iCo/util/nbt/FloatTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_Float} tag. diff --git a/src/com/iCo6/util/nbt/IntTag.java b/src/com/iCo/util/nbt/IntTag.java similarity index 96% rename from src/com/iCo6/util/nbt/IntTag.java rename to src/com/iCo/util/nbt/IntTag.java index 1778901..77ef9f9 100644 --- a/src/com/iCo6/util/nbt/IntTag.java +++ b/src/com/iCo/util/nbt/IntTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_Int} tag. diff --git a/src/com/iCo6/util/nbt/ListTag.java b/src/com/iCo/util/nbt/ListTag.java similarity index 98% rename from src/com/iCo6/util/nbt/ListTag.java rename to src/com/iCo/util/nbt/ListTag.java index 9a9aace..50a1a15 100644 --- a/src/com/iCo6/util/nbt/ListTag.java +++ b/src/com/iCo/util/nbt/ListTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; import java.util.Collections; import java.util.List; diff --git a/src/com/iCo6/util/nbt/LongTag.java b/src/com/iCo/util/nbt/LongTag.java similarity index 96% rename from src/com/iCo6/util/nbt/LongTag.java rename to src/com/iCo/util/nbt/LongTag.java index aa7b21f..f22a8bf 100644 --- a/src/com/iCo6/util/nbt/LongTag.java +++ b/src/com/iCo/util/nbt/LongTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_Long} tag. diff --git a/src/com/iCo6/util/nbt/NBTConstants.java b/src/com/iCo/util/nbt/NBTConstants.java similarity index 96% rename from src/com/iCo6/util/nbt/NBTConstants.java rename to src/com/iCo/util/nbt/NBTConstants.java index b6b20dd..1bc7cdd 100644 --- a/src/com/iCo6/util/nbt/NBTConstants.java +++ b/src/com/iCo/util/nbt/NBTConstants.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; import java.nio.charset.Charset; diff --git a/src/com/iCo6/util/nbt/NBTInputStream.java b/src/com/iCo/util/nbt/NBTInputStream.java similarity index 99% rename from src/com/iCo6/util/nbt/NBTInputStream.java rename to src/com/iCo/util/nbt/NBTInputStream.java index ad70f87..fadc552 100644 --- a/src/com/iCo6/util/nbt/NBTInputStream.java +++ b/src/com/iCo/util/nbt/NBTInputStream.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; import java.io.Closeable; import java.io.DataInputStream; diff --git a/src/com/iCo6/util/nbt/NBTOutputStream.java b/src/com/iCo/util/nbt/NBTOutputStream.java similarity index 99% rename from src/com/iCo6/util/nbt/NBTOutputStream.java rename to src/com/iCo/util/nbt/NBTOutputStream.java index fde9e6c..36e452f 100644 --- a/src/com/iCo6/util/nbt/NBTOutputStream.java +++ b/src/com/iCo/util/nbt/NBTOutputStream.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; import java.io.Closeable; import java.io.DataOutputStream; diff --git a/src/com/iCo6/util/nbt/NBTUtils.java b/src/com/iCo/util/nbt/NBTUtils.java similarity index 99% rename from src/com/iCo6/util/nbt/NBTUtils.java rename to src/com/iCo/util/nbt/NBTUtils.java index f184fd5..d450264 100644 --- a/src/com/iCo6/util/nbt/NBTUtils.java +++ b/src/com/iCo/util/nbt/NBTUtils.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * A class which contains NBT-related utility methods. diff --git a/src/com/iCo6/util/nbt/ShortTag.java b/src/com/iCo/util/nbt/ShortTag.java similarity index 96% rename from src/com/iCo6/util/nbt/ShortTag.java rename to src/com/iCo/util/nbt/ShortTag.java index f4c6259..77a4031 100644 --- a/src/com/iCo6/util/nbt/ShortTag.java +++ b/src/com/iCo/util/nbt/ShortTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_Short} tag. diff --git a/src/com/iCo6/util/nbt/StringTag.java b/src/com/iCo/util/nbt/StringTag.java similarity index 96% rename from src/com/iCo6/util/nbt/StringTag.java rename to src/com/iCo/util/nbt/StringTag.java index a660807..86889a0 100644 --- a/src/com/iCo6/util/nbt/StringTag.java +++ b/src/com/iCo/util/nbt/StringTag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * The {@code TAG_String} tag. diff --git a/src/com/iCo6/util/nbt/Tag.java b/src/com/iCo/util/nbt/Tag.java similarity index 96% rename from src/com/iCo6/util/nbt/Tag.java rename to src/com/iCo/util/nbt/Tag.java index 1343e0b..83fa89e 100644 --- a/src/com/iCo6/util/nbt/Tag.java +++ b/src/com/iCo/util/nbt/Tag.java @@ -1,4 +1,4 @@ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; /** * Represents a single NBT tag. diff --git a/src/com/iCo6/util/nbt/package-info.java b/src/com/iCo/util/nbt/package-info.java similarity index 75% rename from src/com/iCo6/util/nbt/package-info.java rename to src/com/iCo/util/nbt/package-info.java index 84642b8..861b275 100644 --- a/src/com/iCo6/util/nbt/package-info.java +++ b/src/com/iCo/util/nbt/package-info.java @@ -1,5 +1,5 @@ /** * Contains a modified version of JNBT. */ -package com.iCo6.util.nbt; +package com.iCo.util.nbt; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/BasicRowProcessor.java b/src/com/iCo/util/org/apache/commons/dbutils/BasicRowProcessor.java similarity index 99% rename from src/com/iCo6/util/org/apache/commons/dbutils/BasicRowProcessor.java rename to src/com/iCo/util/org/apache/commons/dbutils/BasicRowProcessor.java index 6e28329..4916dca 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/BasicRowProcessor.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/BasicRowProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/BeanProcessor.java b/src/com/iCo/util/org/apache/commons/dbutils/BeanProcessor.java similarity index 99% rename from src/com/iCo6/util/org/apache/commons/dbutils/BeanProcessor.java rename to src/com/iCo/util/org/apache/commons/dbutils/BeanProcessor.java index 97c6dcf..8d72d9f 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/BeanProcessor.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/BeanProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.beans.BeanInfo; import java.beans.IntrospectionException; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/DbUtils.java b/src/com/iCo/util/org/apache/commons/dbutils/DbUtils.java similarity index 99% rename from src/com/iCo6/util/org/apache/commons/dbutils/DbUtils.java rename to src/com/iCo/util/org/apache/commons/dbutils/DbUtils.java index e219ef9..e668553 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/DbUtils.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/DbUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.io.PrintWriter; import java.sql.Connection; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/ProxyFactory.java b/src/com/iCo/util/org/apache/commons/dbutils/ProxyFactory.java similarity index 98% rename from src/com/iCo6/util/org/apache/commons/dbutils/ProxyFactory.java rename to src/com/iCo/util/org/apache/commons/dbutils/ProxyFactory.java index c289eb5..7a73668 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/ProxyFactory.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/ProxyFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/QueryLoader.java b/src/com/iCo/util/org/apache/commons/dbutils/QueryLoader.java similarity index 98% rename from src/com/iCo6/util/org/apache/commons/dbutils/QueryLoader.java rename to src/com/iCo/util/org/apache/commons/dbutils/QueryLoader.java index 6861795..7d4c8f8 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/QueryLoader.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/QueryLoader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/QueryRunner.java b/src/com/iCo/util/org/apache/commons/dbutils/QueryRunner.java similarity index 99% rename from src/com/iCo6/util/org/apache/commons/dbutils/QueryRunner.java rename to src/com/iCo/util/org/apache/commons/dbutils/QueryRunner.java index 64d9f4c..49d9cbb 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/QueryRunner.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/QueryRunner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.beans.IntrospectionException; import java.beans.Introspector; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/ResultSetHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/ResultSetHandler.java similarity index 96% rename from src/com/iCo6/util/org/apache/commons/dbutils/ResultSetHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/ResultSetHandler.java index c14f84f..a41c68e 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/ResultSetHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/ResultSetHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/ResultSetIterator.java b/src/com/iCo/util/org/apache/commons/dbutils/ResultSetIterator.java similarity index 98% rename from src/com/iCo6/util/org/apache/commons/dbutils/ResultSetIterator.java rename to src/com/iCo/util/org/apache/commons/dbutils/ResultSetIterator.java index fe27ee4..c4a2954 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/ResultSetIterator.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/ResultSetIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/RowProcessor.java b/src/com/iCo/util/org/apache/commons/dbutils/RowProcessor.java similarity index 98% rename from src/com/iCo6/util/org/apache/commons/dbutils/RowProcessor.java rename to src/com/iCo/util/org/apache/commons/dbutils/RowProcessor.java index 8804e42..3ccd57f 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/RowProcessor.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/RowProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils; +package com.iCo.util.org.apache.commons.dbutils; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java similarity index 96% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java index 1ec4054..ada5b63 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler; +import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler; /** *

diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/AbstractListHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/AbstractListHandler.java similarity index 94% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/AbstractListHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/AbstractListHandler.java index 46a90a8..5abba8f 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/AbstractListHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/AbstractListHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler; +import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler; /** * Abstract class that simplify development of ResultSetHandler diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ArrayHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ArrayHandler.java similarity index 91% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/ArrayHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/ArrayHandler.java index 3112fd0..57e9c19 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ArrayHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ArrayHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; -import com.iCo6.util.org.apache.commons.dbutils.BasicRowProcessor; -import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler; -import com.iCo6.util.org.apache.commons.dbutils.RowProcessor; +import com.iCo.util.org.apache.commons.dbutils.BasicRowProcessor; +import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler; +import com.iCo.util.org.apache.commons.dbutils.RowProcessor; /** * ResultSetHandler implementation that converts a diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ArrayListHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ArrayListHandler.java similarity index 95% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/ArrayListHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/ArrayListHandler.java index 28af927..b02fb0c 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ArrayListHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ArrayListHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; -import com.iCo6.util.org.apache.commons.dbutils.RowProcessor; +import com.iCo.util.org.apache.commons.dbutils.RowProcessor; /** * ResultSetHandler implementation that converts the diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/BeanHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/BeanHandler.java similarity index 93% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/BeanHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/BeanHandler.java index 5473682..0fc6e94 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/BeanHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/BeanHandler.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; -import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler; -import com.iCo6.util.org.apache.commons.dbutils.RowProcessor; +import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler; +import com.iCo.util.org.apache.commons.dbutils.RowProcessor; /** * ResultSetHandler implementation that converts the first diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/BeanListHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/BeanListHandler.java similarity index 93% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/BeanListHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/BeanListHandler.java index 9de9473..62c41bc 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/BeanListHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/BeanListHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler; -import com.iCo6.util.org.apache.commons.dbutils.RowProcessor; +import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler; +import com.iCo.util.org.apache.commons.dbutils.RowProcessor; /** * ResultSetHandler implementation that converts a diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ColumnListHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ColumnListHandler.java similarity index 98% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/ColumnListHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/ColumnListHandler.java index 6c8b156..5bd6d3b 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ColumnListHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ColumnListHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/KeyedHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/KeyedHandler.java similarity index 97% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/KeyedHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/KeyedHandler.java index 93dc54f..9905cb9 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/KeyedHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/KeyedHandler.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map; -import com.iCo6.util.org.apache.commons.dbutils.RowProcessor; +import com.iCo.util.org.apache.commons.dbutils.RowProcessor; /** *

diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/MapHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/MapHandler.java similarity index 92% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/MapHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/MapHandler.java index bc9ac0f..a6444c9 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/MapHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/MapHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map; -import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler; -import com.iCo6.util.org.apache.commons.dbutils.RowProcessor; +import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler; +import com.iCo.util.org.apache.commons.dbutils.RowProcessor; /** * ResultSetHandler implementation that converts the first diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/MapListHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/MapListHandler.java similarity index 95% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/MapListHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/MapListHandler.java index ba76b7c..b94ce1b 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/MapListHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/MapListHandler.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map; -import com.iCo6.util.org.apache.commons.dbutils.RowProcessor; +import com.iCo.util.org.apache.commons.dbutils.RowProcessor; /** * ResultSetHandler implementation that converts a diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ScalarHandler.java b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ScalarHandler.java similarity index 96% rename from src/com/iCo6/util/org/apache/commons/dbutils/handlers/ScalarHandler.java rename to src/com/iCo/util/org/apache/commons/dbutils/handlers/ScalarHandler.java index 3732103..79cc0f9 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/handlers/ScalarHandler.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/handlers/ScalarHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.handlers; +package com.iCo.util.org.apache.commons.dbutils.handlers; import java.sql.ResultSet; import java.sql.SQLException; -import com.iCo6.util.org.apache.commons.dbutils.ResultSetHandler; +import com.iCo.util.org.apache.commons.dbutils.ResultSetHandler; /** * ResultSetHandler implementation that converts one diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java b/src/com/iCo/util/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java similarity index 99% rename from src/com/iCo6/util/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java rename to src/com/iCo/util/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java index 4638fcc..70877c9 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.wrappers; +package com.iCo.util.org.apache.commons.dbutils.wrappers; import java.io.InputStream; import java.io.Reader; @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; -import com.iCo6.util.org.apache.commons.dbutils.ProxyFactory; +import com.iCo.util.org.apache.commons.dbutils.ProxyFactory; /** * Decorates a ResultSet with checks for a SQL NULL value on each diff --git a/src/com/iCo6/util/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java b/src/com/iCo/util/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java similarity index 96% rename from src/com/iCo6/util/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java rename to src/com/iCo/util/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java index ba06a3c..3e6c7b6 100644 --- a/src/com/iCo6/util/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java +++ b/src/com/iCo/util/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.iCo6.util.org.apache.commons.dbutils.wrappers; +package com.iCo.util.org.apache.commons.dbutils.wrappers; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.sql.ResultSet; -import com.iCo6.util.org.apache.commons.dbutils.ProxyFactory; +import com.iCo.util.org.apache.commons.dbutils.ProxyFactory; /** * Wraps a ResultSet to trim strings returned by the diff --git a/src/com/iCo6/util/wget.java b/src/com/iCo/util/wget.java similarity index 95% rename from src/com/iCo6/util/wget.java rename to src/com/iCo/util/wget.java index f8814cf..7cf8bb0 100644 --- a/src/com/iCo6/util/wget.java +++ b/src/com/iCo/util/wget.java @@ -1,4 +1,4 @@ -package com.iCo6.util; +package com.iCo.util; import java.io.File; import java.io.FileOutputStream; @@ -33,7 +33,7 @@ public static void fetch(String location, String filename) { download(location, filename); System.out.println(" - " + filename + " finished."); } catch (IOException ex) { - System.out.println("[iConomy] Error Downloading File: " + ex); + System.out.println("[iCo] Error Downloading File: " + ex); } } diff --git a/src/plugin.yml b/src/resources/plugin.yml similarity index 98% rename from src/plugin.yml rename to src/resources/plugin.yml index 8273927..b48a350 100644 --- a/src/plugin.yml +++ b/src/resources/plugin.yml @@ -1,7 +1,7 @@ # General Data name: iConomy -main: com.iCo6.iConomy -version: 6.0.10b +main: com.iCo.iConomy +version: 7.1 # Command Data commands: @@ -15,7 +15,7 @@ categories: [ECON] description: Simple, easy, and intuitive economy for minecraft. maintainer: Nijikokun authors: [Nijikokun, SpaceManiac] -website: http://ico.nexua.org +website: http://github.com/iConomy/Core thread: http://bit.ly/iConomy location: "http://mirror.nexua.org/iConomy/Latest Build/iConomy.jar" conflicts: []