diff --git a/src/com/redstoner/misc/mysql/types/date/Date.java b/src/com/redstoner/misc/mysql/types/date/Date.java deleted file mode 100644 index 9943333..0000000 --- a/src/com/redstoner/misc/mysql/types/date/Date.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.date; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Date extends MysqlType { - @Override - public String getName() { - return "DATE"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/date/DateTime.java b/src/com/redstoner/misc/mysql/types/date/DateTime.java deleted file mode 100644 index b4d9623..0000000 --- a/src/com/redstoner/misc/mysql/types/date/DateTime.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.date; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class DateTime extends MysqlType { - @Override - public String getName() { - return "DATETIME"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/date/Time.java b/src/com/redstoner/misc/mysql/types/date/Time.java deleted file mode 100644 index 4ead72c..0000000 --- a/src/com/redstoner/misc/mysql/types/date/Time.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.date; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Time extends MysqlType { - @Override - public String getName() { - return "TIME"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/date/TimeStamp.java b/src/com/redstoner/misc/mysql/types/date/TimeStamp.java deleted file mode 100644 index 56205af..0000000 --- a/src/com/redstoner/misc/mysql/types/date/TimeStamp.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.date; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class TimeStamp extends MysqlType { - @Override - public String getName() { - return "TIMESTAMP"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/date/Year.java b/src/com/redstoner/misc/mysql/types/date/Year.java deleted file mode 100644 index 4c2ce1a..0000000 --- a/src/com/redstoner/misc/mysql/types/date/Year.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.date; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Year extends MysqlType { - @Override - public String getName() { - return "YEAR"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/number/Decimal.java b/src/com/redstoner/misc/mysql/types/number/Decimal.java deleted file mode 100644 index 4e4dbb6..0000000 --- a/src/com/redstoner/misc/mysql/types/number/Decimal.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.number; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Decimal extends MysqlType { - @Override - public String getName() { - return "DECIMAL"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/number/Double.java b/src/com/redstoner/misc/mysql/types/number/Double.java deleted file mode 100644 index b4b1dda..0000000 --- a/src/com/redstoner/misc/mysql/types/number/Double.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.number; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Double extends MysqlType { - @Override - public String getName() { - return "DOUBLE"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/number/Float.java b/src/com/redstoner/misc/mysql/types/number/Float.java deleted file mode 100644 index ea3047e..0000000 --- a/src/com/redstoner/misc/mysql/types/number/Float.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.number; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Float extends MysqlType { - @Override - public String getName() { - return "FLOAT"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/text/Blob.java b/src/com/redstoner/misc/mysql/types/text/Blob.java deleted file mode 100644 index d56ee45..0000000 --- a/src/com/redstoner/misc/mysql/types/text/Blob.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.text; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Blob extends MysqlType { - @Override - public String getName() { - return "BLOB"; - } -} diff --git a/src/com/redstoner/misc/mysql/types/text/Text.java b/src/com/redstoner/misc/mysql/types/text/Text.java deleted file mode 100644 index 7d1a38c..0000000 --- a/src/com/redstoner/misc/mysql/types/text/Text.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.redstoner.misc.mysql.types.text; - -import com.redstoner.misc.mysql.types.MysqlType; - -public class Text extends MysqlType { - @Override - public String getName() { - return "TEXT"; - } -} diff --git a/src/com/redstoner/annotations/AutoRegisterListener.java b/src/main/java/com/redstoner/annotations/AutoRegisterListener.java similarity index 90% rename from src/com/redstoner/annotations/AutoRegisterListener.java rename to src/main/java/com/redstoner/annotations/AutoRegisterListener.java index eb1c7c0..65d0585 100644 --- a/src/com/redstoner/annotations/AutoRegisterListener.java +++ b/src/main/java/com/redstoner/annotations/AutoRegisterListener.java @@ -1,4 +1,4 @@ -package com.redstoner.annotations; +package main.java.com.redstoner.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/redstoner/annotations/Commands.java b/src/main/java/com/redstoner/annotations/Commands.java similarity index 74% rename from src/com/redstoner/annotations/Commands.java rename to src/main/java/com/redstoner/annotations/Commands.java index 6b42c82..15284c3 100644 --- a/src/com/redstoner/annotations/Commands.java +++ b/src/main/java/com/redstoner/annotations/Commands.java @@ -1,11 +1,11 @@ -package com.redstoner.annotations; +package main.java.com.redstoner.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.redstoner.misc.CommandHolder; +import main.java.com.redstoner.misc.CommandHolder; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/com/redstoner/annotations/Depends.java b/src/main/java/com/redstoner/annotations/Depends.java similarity index 85% rename from src/com/redstoner/annotations/Depends.java rename to src/main/java/com/redstoner/annotations/Depends.java index 063a1f6..e4d3742 100644 --- a/src/com/redstoner/annotations/Depends.java +++ b/src/main/java/com/redstoner/annotations/Depends.java @@ -1,4 +1,4 @@ -package com.redstoner.annotations; +package main.java.com.redstoner.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/redstoner/annotations/SoftDepends.java b/src/main/java/com/redstoner/annotations/SoftDepends.java similarity index 86% rename from src/com/redstoner/annotations/SoftDepends.java rename to src/main/java/com/redstoner/annotations/SoftDepends.java index 06c6b0f..50d444d 100644 --- a/src/com/redstoner/annotations/SoftDepends.java +++ b/src/main/java/com/redstoner/annotations/SoftDepends.java @@ -1,4 +1,4 @@ -package com.redstoner.annotations; +package main.java.com.redstoner.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/redstoner/annotations/Version.java b/src/main/java/com/redstoner/annotations/Version.java similarity index 95% rename from src/com/redstoner/annotations/Version.java rename to src/main/java/com/redstoner/annotations/Version.java index e700292..c276881 100644 --- a/src/com/redstoner/annotations/Version.java +++ b/src/main/java/com/redstoner/annotations/Version.java @@ -1,4 +1,4 @@ -package com.redstoner.annotations; +package main.java.com.redstoner.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/com/redstoner/exceptions/NonSaveableConfigException.java b/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java similarity index 84% rename from src/com/redstoner/exceptions/NonSaveableConfigException.java rename to src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java index df33bff..eab470f 100644 --- a/src/com/redstoner/exceptions/NonSaveableConfigException.java +++ b/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java @@ -1,4 +1,4 @@ -package com.redstoner.exceptions; +package main.java.com.redstoner.exceptions; public class NonSaveableConfigException extends Exception { private static final long serialVersionUID = -7271481973389455510L; diff --git a/src/com/redstoner/faucet/Faucet.java b/src/main/java/com/redstoner/faucet/Faucet.java similarity index 85% rename from src/com/redstoner/faucet/Faucet.java rename to src/main/java/com/redstoner/faucet/Faucet.java index 1ca37ef..c1de4aa 100644 --- a/src/com/redstoner/faucet/Faucet.java +++ b/src/main/java/com/redstoner/faucet/Faucet.java @@ -1,13 +1,13 @@ -package com.redstoner.faucet; +package main.java.com.redstoner.faucet; import java.util.HashMap; +import main.java.com.redstoner.annotations.Version; import org.bukkit.plugin.java.JavaPlugin; import com.nemez.cmdmgr.Command; -import com.redstoner.annotations.Version; -import com.redstoner.misc.mysql.MysqlHandler; -import com.redstoner.modules.Module; +import main.java.com.redstoner.misc.mysql.MysqlHandler; +import main.java.com.redstoner.modules.Module; import net.nemez.chatapi.ChatAPI; diff --git a/src/com/redstoner/misc/BroadcastFilter.java b/src/main/java/com/redstoner/misc/BroadcastFilter.java similarity index 89% rename from src/com/redstoner/misc/BroadcastFilter.java rename to src/main/java/com/redstoner/misc/BroadcastFilter.java index b5b887c..124077e 100644 --- a/src/com/redstoner/misc/BroadcastFilter.java +++ b/src/main/java/com/redstoner/misc/BroadcastFilter.java @@ -1,4 +1,4 @@ -package com.redstoner.misc; +package main.java.com.redstoner.misc; import org.bukkit.command.CommandSender; diff --git a/src/com/redstoner/misc/CommandHolder.java b/src/main/java/com/redstoner/misc/CommandHolder.java similarity index 68% rename from src/com/redstoner/misc/CommandHolder.java rename to src/main/java/com/redstoner/misc/CommandHolder.java index 4b3511f..95ba814 100644 --- a/src/com/redstoner/misc/CommandHolder.java +++ b/src/main/java/com/redstoner/misc/CommandHolder.java @@ -1,4 +1,4 @@ -package com.redstoner.misc; +package main.java.com.redstoner.misc; /** @author Pepich */ public enum CommandHolder diff --git a/src/com/redstoner/misc/JsonManager.java b/src/main/java/com/redstoner/misc/JsonManager.java similarity index 99% rename from src/com/redstoner/misc/JsonManager.java rename to src/main/java/com/redstoner/misc/JsonManager.java index 7f5c703..e350505 100644 --- a/src/com/redstoner/misc/JsonManager.java +++ b/src/main/java/com/redstoner/misc/JsonManager.java @@ -1,4 +1,4 @@ -package com.redstoner.misc; +package main.java.com.redstoner.misc; import java.io.File; import java.io.FileReader; diff --git a/src/com/redstoner/misc/Utils.java b/src/main/java/com/redstoner/misc/Utils.java similarity index 99% rename from src/com/redstoner/misc/Utils.java rename to src/main/java/com/redstoner/misc/Utils.java index 352dbce..496eea5 100644 --- a/src/com/redstoner/misc/Utils.java +++ b/src/main/java/com/redstoner/misc/Utils.java @@ -1,4 +1,4 @@ -package com.redstoner.misc; +package main.java.com.redstoner.misc; import java.text.SimpleDateFormat; import java.util.Arrays; diff --git a/src/com/redstoner/misc/mysql/Config.java b/src/main/java/com/redstoner/misc/mysql/Config.java similarity index 97% rename from src/com/redstoner/misc/mysql/Config.java rename to src/main/java/com/redstoner/misc/mysql/Config.java index b51446b..c4a28fa 100644 --- a/src/com/redstoner/misc/mysql/Config.java +++ b/src/main/java/com/redstoner/misc/mysql/Config.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql; +package main.java.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 org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import com.redstoner.exceptions.NonSaveableConfigException; -import com.redstoner.faucet.Faucet; +import main.java.com.redstoner.exceptions.NonSaveableConfigException; public class Config { diff --git a/src/com/redstoner/misc/mysql/JSONManager.java b/src/main/java/com/redstoner/misc/mysql/JSONManager.java similarity index 96% rename from src/com/redstoner/misc/mysql/JSONManager.java rename to src/main/java/com/redstoner/misc/mysql/JSONManager.java index 68b4592..1e95bed 100644 --- a/src/com/redstoner/misc/mysql/JSONManager.java +++ b/src/main/java/com/redstoner/misc/mysql/JSONManager.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql; +package main.java.com.redstoner.misc.mysql; import java.io.File; import java.io.FileNotFoundException; @@ -13,13 +13,12 @@ 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; -import com.redstoner.faucet.Faucet; - public class JSONManager { public static Map getConfiguration(String fileName) diff --git a/src/com/redstoner/misc/mysql/MysqlHandler.java b/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java similarity index 95% rename from src/com/redstoner/misc/mysql/MysqlHandler.java rename to src/main/java/com/redstoner/misc/mysql/MysqlHandler.java index 9a34182..8a19e51 100644 --- a/src/com/redstoner/misc/mysql/MysqlHandler.java +++ b/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql; +package main.java.com.redstoner.misc.mysql; import java.io.File; import java.io.IOException; @@ -13,12 +13,12 @@ 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 com.redstoner.faucet.Faucet; -import com.redstoner.misc.mysql.elements.MysqlDatabase; +import main.java.com.redstoner.misc.mysql.elements.MysqlDatabase; public class MysqlHandler { diff --git a/src/com/redstoner/misc/mysql/MysqlQueryHandler.java b/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java similarity index 94% rename from src/com/redstoner/misc/mysql/MysqlQueryHandler.java rename to src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java index f89a08a..2fed425 100644 --- a/src/com/redstoner/misc/mysql/MysqlQueryHandler.java +++ b/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql; +package main.java.com.redstoner.misc.mysql; import java.sql.CallableStatement; import java.sql.Connection; diff --git a/src/com/redstoner/misc/mysql/elements/ConstraintOperator.java b/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java similarity index 89% rename from src/com/redstoner/misc/mysql/elements/ConstraintOperator.java rename to src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java index 45cb33c..e9b1c13 100644 --- a/src/com/redstoner/misc/mysql/elements/ConstraintOperator.java +++ b/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.elements; +package main.java.com.redstoner.misc.mysql.elements; public enum ConstraintOperator { LESS_THAN, GREATER_THAN, EQUAL, NOT_EQUAL, LESS_THAN_OR_EQUAL, GREATER_THAN_OR_EQUAL; diff --git a/src/com/redstoner/misc/mysql/elements/MysqlConstraint.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java similarity index 89% rename from src/com/redstoner/misc/mysql/elements/MysqlConstraint.java rename to src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java index d651344..0a5ea92 100644 --- a/src/com/redstoner/misc/mysql/elements/MysqlConstraint.java +++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.elements; +package main.java.com.redstoner.misc.mysql.elements; public class MysqlConstraint { private String fieldName, value; diff --git a/src/com/redstoner/misc/mysql/elements/MysqlDatabase.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java similarity index 94% rename from src/com/redstoner/misc/mysql/elements/MysqlDatabase.java rename to src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java index 91c0fe4..d9a1225 100644 --- a/src/com/redstoner/misc/mysql/elements/MysqlDatabase.java +++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.elements; +package main.java.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 com.redstoner.misc.mysql.MysqlQueryHandler; +import main.java.com.redstoner.misc.mysql.MysqlQueryHandler; public class MysqlDatabase { private Connection connection; diff --git a/src/com/redstoner/misc/mysql/elements/MysqlField.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java similarity index 83% rename from src/com/redstoner/misc/mysql/elements/MysqlField.java rename to src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java index 61cba2e..03311bb 100644 --- a/src/com/redstoner/misc/mysql/elements/MysqlField.java +++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java @@ -1,6 +1,6 @@ -package com.redstoner.misc.mysql.elements; +package main.java.com.redstoner.misc.mysql.elements; -import com.redstoner.misc.mysql.types.MysqlType; +import main.java.com.redstoner.misc.mysql.types.MysqlType; public class MysqlField { private String name; diff --git a/src/com/redstoner/misc/mysql/elements/MysqlResult.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java similarity index 85% rename from src/com/redstoner/misc/mysql/elements/MysqlResult.java rename to src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java index 6db0769..494c54b 100644 --- a/src/com/redstoner/misc/mysql/elements/MysqlResult.java +++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.elements; +package main.java.com.redstoner.misc.mysql.elements; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/com/redstoner/misc/mysql/elements/MysqlTable.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java similarity index 96% rename from src/com/redstoner/misc/mysql/elements/MysqlTable.java rename to src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java index 6656fcd..cb7517f 100644 --- a/src/com/redstoner/misc/mysql/elements/MysqlTable.java +++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.elements; +package main.java.com.redstoner.misc.mysql.elements; import java.sql.DatabaseMetaData; import java.sql.ResultSet; @@ -6,7 +6,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.redstoner.misc.mysql.MysqlQueryHandler; +import main.java.com.redstoner.misc.mysql.MysqlQueryHandler; public class MysqlTable { diff --git a/src/com/redstoner/misc/mysql/types/MysqlType.java b/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java similarity index 52% rename from src/com/redstoner/misc/mysql/types/MysqlType.java rename to src/main/java/com/redstoner/misc/mysql/types/MysqlType.java index 86413f9..52583f0 100644 --- a/src/com/redstoner/misc/mysql/types/MysqlType.java +++ b/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java @@ -1,29 +1,29 @@ -package com.redstoner.misc.mysql.types; +package main.java.com.redstoner.misc.mysql.types; -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.BigInt; -import com.redstoner.misc.mysql.types.number.Decimal; -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.number.TinyInt; -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.Text; -import com.redstoner.misc.mysql.types.text.TinyText; -import com.redstoner.misc.mysql.types.text.VarChar; +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; public abstract class MysqlType { diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/Date.java b/src/main/java/com/redstoner/misc/mysql/types/date/Date.java new file mode 100644 index 0000000..03361d6 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/date/Date.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.date; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Date extends MysqlType { + @Override + public String getName() { + return "DATE"; + } +} diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java b/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java new file mode 100644 index 0000000..c8eeae8 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.date; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class DateTime extends MysqlType { + @Override + public String getName() { + return "DATETIME"; + } +} diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/Time.java b/src/main/java/com/redstoner/misc/mysql/types/date/Time.java new file mode 100644 index 0000000..49393c8 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/date/Time.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.date; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Time extends MysqlType { + @Override + public String getName() { + return "TIME"; + } +} diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java b/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java new file mode 100644 index 0000000..d703e48 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.date; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class TimeStamp extends MysqlType { + @Override + public String getName() { + return "TIMESTAMP"; + } +} diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/Year.java b/src/main/java/com/redstoner/misc/mysql/types/date/Year.java new file mode 100644 index 0000000..a64df68 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/date/Year.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.date; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Year extends MysqlType { + @Override + public String getName() { + return "YEAR"; + } +} diff --git a/src/com/redstoner/misc/mysql/types/number/BigInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java similarity index 74% rename from src/com/redstoner/misc/mysql/types/number/BigInt.java rename to src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java index 71086fd..32dcca0 100644 --- a/src/com/redstoner/misc/mysql/types/number/BigInt.java +++ b/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.number; +package main.java.com.redstoner.misc.mysql.types.number; public class BigInt extends Int { public BigInt(int maxSize) { diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java b/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java new file mode 100644 index 0000000..5a5f3de --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java @@ -0,0 +1,11 @@ +package main.java.com.redstoner.misc.mysql.types.number; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Decimal extends MysqlType +{ + @Override + public String getName() { + return "DECIMAL"; + } +} diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/Double.java b/src/main/java/com/redstoner/misc/mysql/types/number/Double.java new file mode 100644 index 0000000..74ba83d --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/number/Double.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.number; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Double extends MysqlType { + @Override + public String getName() { + return "DOUBLE"; + } +} diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/Float.java b/src/main/java/com/redstoner/misc/mysql/types/number/Float.java new file mode 100644 index 0000000..76acb40 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/number/Float.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.number; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Float extends MysqlType { + @Override + public String getName() { + return "FLOAT"; + } +} diff --git a/src/com/redstoner/misc/mysql/types/number/Int.java b/src/main/java/com/redstoner/misc/mysql/types/number/Int.java similarity index 62% rename from src/com/redstoner/misc/mysql/types/number/Int.java rename to src/main/java/com/redstoner/misc/mysql/types/number/Int.java index 4256f7b..386d701 100644 --- a/src/com/redstoner/misc/mysql/types/number/Int.java +++ b/src/main/java/com/redstoner/misc/mysql/types/number/Int.java @@ -1,6 +1,6 @@ -package com.redstoner.misc.mysql.types.number; +package main.java.com.redstoner.misc.mysql.types.number; -import com.redstoner.misc.mysql.types.MysqlType; +import main.java.com.redstoner.misc.mysql.types.MysqlType; public class Int extends MysqlType { private int maxSize; diff --git a/src/com/redstoner/misc/mysql/types/number/MediumInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java similarity index 75% rename from src/com/redstoner/misc/mysql/types/number/MediumInt.java rename to src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java index fbcb0f4..a771733 100644 --- a/src/com/redstoner/misc/mysql/types/number/MediumInt.java +++ b/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.number; +package main.java.com.redstoner.misc.mysql.types.number; public class MediumInt extends Int { public MediumInt(int maxSize) { diff --git a/src/com/redstoner/misc/mysql/types/number/SmallInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java similarity index 74% rename from src/com/redstoner/misc/mysql/types/number/SmallInt.java rename to src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java index 01bf97d..e2c4e59 100644 --- a/src/com/redstoner/misc/mysql/types/number/SmallInt.java +++ b/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.number; +package main.java.com.redstoner.misc.mysql.types.number; public class SmallInt extends Int { public SmallInt(int maxSize) { diff --git a/src/com/redstoner/misc/mysql/types/number/TinyInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java similarity index 74% rename from src/com/redstoner/misc/mysql/types/number/TinyInt.java rename to src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java index 63ad700..e54b149 100644 --- a/src/com/redstoner/misc/mysql/types/number/TinyInt.java +++ b/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.number; +package main.java.com.redstoner.misc.mysql.types.number; public class TinyInt extends Int { public TinyInt(int maxSize) { diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java b/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java new file mode 100644 index 0000000..e539373 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java @@ -0,0 +1,10 @@ +package main.java.com.redstoner.misc.mysql.types.text; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Blob extends MysqlType { + @Override + public String getName() { + return "BLOB"; + } +} diff --git a/src/com/redstoner/misc/mysql/types/text/Char.java b/src/main/java/com/redstoner/misc/mysql/types/text/Char.java similarity index 61% rename from src/com/redstoner/misc/mysql/types/text/Char.java rename to src/main/java/com/redstoner/misc/mysql/types/text/Char.java index ece068c..fcb83a2 100644 --- a/src/com/redstoner/misc/mysql/types/text/Char.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/Char.java @@ -1,6 +1,6 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; -import com.redstoner.misc.mysql.types.MysqlType; +import main.java.com.redstoner.misc.mysql.types.MysqlType; public class Char extends MysqlType { private int size; diff --git a/src/com/redstoner/misc/mysql/types/text/Enum.java b/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java similarity index 78% rename from src/com/redstoner/misc/mysql/types/text/Enum.java rename to src/main/java/com/redstoner/misc/mysql/types/text/Enum.java index e68476d..2fae275 100644 --- a/src/com/redstoner/misc/mysql/types/text/Enum.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java @@ -1,6 +1,6 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; -import com.redstoner.misc.mysql.types.MysqlType; +import main.java.com.redstoner.misc.mysql.types.MysqlType; public class Enum extends MysqlType { private String[] possibleValues; diff --git a/src/com/redstoner/misc/mysql/types/text/LongBlob.java b/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java similarity index 67% rename from src/com/redstoner/misc/mysql/types/text/LongBlob.java rename to src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java index 802caed..1a2c575 100644 --- a/src/com/redstoner/misc/mysql/types/text/LongBlob.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; public class LongBlob extends Blob { @Override diff --git a/src/com/redstoner/misc/mysql/types/text/LongText.java b/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java similarity index 67% rename from src/com/redstoner/misc/mysql/types/text/LongText.java rename to src/main/java/com/redstoner/misc/mysql/types/text/LongText.java index 5149ed2..95788ef 100644 --- a/src/com/redstoner/misc/mysql/types/text/LongText.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; public class LongText extends Text { @Override diff --git a/src/com/redstoner/misc/mysql/types/text/MediumBlob.java b/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java similarity index 68% rename from src/com/redstoner/misc/mysql/types/text/MediumBlob.java rename to src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java index 6ae25a7..dba57e2 100644 --- a/src/com/redstoner/misc/mysql/types/text/MediumBlob.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; public class MediumBlob extends Blob { @Override diff --git a/src/com/redstoner/misc/mysql/types/text/MediumText.java b/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java similarity index 68% rename from src/com/redstoner/misc/mysql/types/text/MediumText.java rename to src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java index a0f6525..baae22f 100644 --- a/src/com/redstoner/misc/mysql/types/text/MediumText.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; public class MediumText extends Text { @Override diff --git a/src/com/redstoner/misc/mysql/types/text/Set.java b/src/main/java/com/redstoner/misc/mysql/types/text/Set.java similarity index 78% rename from src/com/redstoner/misc/mysql/types/text/Set.java rename to src/main/java/com/redstoner/misc/mysql/types/text/Set.java index 4e12ce6..c3ff287 100644 --- a/src/com/redstoner/misc/mysql/types/text/Set.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/Set.java @@ -1,6 +1,6 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; -import com.redstoner.misc.mysql.types.MysqlType; +import main.java.com.redstoner.misc.mysql.types.MysqlType; public class Set extends MysqlType { private String[] possibleValues; diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/Text.java b/src/main/java/com/redstoner/misc/mysql/types/text/Text.java new file mode 100644 index 0000000..adcc951 --- /dev/null +++ b/src/main/java/com/redstoner/misc/mysql/types/text/Text.java @@ -0,0 +1,11 @@ +package main.java.com.redstoner.misc.mysql.types.text; + +import main.java.com.redstoner.misc.mysql.types.MysqlType; + +public class Text extends MysqlType +{ + @Override + public String getName() { + return "TEXT"; + } +} diff --git a/src/com/redstoner/misc/mysql/types/text/TinyText.java b/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java similarity index 67% rename from src/com/redstoner/misc/mysql/types/text/TinyText.java rename to src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java index e78160c..4f11d81 100644 --- a/src/com/redstoner/misc/mysql/types/text/TinyText.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java @@ -1,4 +1,4 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; public class TinyText extends Text { @Override diff --git a/src/com/redstoner/misc/mysql/types/text/VarChar.java b/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java similarity index 64% rename from src/com/redstoner/misc/mysql/types/text/VarChar.java rename to src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java index cb28ad1..1daf42e 100644 --- a/src/com/redstoner/misc/mysql/types/text/VarChar.java +++ b/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java @@ -1,6 +1,6 @@ -package com.redstoner.misc.mysql.types.text; +package main.java.com.redstoner.misc.mysql.types.text; -import com.redstoner.misc.mysql.types.MysqlType; +import main.java.com.redstoner.misc.mysql.types.MysqlType; public class VarChar extends MysqlType { private int maxSize; diff --git a/src/com/redstoner/modules/Module.java b/src/main/java/com/redstoner/modules/Module.java similarity index 93% rename from src/com/redstoner/modules/Module.java rename to src/main/java/com/redstoner/modules/Module.java index 2a0dcb0..39bdc61 100644 --- a/src/com/redstoner/modules/Module.java +++ b/src/main/java/com/redstoner/modules/Module.java @@ -1,7 +1,7 @@ -package com.redstoner.modules; +package main.java.com.redstoner.modules; -import com.redstoner.annotations.Version; -import com.redstoner.faucet.Faucet; +import main.java.com.redstoner.annotations.Version; +import main.java.com.redstoner.faucet.Faucet; /** Interface for the Module class. Modules must always have an empty constructor to be invoked by the ModuleLoader. * diff --git a/src/com/redstoner/modules/ModuleLogger.java b/src/main/java/com/redstoner/modules/ModuleLogger.java similarity index 97% rename from src/com/redstoner/modules/ModuleLogger.java rename to src/main/java/com/redstoner/modules/ModuleLogger.java index c32f441..0a627b7 100644 --- a/src/com/redstoner/modules/ModuleLogger.java +++ b/src/main/java/com/redstoner/modules/ModuleLogger.java @@ -1,4 +1,4 @@ -package com.redstoner.modules; +package main.java.com.redstoner.modules; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender;