diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000..f8ed9be --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + com.lenis0012.bukkit + marriage2 + Marriage + 2.0 + http://dev.bukkit.org/server-mods/marriage-reloaded/ + + clean install + + + true + src/main/resources/ + + * + + + + ${project.name} + + + maven-compiler-plugin + 2.4 + + 1.6 + 1.6 + true + true + + + + maven-shade-plugin + 2.2 + + + package + + shade + + + + + com.google.guava:guava + + + + + + + + + + + md5-repo + http://repo.md-5.net/content/groups/public/ + + + + + org.bukkit + bukkit + 1.7.10-R0.1-SNAPSHOT + provided + + + junit + junit + 3.8.1 + test + + + + UTF-8 + + + diff --git a/pom.xml b/pom.xml index 3b88855..6623cc8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.lenis0012.mr - Marriage - 1.2.6 + com.lenis0012.bukkit + marriage2 + 2.0 jar - Marriage http://dev.bukkit.org/server-mods/marriage-reloaded/ @@ -15,37 +14,19 @@ - - - vault-repo - http://ci.herocraftonline.com/plugin/repository/everything/ - - bukkit-repo - http://repo.bukkit.org/content/groups/public + md5-repo + http://repo.md-5.net/content/groups/public/ org.bukkit - craftbukkit + bukkit 1.7.10-R0.1-SNAPSHOT - - - net.milkbowl.vault - Vault - 1.4.1 provided - true - - - com.dthielke - Herochat - 5.6.7-SNAPSHOT - system - ${project.basedir}/lib/HeroChat.jar com.google.guava @@ -74,7 +55,7 @@ clean install - Marriage + ${project.name} @@ -89,6 +70,7 @@ true + org.apache.maven.plugins maven-shade-plugin diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java b/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java index 5c69f65..9f07d01 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java @@ -38,7 +38,7 @@ public interface Marriage { ListQuery getMarriageList(int scale, int page); /** - * Marry 2 players to eachother. + * Marry 2 players to each other. * * @param player1 Player 1 * @param player2 Player 2 diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java b/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java index 9ec5625..798099a 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java @@ -27,12 +27,12 @@ public enum Message { private final String defaultMessage; private String message; - private Message(String def) { + Message(String def) { this.defaultMessage = def; } private void reload(BConfig config) { - this.message = config.getOrSet(toString().toLowerCase(), defaultMessage); + this.message = config.getOrSet(name().toLowerCase(), defaultMessage); } @Override @@ -42,7 +42,7 @@ public enum Message { public static void reloadAll(Marriage marriage) { BConfig config = marriage.getBukkitConfig("messages.yml"); - for(Message message : Message.values()) { + for(Message message : values()) { message.reload(config); } diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java b/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java index 7d0ab0b..c5205eb 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java @@ -2,7 +2,7 @@ package com.lenis0012.bukkit.marriage2.config; import java.util.List; -import net.minecraft.util.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java index 84032be..e99565f 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java @@ -6,9 +6,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import net.minecraft.util.com.google.common.reflect.ClassPath; -import net.minecraft.util.com.google.common.reflect.ClassPath.ClassInfo; - +import com.google.common.reflect.ClassPath; import org.bukkit.Bukkit; import org.bukkit.event.Listener; @@ -48,7 +46,7 @@ public abstract class MarriageBase implements Marriage { @Override public BConfig getBukkitConfig(String fileName) { - File file = new File(fileName); + File file = new File(plugin.getDataFolder(), fileName); return new BConfig(this, file); } @@ -69,10 +67,10 @@ public abstract class MarriageBase implements Marriage { @SuppressWarnings("unchecked") protected List> findClasses(String pkg, Class type, Object... params) { List> list = Lists.newArrayList(); - for(ClassInfo info : classPath.getTopLevelClassesRecursive(pkg)) { + for(ClassPath.ClassInfo info : classPath.getTopLevelClassesRecursive(pkg)) { try { Class clazz = Class.forName(info.getName()); - if(type.isAssignableFrom(clazz)) { + if(type.isAssignableFrom(clazz) && !type.equals(clazz)) { list.add((Class) clazz); } } catch(Exception e) { diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCommandExecutor.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCommandExecutor.java index 175e419..c7d0df9 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCommandExecutor.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCommandExecutor.java @@ -4,8 +4,7 @@ import java.util.Collection; import java.util.Map; import java.util.logging.Level; -import net.minecraft.util.com.google.common.collect.Maps; - +import com.google.common.collect.Maps; import org.bukkit.ChatColor; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java index cf25860..3c755bc 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java @@ -26,7 +26,8 @@ public class MarriageCore extends MarriageBase { @Register(name = "config", type = Register.Type.ENABLE, priority = 0) public void loadConfig() { - plugin.saveDefaultConfig(); +// plugin.saveDefaultConfig(); + enable(); Settings.reloadAll(this); Message.reloadAll(this); } diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriagePlugin.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriagePlugin.java index d5ad201..00568c5 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriagePlugin.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriagePlugin.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.List; import java.util.logging.Level; +import com.google.common.collect.Lists; import org.bukkit.plugin.java.JavaPlugin; import com.lenis0012.bukkit.marriage2.Marriage; @@ -24,7 +25,9 @@ public class MarriagePlugin extends JavaPlugin { core = new MarriageCore(this); //Scan methods - Arrays.fill(methods, new ArrayList()); + for(int i = 0; i < methods.length; i++) { + methods[i] = Lists.newArrayList(); + } scanMethods(core.getClass()); } @@ -61,12 +64,12 @@ public class MarriagePlugin extends JavaPlugin { } private void executeMethods(Register.Type type) { - List list = new ArrayList(methods[type.ordinal()]); + List list = Lists.newArrayList(methods[type.ordinal()]); while(!list.isEmpty()) { Method method = null; int lowestPriority = Integer.MAX_VALUE; for(Method m : list) { - Register register = method.getAnnotation(Register.class); + Register register = m.getAnnotation(Register.class); if(register.priority() < lowestPriority) { method = m; lowestPriority = register.priority(); diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/DataManager.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/DataManager.java index 2520b63..8ee47fb 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/DataManager.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/DataManager.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.UUID; import java.util.logging.Level; +import com.google.common.collect.Lists; import org.bukkit.configuration.file.FileConfiguration; import com.lenis0012.bukkit.marriage2.MData; @@ -48,13 +49,10 @@ public class DataManager { try { Statement statement = connection.createStatement(); statement.executeUpdate(String.format("CREATE TABLE IF NOT EXISTS %splayers (" - + "id NOT NULL UNIQUE AUTO_INCREMENT," + "unique_user_id VARCHAR(128) NOT NULL UNIQUE," + "gender VARCHAR(32)," - + "lastlogin BIGINT," - + "PRIMARY KEY (id);", prefix)); + + "lastlogin BIGINT);", prefix)); statement.executeUpdate(String.format("CREATE TABLE IF NOT EXISTS %sdata (" - + "id NOT NULL UNIQUE AUTO_INCREMENT," + "player1 VARCHAR(128) NOT NULL," + "player2 VARCHAR(128) NOT NULL," + "home_world VARCHAR(128) NOT NULL," @@ -63,8 +61,7 @@ public class DataManager { + "home_z DOUBLE," + "home_yaw FLOAT," + "home_pitch FLOAT," - + "pvp_enabled BIT," - + "PRIMARY KEY (id);", prefix)); + + "pvp_enabled BIT);", prefix)); } catch (SQLException e) { core.getLogger().log(Level.WARNING, "Failed to load player data", e); } finally { @@ -111,7 +108,6 @@ public class DataManager { ResultSet result = ps.executeQuery(); if(result.next()) { // Already in database (update) - if(!ps.isClosed()) ps.close(); ps = connection.prepareStatement(String.format( "UPDATE %splayers SET gender=?,lastlogin=? WHERE unique_user_id=?;", prefix)); ps.setString(1, player.getGender().toString()); @@ -120,7 +116,6 @@ public class DataManager { ps.executeUpdate(); } else { // Not in database yet - if(!ps.isClosed()) ps.close(); ps = connection.prepareStatement(String.format( "INSERT INTO %splayers (unique_user_id,gender,lastlogin) VALUES(?,?,?);", prefix)); ps.setString(1, player.getUniqueId().toString()); @@ -134,16 +129,14 @@ public class DataManager { MarriageData mdata = (MarriageData) player.getMarriage(); if(mdata.getId() >= 0) { // Update existing entry - if(!ps.isClosed()) ps.close(); ps = connection.prepareStatement(String.format( "UPDATE %sdata SET player1=?,player2=?,home_word=?,home_x=?,home_y=?,home_z=?,home_yaw=?,home_pitch=?,pvp_enabled=? WHERE id=?;", prefix)); mdata.save(ps); ps.setInt(10, mdata.getId()); ps.executeUpdate(); } else { - if(!ps.isClosed()) ps.close(); ps = connection.prepareStatement(String.format( - "INSERT INTO %splayers (player1,player2,home_world,home_x,home_y,home_z,home_yaw,home_pitch,pvp_enabled) VALUES(?,?,?,?,?,?,?,?,?);", prefix)); + "INSERT INTO %sdata (player1,player2,home_world,home_x,home_y,home_z,home_yaw,home_pitch,pvp_enabled) VALUES(?,?,?,?,?,?,?,?,?);", prefix)); mdata.save(ps); ps.executeUpdate(); } @@ -178,16 +171,18 @@ public class DataManager { Connection connection = newConnection(); try { // Count rows to get amount of pages - PreparedStatement ps = connection.prepareStatement("SELECT COUNT(*) FROM " + prefix + "data;"); + PreparedStatement ps = connection.prepareStatement("SELECT COUNT(*) AS COUNT FROM " + prefix + "data;"); ResultSet result = ps.executeQuery(); + result.next(); int pages = (int) Math.ceil(result.getInt("COUNT") / (double) scale); // Fetch te right page ps = connection.prepareStatement(String.format( - "SELECT * FROM %sdata ORDER BY id DESC LIMIT %s OFFSET %s;", prefix, scale, scale * page)); + "SELECT * FROM %sdata LIMIT %s OFFSET %s;", prefix, scale, scale * page)); + //"SELECT * FROM %sdata ORDER BY id DESC LIMIT %s OFFSET %s;", prefix, scale, scale * page)); result = ps.executeQuery(); - List list = new ArrayList(); + List list = Lists.newArrayList(); while(result.next()) { list.add(new MarriageData(result)); } diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/MarriagePlayer.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/MarriagePlayer.java index cec033e..0747dde 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/MarriagePlayer.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/data/MarriagePlayer.java @@ -6,7 +6,7 @@ import java.sql.SQLException; import java.util.List; import java.util.UUID; -import net.minecraft.util.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.lenis0012.bukkit.marriage2.Gender; import com.lenis0012.bukkit.marriage2.MData; diff --git a/target/Marriage.jar b/target/Marriage.jar new file mode 100644 index 0000000..829dac8 Binary files /dev/null and b/target/Marriage.jar differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/Gender$1.class b/target/classes/com/lenis0012/bukkit/marriage2/Gender$1.class new file mode 100644 index 0000000..9838669 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/Gender$1.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/Gender.class b/target/classes/com/lenis0012/bukkit/marriage2/Gender.class new file mode 100644 index 0000000..fa7c8da Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/Gender.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/MData.class b/target/classes/com/lenis0012/bukkit/marriage2/MData.class new file mode 100644 index 0000000..d3a3efd Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/MData.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/MPlayer.class b/target/classes/com/lenis0012/bukkit/marriage2/MPlayer.class new file mode 100644 index 0000000..ab5c063 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/MPlayer.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/Marriage.class b/target/classes/com/lenis0012/bukkit/marriage2/Marriage.class new file mode 100644 index 0000000..1ed0bf1 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/Marriage.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/Command.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/Command.class new file mode 100644 index 0000000..f6998fb Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/Command.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandDivorce.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandDivorce.class new file mode 100644 index 0000000..e5ee6d3 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandDivorce.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandGender.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandGender.class new file mode 100644 index 0000000..3848eae Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandGender.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandGift.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandGift.class new file mode 100644 index 0000000..e2a7c61 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandGift.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandHelp.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandHelp.class new file mode 100644 index 0000000..a065b1b Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandHelp.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandHome.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandHome.class new file mode 100644 index 0000000..56a3a37 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandHome.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandList$1.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandList$1.class new file mode 100644 index 0000000..b1fe6d2 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandList$1.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandList.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandList.class new file mode 100644 index 0000000..9aa0aa2 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandList.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandMarry.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandMarry.class new file mode 100644 index 0000000..555ac57 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandMarry.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandSethome.class b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandSethome.class new file mode 100644 index 0000000..7706cbb Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/commands/CommandSethome.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/config/Message.class b/target/classes/com/lenis0012/bukkit/marriage2/config/Message.class new file mode 100644 index 0000000..33246bc Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/config/Message.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/config/Settings.class b/target/classes/com/lenis0012/bukkit/marriage2/config/Settings.class new file mode 100644 index 0000000..f215e4c Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/config/Settings.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageBase.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageBase.class new file mode 100644 index 0000000..bba3cff Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageBase.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCommandExecutor.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCommandExecutor.class new file mode 100644 index 0000000..d317ac1 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCommandExecutor.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCore$1.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCore$1.class new file mode 100644 index 0000000..df67f2b Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCore$1.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCore.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCore.class new file mode 100644 index 0000000..6e48d2c Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriageCore.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriagePlugin.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriagePlugin.class new file mode 100644 index 0000000..4e33996 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/MarriagePlugin.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/Register$Type.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/Register$Type.class new file mode 100644 index 0000000..4adc9b7 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/Register$Type.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/Register.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/Register.class new file mode 100644 index 0000000..cf48d60 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/Register.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/data/DataManager.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/data/DataManager.class new file mode 100644 index 0000000..2103b06 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/data/DataManager.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/data/MarriageData.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/data/MarriageData.class new file mode 100644 index 0000000..765b519 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/data/MarriageData.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/internal/data/MarriagePlayer.class b/target/classes/com/lenis0012/bukkit/marriage2/internal/data/MarriagePlayer.class new file mode 100644 index 0000000..3cf5dfd Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/internal/data/MarriagePlayer.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/listeners/DatabaseListener.class b/target/classes/com/lenis0012/bukkit/marriage2/listeners/DatabaseListener.class new file mode 100644 index 0000000..c1b0c0c Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/listeners/DatabaseListener.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/misc/BConfig.class b/target/classes/com/lenis0012/bukkit/marriage2/misc/BConfig.class new file mode 100644 index 0000000..91c9b0a8 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/misc/BConfig.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/misc/ListQuery$1.class b/target/classes/com/lenis0012/bukkit/marriage2/misc/ListQuery$1.class new file mode 100644 index 0000000..d40f3b5 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/misc/ListQuery$1.class differ diff --git a/target/classes/com/lenis0012/bukkit/marriage2/misc/ListQuery.class b/target/classes/com/lenis0012/bukkit/marriage2/misc/ListQuery.class new file mode 100644 index 0000000..de5d055 Binary files /dev/null and b/target/classes/com/lenis0012/bukkit/marriage2/misc/ListQuery.class differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml new file mode 100644 index 0000000..f467ea4 --- /dev/null +++ b/target/classes/plugin.yml @@ -0,0 +1,60 @@ +name: Marriage +version: 2.0 +main: com.lenis0012.bukkit.marriage2.internal.MarriagePlugin +author: lenis0012 +description: A plugin wich provides the function to start a relationship in minecraft. +dev-url: http://dev.bukkit.org/bukkit-mods/marriage-reloaded/ +softdepend: [Vault] +commands: + marry: + description: Marriage main command. + usage: /marry +permissions: + marry.*: + description: Allows all Marriage Commands + default: false + children: + marry.admin: + description: Allows all admin commands + default: false + children: + marry.reload: + description: Allows to reload the config files + defalt: op + marry.priest: + description: Allows player to marry 2 orther players. + default: false + marry.chatspy: + description: Allows player to view all mchat. + default: op + marry.default: + description: Allows default player commands + default: true + children: + marry.marry: + description: Allows to marry with players + default: true + marry.chat: + description: Allows to chat with your partner + default: true + marry.tp: + description: Allows to tp to your partner + default: true + marry.home: + description: Allows to tp to your home if set + default: true + marry.sethome: + description: Allwos to set your Marriage home + default: true + marry.gift: + description: Allows to gift itesm to your partner + default: true + marry.chat: + description: Allows to chat with your partner + default: true + marry.child: + description: Allows everything with children in marriage. + default: true + marry.seen: + description: Allows to see your last login from your partner + default: true \ No newline at end of file diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..d3202db --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Tue May 26 23:56:34 CEST 2015 +version=2.0 +groupId=com.lenis0012.bukkit +artifactId=marriage2 diff --git a/target/original-Marriage.jar b/target/original-Marriage.jar new file mode 100644 index 0000000..9d04b68 Binary files /dev/null and b/target/original-Marriage.jar differ