From fc905bd002a7d10b9ffe212efb8fb4799ae4dac1 Mon Sep 17 00:00:00 2001 From: Aviortheking <2bazert@gmail.com> Date: Mon, 20 Mar 2017 22:53:15 +0100 Subject: [PATCH] DONE --- .../Minecraft/BetterTP/Commands/Bettertp.java | 6 +- .../Minecraft/BetterTP/Commands/Delhome.java | 8 +-- .../Minecraft/BetterTP/Commands/Home.java | 4 +- .../Minecraft/BetterTP/Commands/Homelist.java | 10 +-- .../Minecraft/BetterTP/Commands/Sethome.java | 65 +++++++++++-------- .../DeltaWings/Minecraft/BetterTP/Main.java | 8 ++- 6 files changed, 58 insertions(+), 43 deletions(-) diff --git a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Bettertp.java b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Bettertp.java index 5d6cc75..f012f31 100644 --- a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Bettertp.java +++ b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Bettertp.java @@ -1,18 +1,16 @@ package net.DeltaWings.Minecraft.BetterTP.Commands; import net.DeltaWings.Minecraft.BetterTP.Custom.Config; + import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -/** - * Created by Delta Wings on 19/03/2017 at.01:40 - */ public class Bettertp implements CommandExecutor { - Config m = new Config("", "messages"); + private Config m = new Config("", "messages"); @Override public boolean onCommand(CommandSender s, Command d, String g, String[] a) { diff --git a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Delhome.java b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Delhome.java index 7f72042..52ff356 100644 --- a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Delhome.java +++ b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Delhome.java @@ -1,14 +1,12 @@ package net.DeltaWings.Minecraft.BetterTP.Commands; import net.DeltaWings.Minecraft.BetterTP.Custom.Config; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -/** - * Created by Delta Wings on 19/03/2017 at.01:37 - */ public class Delhome implements CommandExecutor { private Config m = new Config("", "messages"); @@ -21,7 +19,7 @@ public class Delhome implements CommandExecutor { if(c.isSet(a[0])) { c.set(a[0], null); c.save(); - s.sendMessage(m.getString("home.deleted")); + s.sendMessage(m.getString("home.deleted").replace("[home]", a[0]).replace("&", "§")); return true; } else { s.sendMessage(m.getString("home.dont-exist").replace("[home]", a[0]).replace("&", "§")); @@ -31,7 +29,7 @@ public class Delhome implements CommandExecutor { if(c.isSet("home")) { c.set("home", null); c.save(); - s.sendMessage(m.getString("home.deleted")); + s.sendMessage(m.getString("home.deleted").replace("[home]", "home").replace("&", "§")); return true; } else { s.sendMessage(m.getString("home.dont-exist").replace("[home]", "home").replace("&", "§")); diff --git a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Home.java b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Home.java index 7e8bd65..9f16fbf 100644 --- a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Home.java +++ b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Home.java @@ -2,14 +2,12 @@ package net.DeltaWings.Minecraft.BetterTP.Commands; import net.DeltaWings.Minecraft.BetterTP.Custom.Config; import net.DeltaWings.Minecraft.BetterTP.Main; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -/** - * Created by Delta Wings on 19/03/2017 at.01:37 - */ public class Home implements CommandExecutor { private Config m = new Config("", "messages"); diff --git a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Homelist.java b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Homelist.java index 4b12965..b50a485 100644 --- a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Homelist.java +++ b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Homelist.java @@ -1,18 +1,20 @@ package net.DeltaWings.Minecraft.BetterTP.Commands; import net.DeltaWings.Minecraft.BetterTP.Custom.Config; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -/** - * Created by Delta Wings on 19/03/2017 at.21:33 - */ public class Homelist implements CommandExecutor { @Override public boolean onCommand(CommandSender s, Command command, String label, String[] args) { - if(s instanceof Player) {for(String a : new Config("data", s.getName()).getSection("")) s.sendMessage(a.replace("&", "§"));} + if(s instanceof Player) { + for(String a : new Config("data", s.getName()).getSection("")) { + s.sendMessage(("&b"+a).replace("&", "§")); + } + } return true; } } diff --git a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Sethome.java b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Sethome.java index 6c099b5..320460e 100644 --- a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Sethome.java +++ b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Sethome.java @@ -1,43 +1,56 @@ package net.DeltaWings.Minecraft.BetterTP.Commands; import net.DeltaWings.Minecraft.BetterTP.Custom.Config; + import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -/** - * Created by Delta Wings on 19/03/2017 at.01:37 - */ +import java.util.ArrayList; + public class Sethome implements CommandExecutor { - Config m = new Config("", "messages"); + private Config m = new Config("", "messages"); + private Config mc = new Config("", "config"); + @Override public boolean onCommand(CommandSender s, Command command, String label, String[] a) { if(s instanceof Player && s.hasPermission("bettertp.sethome")) { - if(a.length == 0) { - Config c = new Config("data", s.getName()); - if(!c.exist()) c.create(); - Location l = ((Player) s).getLocation(); - c.set("home.world", l.getWorld().getName()); - c.set("home.x", l.getX()); - c.set("home.y", l.getY()); - c.set("home.z", l.getZ()); - c.save(); - s.sendMessage(m.getString("home.set").replace("[home]", "home").replace("&", "§")); - return true; - } else if(a.length == 1) { - Config c = new Config("data", s.getName()); - if(!c.exist()) c.create(); - Location l = ((Player) s).getLocation(); - c.set(a[0] + ".world", l.getWorld().getName()); - c.set(a[0] + ".x", l.getX()); - c.set(a[0] + ".y", l.getY()); - c.set(a[0] + ".z", l.getZ()); - c.save(); - s.sendMessage(m.getString("home.set").replace("[home]", a[0]).replace("&", "§")); - return true; + Config c = new Config("data", s.getName()); + ArrayList r = new ArrayList<>(); + for(String e : mc.getSection("maxhomes")) { + if(s.hasPermission("bettertp.max."+e)) r.add(e); + } + Boolean p = false; + for(String e : r) { + if(c.getSection("").size() == mc.getInt("maxhomes." + e)) p = true; + } + if(p) { + s.sendMessage(m.getString("home.max").replace("[max]", c.getSection("").size() + "")); + } else { + if(a.length == 0) { + if(!c.exist()) c.create(); + Location l = ((Player) s).getLocation(); + c.set("home.world", l.getWorld().getName()); + c.set("home.x", l.getX()); + c.set("home.y", l.getY()); + c.set("home.z", l.getZ()); + c.save(); + s.sendMessage(m.getString("home.set").replace("[home]", "home").replace("&", "§")); + return true; + } else if(a.length == 1) { + if(!c.exist()) c.create(); + Location l = ((Player) s).getLocation(); + c.set(a[0] + ".world", l.getWorld().getName()); + c.set(a[0] + ".x", l.getX()); + c.set(a[0] + ".y", l.getY()); + c.set(a[0] + ".z", l.getZ()); + c.save(); + s.sendMessage(m.getString("home.set").replace("[home]", a[0]).replace("&", "§")); + return true; + } } } else if(s instanceof Player && !s.hasPermission("bettertp.sethome")) { s.sendMessage(m.getString("global.permission").replace("&", "§")); diff --git a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Main.java b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Main.java index 9ee2cba..ac93235 100644 --- a/src/main/java/net/DeltaWings/Minecraft/BetterTP/Main.java +++ b/src/main/java/net/DeltaWings/Minecraft/BetterTP/Main.java @@ -72,11 +72,17 @@ public final class Main extends JavaPlugin { messages.set("home.deleted", "&8 >&c Your home [home] has been deleted"); messages.set("home.dont-exist", "&8 >&c Your home [home] do not exist"); messages.set("home.teleported", "&8 >&c You have been teleported to your home : [home]"); + messages.set("home.max", "&8 >&c You already have [max] homes"); messages.set("help.top", "&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c= &2BetterTP &c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-"); messages.set("help.bottom", "&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c= &2BetterTP &c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-&c=&4-"); messages.save(); } - + Config c = new Config("", "config"); + if(!c.exist()) { + c.create(); + c.set("maxhomes"); + c.save(); + } } }