diff --git a/.idea/Minecraft-Marriage.iml b/.idea/Marriage.iml similarity index 100% rename from .idea/Minecraft-Marriage.iml rename to .idea/Marriage.iml diff --git a/.idea/artifacts/Marriage_min.xml b/.idea/artifacts/Marriage_min.xml new file mode 100644 index 0000000..8291552 --- /dev/null +++ b/.idea/artifacts/Marriage_min.xml @@ -0,0 +1,10 @@ + + + $PROJECT_DIR$/out/artifacts/Marriage_min + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..9bf6a64 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..b26911b --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 43031ee..48956f2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -38,5 +38,17 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index e356962..5e93938 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/Mariage/Mariage.iml b/Mariage/Mariage.iml deleted file mode 100644 index e927a22..0000000 --- a/Mariage/Mariage.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Mariage/ressources/Spigot-v1_10_2.jar b/Mariage/ressources/Spigot-v1_10_2.jar deleted file mode 100644 index 06f9e04..0000000 Binary files a/Mariage/ressources/Spigot-v1_10_2.jar and /dev/null differ diff --git a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Main.java b/Mariage/src/net/DeltaWings/Minecraft/Marriage/Main.java deleted file mode 100644 index 30501b9..0000000 --- a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Main.java +++ /dev/null @@ -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 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; - } - -} diff --git a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Marriage.java b/Mariage/src/net/DeltaWings/Minecraft/Marriage/Marriage.java deleted file mode 100644 index 0d9b482..0000000 --- a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Marriage.java +++ /dev/null @@ -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; - } -} diff --git a/Mariage/tests/Spigot-v1_10_2.jar b/Mariage/tests/Spigot-v1_10_2.jar deleted file mode 100644 index 06f9e04..0000000 Binary files a/Mariage/tests/Spigot-v1_10_2.jar and /dev/null differ diff --git a/Mariage/tests/eula.txt b/Mariage/tests/eula.txt deleted file mode 100644 index c4a6cb1..0000000 --- a/Mariage/tests/eula.txt +++ /dev/null @@ -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 diff --git a/Marriage.iml b/Marriage.iml new file mode 100644 index 0000000..9d74a3d --- /dev/null +++ b/Marriage.iml @@ -0,0 +1,36 @@ + + + + + + + SPIGOT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0656032 --- /dev/null +++ b/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + delta-wings + marriage + 1.0.0 + jar + + Marriage + + Advanced Marriage plugin + + UTF-8 + + http://delta-wings.net/ + + + clean package + + + 3.1 + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + true + + + + + + + + src/main/resources + true + + + + + + + spigotmc-repo + https://hub.spigotmc.org/nexus/content/groups/public/ + + + sonatype + https://oss.sonatype.org/content/groups/public/ + + + + + + org.spigotmc + spigot-api + 1.10.2-R0.1-SNAPSHOT + provided + + + diff --git a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Divorce.java b/src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Divorce.java similarity index 94% rename from Mariage/src/net/DeltaWings/Minecraft/Marriage/Divorce.java rename to src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Divorce.java index 736b25b..6bad682 100644 --- a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Divorce.java +++ b/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; diff --git a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Marry.java b/src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Marry.java similarity index 97% rename from Mariage/src/net/DeltaWings/Minecraft/Marriage/Marry.java rename to src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Marry.java index bce6995..45bd825 100644 --- a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Marry.java +++ b/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(); } diff --git a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Partner.java b/src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Partner.java similarity index 98% rename from Mariage/src/net/DeltaWings/Minecraft/Marriage/Partner.java rename to src/main/java/net/DeltaWings/Minecraft/Marriage/Commands/Partner.java index f621028..500e7ba 100644 --- a/Mariage/src/net/DeltaWings/Minecraft/Marriage/Partner.java +++ b/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(); } diff --git a/Mariage/src/net/DeltaWings/Minecraft/Marriage/PlayerJoin.java b/src/main/java/net/DeltaWings/Minecraft/Marriage/Events/PlayerJoin.java similarity index 85% rename from Mariage/src/net/DeltaWings/Minecraft/Marriage/PlayerJoin.java rename to src/main/java/net/DeltaWings/Minecraft/Marriage/Events/PlayerJoin.java index 4f3af9d..3d5febb 100644 --- a/Mariage/src/net/DeltaWings/Minecraft/Marriage/PlayerJoin.java +++ b/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(); } diff --git a/src/main/java/net/DeltaWings/Minecraft/Marriage/Main.java b/src/main/java/net/DeltaWings/Minecraft/Marriage/Main.java new file mode 100644 index 0000000..ea87164 --- /dev/null +++ b/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 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; + } +} diff --git a/Mariage/src/config.yml b/src/main/resources/config.yml similarity index 100% rename from Mariage/src/config.yml rename to src/main/resources/config.yml diff --git a/Mariage/src/plugin.yml b/src/main/resources/plugin.yml similarity index 82% rename from Mariage/src/plugin.yml rename to src/main/resources/plugin.yml index 92b0d88..e438f7c 100644 --- a/Mariage/src/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,9 @@ name: Marriage -version: 0.1.0 -author: Delta Wings -main: net.DeltaWings.Minecraft.Marriage.Main +version: ${project.version} +main: delta-wings.marriage.Marriage +prefix: [Delta-Marriage] +authors: [Delta Wings] +description: Advanced Marriage plugin website: http://delta-wings.net/ commands: marry: