REWORK

.idea/artifacts/Marriage_min.xml

@@ -0,0 +1,10 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="Marriage-min">
+    <output-path>$PROJECT_DIR$/out/artifacts/Marriage_min</output-path>
+    <root id="archive" name="Marriage-min.jar">
+      <element id="module-output" name="Mariage" />
+      <element id="file-copy" path="$PROJECT_DIR$/Mariage/src/config.yml" />
+      <element id="file-copy" path="$PROJECT_DIR$/Mariage/src/plugin.yml" />
+    </root>
+  </artifact>
+</component>

.idea/compiler.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="marriage" />
+        <module name="Marriage" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="marriage" target="1.8" />
+      <module name="Marriage" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+  </component>
+</project>

.idea/misc.xml

@@ -38,5 +38,17 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
+  <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
+    </list>
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Mariage/Mariage.iml" filepath="$PROJECT_DIR$/Mariage/Mariage.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Marriage.iml" filepath="$PROJECT_DIR$/Marriage.iml" />
     </modules>
   </component>
 </project>

Mariage/Mariage.iml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file:///production/Mariage" />
-    <output-test url="file:///test/Mariage" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/ressources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="ressources" level="project" />
-  </component>
-</module>

Mariage/src/net/DeltaWings/Minecraft/Marriage/Main.java

@@ -1,59 +0,0 @@
-package net.DeltaWings.Minecraft.Marriage;
-
-import org.bukkit.command.Command;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by Delta Wings on 19/12/2016 at.18:15
- */
-public class Main extends JavaPlugin implements Listener{
-
-    public void onEnable(){
-        getCommand("Marry").setExecutor(new Marry(this));
-        getCommand("Partner").setExecutor(new Partner(this));
-        getCommand("divorce").setExecutor(new Divorce(this));
-
-        //load the config
-        getConfig().options().copyDefaults(true);
-        saveConfig();
-        PluginManager pm = getServer().getPluginManager();
-        pm.registerEvents(new PlayerJoin(this), this);
-    }
-
-    public void onDisable() {
-
-    }
-
-    public Boolean hasPermission(Command command, String[] arguments, Player player) {
-    	Command cmd = command;
-    	String[] args = arguments;
-    	Player p = player;
-	    List<String> perms = new ArrayList<>();
-    	perms.add("deltawings.marriage.all");
-    	// divorce command
-    	if( cmd.getName().equalsIgnoreCase("divorce") ) perms.add("deltawings.marriage.divorce");
-	    // marry command
-    	if( cmd.getName().equalsIgnoreCase("marry") ) perms.add("deltawings.marriage.marry");
-	    //partner command
-	    if( cmd.getName().equalsIgnoreCase("partner") ) {
-		    perms.add("deltawings.marriage.partner.all");
-		    if ( args[0].equalsIgnoreCase("info") ) perms.add("deltawings.marriage.info");
-		    if ( args[0].equalsIgnoreCase("join") ) perms.add("deltawings.marriage.join");
-		    if ( args[0].equalsIgnoreCase("sethome") ) perms.add("deltawings.marriage.sethome");
-		    if ( args[0].equalsIgnoreCase("home") ) perms.add("deltawings.marriage.home");
-		    if ( args[0].equalsIgnoreCase("delhome") ) perms.add("deltawings.marriage.delhome");
-		    if ( args[0].equalsIgnoreCase("message") ) perms.add("deltawings.marriage.message");
-		    if ( args[0].equalsIgnoreCase("gift") ) perms.add("deltawings.marriage.gift");
-		    if ( args[0].equalsIgnoreCase("help") ) perms.add("deltawings.marriage.help");
-	    }
-	    for ( String permission : perms ) if ( p.hasPermission(permission) ) return true;
-    	return true;
-    }
-
-}

Mariage/src/net/DeltaWings/Minecraft/Marriage/Marriage.java

@@ -1,21 +0,0 @@
-package net.DeltaWings.Minecraft.Marriage;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-/**
- * Created by Floflo on 19/12/2016.
- */
-public class Marriage implements CommandExecutor {
-    public Marriage(Main main) {
-    }
-
-
-
-    @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
-
-        return false;
-    }
-}

Mariage/tests/eula.txt

@@ -1,3 +0,0 @@
-#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
-#Wed Dec 21 15:20:39 CET 2016
-eula=true

Marriage.iml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.10.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:17.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.10-SNAPSHOT" level="project" />
+  </component>
+</module>

pom.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>delta-wings</groupId>
+    <artifactId>marriage</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+
+    <name>Marriage</name>
+
+    <description>Advanced Marriage plugin</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <url>http://delta-wings.net/</url>
+
+    <build>
+        <defaultGoal>clean package</defaultGoal>
+        <plugins>
+            <plugin>
+                <version>3.1</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>spigotmc-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.10.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Divorce.java

@@ -1,5 +1,6 @@
-package net.DeltaWings.Minecraft.Marriage;
+package net.DeltaWings.Minecraft.Marriage.Commands;
 
+import net.DeltaWings.Minecraft.Marriage.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Marry.java

@@ -1,4 +1,4 @@
-package net.DeltaWings.Minecraft.Marriage;
+package net.DeltaWings.Minecraft.Marriage.Commands;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -17,7 +17,7 @@ public class Marry implements CommandExecutor {
     private Main pl;
     private FileConfiguration config;
 
-    Marry(Main main) {
+    public Marry(Main main) {
         this.pl = main;
         this.config = pl.getConfig();
     }

src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Partner.java

@@ -1,8 +1,8 @@
-package net.DeltaWings.Minecraft.Marriage;
+package net.DeltaWings.Minecraft.Marriage.Commands;
 
+import net.DeltaWings.Minecraft.Marriage.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -17,7 +17,7 @@ public class Partner implements CommandExecutor {
     private Main pl;
     private FileConfiguration config;
 
-    Partner(Main main) {
+    public Partner(Main main) {
         this.pl = main;
         this.config = pl.getConfig();
     }

src/main/java/net/DeltaWings/Minecraft/Marriage/Events/PlayerJoin.java

@@ -1,5 +1,6 @@
-package net.DeltaWings.Minecraft.Marriage;
+package net.DeltaWings.Minecraft.Marriage.Events;
 
+import net.DeltaWings.Minecraft.Marriage.Main;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -14,7 +15,7 @@ public class PlayerJoin implements Listener {
     private Main pl;
     private FileConfiguration config;
 
-    PlayerJoin(Main main) {
+    public PlayerJoin(Main main) {
         this.pl = main;
         this.config = pl.getConfig();
     }

src/main/java/net/DeltaWings/Minecraft/Marriage/Main.java

@@ -0,0 +1,57 @@
+package net.DeltaWings.Minecraft.Marriage;
+
+import net.DeltaWings.Minecraft.Marriage.Events.PlayerJoin;
+import org.bukkit.command.Command;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import net.DeltaWings.Minecraft.Marriage.Commands.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class Main extends JavaPlugin {
+
+	@Override
+	public void onEnable() {
+		// Plugin startup logic
+		getCommand("Marry").setExecutor(new Marry(this));
+		getCommand("Partner").setExecutor(new Partner(this));
+		getCommand("divorce").setExecutor(new Divorce(this));
+
+		//load the config
+		getConfig().options().copyDefaults(true);
+		saveConfig();
+		PluginManager pm = getServer().getPluginManager();
+		pm.registerEvents(new PlayerJoin(this), this);
+	}
+
+	@Override
+	public void onDisable() {
+		// Plugin shutdown logic
+	}
+
+	public Boolean hasPermission(Command command, String[] arguments, Player player) {
+		List<String> perms = new ArrayList<>();
+		perms.add("deltawings.marriage.all");
+		// divorce command
+		if( command.getName().equalsIgnoreCase("divorce") ) perms.add("deltawings.marriage.divorce");
+		// marry command
+		if( command.getName().equalsIgnoreCase("marry") ) perms.add("deltawings.marriage.marry");
+		//partner command
+		if( command.getName().equalsIgnoreCase("partner") ) {
+			perms.add("deltawings.marriage.partner.all");
+			if ( arguments[0].equalsIgnoreCase("info") ) perms.add("deltawings.marriage.info");
+			if ( arguments[0].equalsIgnoreCase("join") ) perms.add("deltawings.marriage.join");
+			if ( arguments[0].equalsIgnoreCase("sethome") ) perms.add("deltawings.marriage.sethome");
+			if ( arguments[0].equalsIgnoreCase("home") ) perms.add("deltawings.marriage.home");
+			if ( arguments[0].equalsIgnoreCase("delhome") ) perms.add("deltawings.marriage.delhome");
+			if ( arguments[0].equalsIgnoreCase("message") ) perms.add("deltawings.marriage.message");
+			if ( arguments[0].equalsIgnoreCase("gift") ) perms.add("deltawings.marriage.gift");
+			if ( arguments[0].equalsIgnoreCase("help") ) perms.add("deltawings.marriage.help");
+		}
+		for ( String permission : perms ) if ( player.hasPermission(permission) ) return true;
+		return true;
+	}
+}

src/main/resources/plugin.yml

@@ -1,7 +1,9 @@
 name: Marriage
-version: 0.1.0
+version: ${project.version}
-author: Delta Wings
+main: delta-wings.marriage.Marriage
-main: net.DeltaWings.Minecraft.Marriage.Main
+prefix: [Delta-Marriage]
+authors: [Delta Wings]
+description: Advanced Marriage plugin
 website: http://delta-wings.net/
 commands:
   marry: