Fix packages

src/main/java/com/redstoner/annotations/AutoRegisterListener.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/redstoner/annotations/Commands.java

@@ -1,12 +1,12 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
+
+import com.redstoner.misc.CommandHolder;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import main.java.com.redstoner.misc.CommandHolder;
-
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Commands

src/main/java/com/redstoner/annotations/Depends.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/redstoner/annotations/SoftDepends.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/redstoner/annotations/Version.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.exceptions;
+package com.redstoner.exceptions;
 
 public class NonSaveableConfigException extends Exception {
     private static final long serialVersionUID = -7271481973389455510L;

src/main/java/com/redstoner/faucet/Faucet.java

@@ -1,15 +1,13 @@
-package main.java.com.redstoner.faucet;
-
-import java.util.HashMap;
-
-import main.java.com.redstoner.annotations.Version;
-import org.bukkit.plugin.java.JavaPlugin;
+package com.redstoner.faucet;
 
 import com.nemez.cmdmgr.Command;
-import main.java.com.redstoner.misc.mysql.MysqlHandler;
-import main.java.com.redstoner.modules.Module;
-
+import com.redstoner.annotations.Version;
+import com.redstoner.misc.mysql.MysqlHandler;
+import com.redstoner.modules.Module;
 import net.nemez.chatapi.ChatAPI;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.HashMap;
 
 /** Main class. Duh.
  * 

src/main/java/com/redstoner/misc/BroadcastFilter.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc;
+package com.redstoner.misc;
 
 import org.bukkit.command.CommandSender;
 

src/main/java/com/redstoner/misc/CommandHolder.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc;
+package com.redstoner.misc;
 
 /** @author Pepich */
 public enum CommandHolder

src/main/java/com/redstoner/misc/JsonManager.java

@@ -1,15 +1,15 @@
-package main.java.com.redstoner.misc;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
+package com.redstoner.misc;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
 /** This class provides simple JSON handling, like storing and loading from and to files.
  * 
  * @author Pepich */

src/main/java/com/redstoner/misc/Utils.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc;
+package com.redstoner.misc;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;

src/main/java/com/redstoner/misc/mysql/Config.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
 
 import java.io.File;
 import java.io.FileReader;
@@ -11,13 +11,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import main.java.com.redstoner.faucet.Faucet;
+import com.redstoner.faucet.Faucet;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import main.java.com.redstoner.exceptions.NonSaveableConfigException;
+import com.redstoner.exceptions.NonSaveableConfigException;
 
 public class Config
 {

src/main/java/com/redstoner/misc/mysql/JSONManager.java

@@ -1,4 +1,10 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
+
+import com.redstoner.faucet.Faucet;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -13,12 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import main.java.com.redstoner.faucet.Faucet;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
 public class JSONManager
 {
 	public static Map<Serializable, Serializable> getConfiguration(String fileName)

src/main/java/com/redstoner/misc/mysql/MysqlHandler.java

@@ -1,4 +1,10 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
+
+import com.redstoner.faucet.Faucet;
+import com.redstoner.misc.mysql.elements.MysqlDatabase;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.json.simple.parser.ParseException;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,13 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import main.java.com.redstoner.faucet.Faucet;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.json.simple.parser.ParseException;
-
-import main.java.com.redstoner.misc.mysql.elements.MysqlDatabase;
-
 public class MysqlHandler
 {
 	public static MysqlHandler INSTANCE;

src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;

src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 public enum ConstraintOperator {
 	LESS_THAN, GREATER_THAN, EQUAL, NOT_EQUAL, LESS_THAN_OR_EQUAL, GREATER_THAN_OR_EQUAL;

src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 public class MysqlConstraint {
 	private String fieldName, value;

src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import main.java.com.redstoner.misc.mysql.MysqlQueryHandler;
+import com.redstoner.misc.mysql.MysqlQueryHandler;
 
 public class MysqlDatabase {
 	private Connection connection;

src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class MysqlField {
 	private String name;

src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java

@@ -1,4 +1,6 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
+
+import com.redstoner.misc.mysql.MysqlQueryHandler;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -6,8 +8,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import main.java.com.redstoner.misc.mysql.MysqlQueryHandler;
-
 public class MysqlTable
 {
 	private MysqlDatabase database;

src/main/java/com/redstoner/misc/mysql/types/MysqlType.java

@@ -1,29 +1,29 @@
-package main.java.com.redstoner.misc.mysql.types;
+package com.redstoner.misc.mysql.types;
 
-import main.java.com.redstoner.misc.mysql.types.date.Date;
-import main.java.com.redstoner.misc.mysql.types.date.DateTime;
-import main.java.com.redstoner.misc.mysql.types.date.Time;
-import main.java.com.redstoner.misc.mysql.types.date.TimeStamp;
-import main.java.com.redstoner.misc.mysql.types.date.Year;
-import main.java.com.redstoner.misc.mysql.types.number.Double;
-import main.java.com.redstoner.misc.mysql.types.number.Float;
-import main.java.com.redstoner.misc.mysql.types.number.Int;
-import main.java.com.redstoner.misc.mysql.types.number.MediumInt;
-import main.java.com.redstoner.misc.mysql.types.number.SmallInt;
-import main.java.com.redstoner.misc.mysql.types.text.Blob;
-import main.java.com.redstoner.misc.mysql.types.text.Char;
-import main.java.com.redstoner.misc.mysql.types.text.Enum;
-import main.java.com.redstoner.misc.mysql.types.text.LongBlob;
-import main.java.com.redstoner.misc.mysql.types.text.LongText;
-import main.java.com.redstoner.misc.mysql.types.text.MediumBlob;
-import main.java.com.redstoner.misc.mysql.types.text.MediumText;
-import main.java.com.redstoner.misc.mysql.types.text.Set;
-import main.java.com.redstoner.misc.mysql.types.text.TinyText;
-import main.java.com.redstoner.misc.mysql.types.text.VarChar;
-import main.java.com.redstoner.misc.mysql.types.number.BigInt;
-import main.java.com.redstoner.misc.mysql.types.number.Decimal;
-import main.java.com.redstoner.misc.mysql.types.number.TinyInt;
-import main.java.com.redstoner.misc.mysql.types.text.Text;
+import com.redstoner.misc.mysql.types.date.Date;
+import com.redstoner.misc.mysql.types.date.DateTime;
+import com.redstoner.misc.mysql.types.date.Time;
+import com.redstoner.misc.mysql.types.date.TimeStamp;
+import com.redstoner.misc.mysql.types.date.Year;
+import com.redstoner.misc.mysql.types.number.Double;
+import com.redstoner.misc.mysql.types.number.Float;
+import com.redstoner.misc.mysql.types.number.Int;
+import com.redstoner.misc.mysql.types.number.MediumInt;
+import com.redstoner.misc.mysql.types.number.SmallInt;
+import com.redstoner.misc.mysql.types.text.Blob;
+import com.redstoner.misc.mysql.types.text.Char;
+import com.redstoner.misc.mysql.types.text.Enum;
+import com.redstoner.misc.mysql.types.text.LongBlob;
+import com.redstoner.misc.mysql.types.text.LongText;
+import com.redstoner.misc.mysql.types.text.MediumBlob;
+import com.redstoner.misc.mysql.types.text.MediumText;
+import com.redstoner.misc.mysql.types.text.Set;
+import com.redstoner.misc.mysql.types.text.TinyText;
+import com.redstoner.misc.mysql.types.text.VarChar;
+import com.redstoner.misc.mysql.types.number.BigInt;
+import com.redstoner.misc.mysql.types.number.Decimal;
+import com.redstoner.misc.mysql.types.number.TinyInt;
+import com.redstoner.misc.mysql.types.text.Text;
 
 public abstract class MysqlType
 {

src/main/java/com/redstoner/misc/mysql/types/date/Date.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Date extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class DateTime extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/date/Time.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Time extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class TimeStamp extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/date/Year.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Year extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class BigInt extends Int {
 	public BigInt(int maxSize) {

src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Decimal extends MysqlType
 {

src/main/java/com/redstoner/misc/mysql/types/number/Double.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Double extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/number/Float.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Float extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/number/Int.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Int extends MysqlType {
 	private int maxSize;

src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class MediumInt extends Int {
 	public MediumInt(int maxSize) {

src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class SmallInt extends Int {
 	public SmallInt(int maxSize) {

src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class TinyInt extends Int {
 	public TinyInt(int maxSize) {

src/main/java/com/redstoner/misc/mysql/types/text/Blob.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Blob extends MysqlType {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/text/Char.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Char extends MysqlType {
 	private int size;

src/main/java/com/redstoner/misc/mysql/types/text/Enum.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Enum extends MysqlType {
 	private String[] possibleValues;

src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class LongBlob extends Blob {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/text/LongText.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class LongText extends Text {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class MediumBlob extends Blob {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class MediumText extends Text {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/text/Set.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Set extends MysqlType {
 	private String[] possibleValues;

src/main/java/com/redstoner/misc/mysql/types/text/Text.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Text extends MysqlType
 {

src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class TinyText extends Text {
 	@Override

src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java

@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class VarChar extends MysqlType {
 	private int maxSize;

src/main/java/com/redstoner/modules/Module.java

@@ -1,7 +1,7 @@
-package main.java.com.redstoner.modules;
+package com.redstoner.modules;
 
-import main.java.com.redstoner.annotations.Version;
-import main.java.com.redstoner.faucet.Faucet;
+import com.redstoner.annotations.Version;
+import com.redstoner.faucet.Faucet;
 
 /** Interface for the Module class. Modules must always have an empty constructor to be invoked by the ModuleLoader.
  * 

src/main/java/com/redstoner/modules/ModuleLogger.java

@@ -1,4 +1,4 @@
-package main.java.com.redstoner.modules;
+package com.redstoner.modules;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;