Wersja 0.4.4-b330

EastWestFM · Nov 15, 2014 · 808d29c · 808d29c
1 parent 8680710
commit 808d29c
Show file tree

Hide file tree

Showing 19 changed files with 133 additions and 41 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.karolek</groupId>
     <artifactId>revoguild</artifactId>
-    <version>0.4.1-b322</version>
+    <version>0.4.4-b330</version>
     <name>RevoGuild</name>
     <description>Plugin na gildie.</description>
     <properties>

diff --git a/src/main/java/net/karolek/revoguild/base/Guild.java b/src/main/java/net/karolek/revoguild/base/Guild.java
@@ -63,7 +63,7 @@ public Guild(String tag, String name, Player owner) {
         this.createTime = new LongValue(this, System.currentTimeMillis());
         this.expireTime = new LongValue("expireTime", this, System.currentTimeMillis() + TimeUtil.DAY.getTime(Config.TIME_START));
         this.lastExplodeTime = new LongValue(this, System.currentTimeMillis() - TimeUtil.SECOND.getTime(Config.TNT_CANTBUILD_TIME));
-        this.lastTakenLifeTime = new LongValue(this, System.currentTimeMillis());
+        this.lastTakenLifeTime = new LongValue(this, 0);
         this.lives = new IntegerValue("lives", this, Config.UPTAKE_LIVES_START);
         this.pvp = false;
         this.preDeleted = false;

diff --git a/src/main/java/net/karolek/revoguild/base/User.java b/src/main/java/net/karolek/revoguild/base/User.java
@@ -76,9 +76,13 @@ public void addTimePlay(int time) {
 		GuildPlugin.getStore().update(false, "UPDATE `{P}users` SET `timePlay` = '" + this.timePlay + "' WHERE `uuid` = '" + this.toString() + "'");
 	}*/
 
+    public String getKD() {
+        return "";
+    }
+
     @Deprecated
     public double getKDRatio() {
-    return 0;
+        return 0;
     }
 
     @Override

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/AllianceCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/AllianceCommand.java
@@ -2,13 +2,18 @@
 
 import net.karolek.revoguild.base.Guild;
 import net.karolek.revoguild.commands.SubCommand;
+import net.karolek.revoguild.data.Config;
 import net.karolek.revoguild.data.Lang;
 import net.karolek.revoguild.managers.AllianceManager;
 import net.karolek.revoguild.managers.GuildManager;
 import net.karolek.revoguild.managers.UserManager;
+import net.karolek.revoguild.utils.ItemUtil;
 import net.karolek.revoguild.utils.Util;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
 
 public class AllianceCommand extends SubCommand {
 
@@ -39,7 +44,16 @@ public boolean onCommand(Player p, String[] args) {
             return Util.sendMsg(Util.getOnlinePlayers(), Lang.parse(Lang.BC_GUILD_ALLIANCE_DELETED, g, o));
         }
 
+        if(AllianceManager.getGuildAlliances(g).size() >= Config.ALLIANCES_MAXCOUNT)
+            return Util.sendMsg(p, Lang.ERROR_ALLIANCES_MAXCOUNT);
+
         if (AllianceManager.getInvites().contains(o.getTag() + ":" + g.getTag())) {
+
+            List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_ALLIANCE_VIP : Config.COST_ALLIANCE_NORMAL, 1);
+
+            if(!ItemUtil.checkAndRemove(items, p))
+                return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
+
             AllianceManager.getInvites().remove(o.getTag() + ":" + g.getTag());
             AllianceManager.createAlliance(g, o);
             return Util.sendMsg(Util.getOnlinePlayers(), Lang.parse(Lang.BC_GUILD_ALLIANCE_CREATED, g, o));

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/CreateCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/CreateCommand.java
@@ -45,7 +45,7 @@ public boolean onCommand(Player p, String[] args) {
         List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_CREATE_VIP : Config.COST_CREATE_NORMAL, 1);
 
         if (!ItemUtil.checkAndRemove(items, p))
-            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS);
+            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
 
         Guild g = GuildManager.createGuild(tag, name, p);
 

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/EffectCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/EffectCommand.java
@@ -11,10 +11,12 @@
 import net.karolek.revoguild.utils.TimeUtil;
 import net.karolek.revoguild.utils.Util;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class EffectCommand extends SubCommand {
@@ -37,8 +39,10 @@ public boolean onCommand(Player p, String[] args) {
         if (cooldown != null && ((System.currentTimeMillis() - cooldown.longValue()) < TimeUtil.MINUTE.getTime(Config.EFFECTS_TIME_INTERVAL)))
             return Util.sendMsg(p, Lang.ERROR_MUST_WAIT);
 
-        if (!ItemUtil.checkAndRemove(ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_EFFECT_VIP : Config.COST_EFFECT_NORMAL, 1), p))
-            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS);
+        List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_EFFECT_VIP : Config.COST_EFFECT_NORMAL, 1);
+
+        if (!ItemUtil.checkAndRemove(items, p))
+            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
 
         if (!RandomUtil.getChance(Config.EFFECTS_CHANCE))
             return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_LUCKY_TO_EFFECT);

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/EnlargeCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/EnlargeCommand.java
@@ -37,7 +37,7 @@ public boolean onCommand(Player p, String[] args) {
         List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_ENLARGE_VIP : Config.COST_ENLARGE_NORMAL, modifier);
 
         if (!ItemUtil.checkItems(items, p))
-            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS);
+            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
 
         if (!g.addSize())
             return Util.sendMsg(p, Lang.ERROR_MAX_SIZE);

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/JoinCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/JoinCommand.java
@@ -34,10 +34,16 @@ public boolean onCommand(Player p, String[] args) {
         if (g == null)
             return Util.sendMsg(p, Lang.ERROR_CANT_FIND_GUILD);
 
-        List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_JOIN_VIP : Config.COST_JOIN_NORMAL, 1);
+        String algorithm = Config.ALGORITHM_JOIN;
+        algorithm = algorithm.replace("{MEMBERS_NUM}", Integer.toString(g.getMembers().size()));
+
+        int modifier = Util.calculate(algorithm);
+
+        List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_JOIN_VIP : Config.COST_JOIN_NORMAL, modifier);
+
 
         if (!ItemUtil.checkItems(items, p))
-            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS);
+            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
 
         if (!g.addMember(UserManager.getUser(p)))
             return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_INVITE);

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/LeaderCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/LeaderCommand.java
@@ -46,7 +46,7 @@ public boolean onCommand(Player p, String[] args) {
         List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_LEADER_VIP : Config.COST_LEADER_NORMAL, 1);
 
         if (!ItemUtil.checkAndRemove(items, p))
-            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS);
+            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
 
         g.getLeader().set(u);
 

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/OwnerCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/OwnerCommand.java
@@ -46,7 +46,7 @@ public boolean onCommand(Player p, String[] args) {
         List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_OWNER_VIP : Config.COST_OWNER_NORMAL, 1);
 
         if (!ItemUtil.checkAndRemove(items, p))
-            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS);
+            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
 
         g.getOwner().set(u);
 

diff --git a/src/main/java/net/karolek/revoguild/commands/guild/user/ProlongCommand.java b/src/main/java/net/karolek/revoguild/commands/guild/user/ProlongCommand.java
@@ -9,6 +9,9 @@
 import net.karolek.revoguild.utils.TimeUtil;
 import net.karolek.revoguild.utils.Util;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
 
 public class ProlongCommand extends SubCommand {
 
@@ -28,8 +31,10 @@ public boolean onCommand(Player p, String[] args) {
         if ((t - System.currentTimeMillis()) >= TimeUtil.DAY.getTime(Config.TIME_MAX))
             return Util.sendMsg(p, Lang.ERROR_CANT_ADD_TIME);
 
-        if (!ItemUtil.checkAndRemove(ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_PROLONG_VIP : Config.COST_PROLONG_NORMAL, 1), p))
-            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS);
+        List<ItemStack> items = ItemUtil.getItems(p.hasPermission("revoguild.vip") ? Config.COST_PROLONG_VIP : Config.COST_PROLONG_NORMAL, 1);
+
+        if (!ItemUtil.checkAndRemove(items, p))
+            return Util.sendMsg(p, Lang.ERROR_DONT_HAVE_ITEMS.replace("{ITEMS}", ItemUtil.getItems(items)));
 
         g.getExpireTime().add(TimeUtil.DAY.getTime(Config.TIME_ADD));
 

diff --git a/src/main/java/net/karolek/revoguild/data/Config.java b/src/main/java/net/karolek/revoguild/data/Config.java
@@ -65,10 +65,13 @@ public class Config {
     public static String ALGORITHM_RANKING_LOSE = "Math.abs({WIN_POINTS}/2)";
     public static String ALGORITHM_GUILD_POINTS = "{MEMBERS_POINTS} - ({MEMBERS_NUM}*1000)";
     public static String ALGORITHM_ENLARGE = "({CUBOID_SIZE} - 24)/5 +1";
+    public static String ALGORITHM_JOIN = "Math.max(1, {MEMBERS_NUM}/2)";
 
     public static boolean MOVEMENT_NOTIFY_ENABLED = true;
     public static boolean MOVEMENT_NOTIFY_INTRUDER_ENABLED = true;
 
+    public static int ALLIANCES_MAXCOUNT = 3;
+
     public static boolean ACTIONS_BLOCK_BREAK = false;
     public static boolean ACTIONS_BLOCK_PLACE = false;
     public static boolean ACTIONS_BUCKET_EMPTY = false;
@@ -101,13 +104,15 @@ public class Config {
     public static String COST_ENLARGE_NORMAL = "1:0-10;";
     public static String COST_PROLONG_NORMAL = "1:0-10;";
     public static String COST_EFFECT_NORMAL = "1:0-10;";
+    public static String COST_ALLIANCE_NORMAL = "1:0-10;";
     public static String COST_CREATE_VIP = "1:0-5;";
     public static String COST_JOIN_VIP = "1:0-5;";
     public static String COST_LEADER_VIP = "1:0-5;";
     public static String COST_OWNER_VIP = "1:0-5;";
     public static String COST_ENLARGE_VIP = "1:0-5;";
     public static String COST_PROLONG_VIP = "1:0-5;";
     public static String COST_EFFECT_VIP = "1:0-10;";
+    public static String COST_ALLIANCE_VIP = "1:0-10;";
 
     public static String CUBOID_WORLD = "world";
     public static int CUBOID_SIZE_START = 24;
@@ -128,7 +133,9 @@ public class Config {
     public static int TIME_TELEPORT = 10;
 
     public static boolean TABLIST_ENABLED = false;
-    public static int TABLIST_REFRESH_INTERVAL = 1;
+    public static String TABLIST_FORMAT_GTOP = "{TAG} &7[&8{POINTS}&7]";
+    public static String TABLIST_FORMAT_PTOP = "{NAME}";
+    public static int TABLIST_REFRESH_INTERVAL = 10;
 
     public static void loadConfig() {
         try {

diff --git a/src/main/java/net/karolek/revoguild/data/Lang.java b/src/main/java/net/karolek/revoguild/data/Lang.java
@@ -59,6 +59,7 @@ public class Lang {
     public static String ERROR_CANT_OPEN_TREASURE_OUTSIDE_CUBOID = "&4Blad: &cSkarbiec gildii mozna otwierac tylko na terenie gildii!";
     public static String ERROR_CANT_SET_CUBOID = "&4Blad: &cNie mozna przeniesc cuboida gildii poniewaz w poblizu znajduje sie inna gildia/spawn!";
     public static String ERROR_CANT_FIND_USER = "&4Blad: Uzytkownik nie istnieje w bazie danych!";
+    public static String ERROR_ALLIANCES_MAXCOUNT = "&4Blad: &cTwoja gildia ma juz maksymalna ilosc sojuszy!";
     public static String ERROR_GUILD_HAVE_BAN = "&4Blad: &cGildia ma juz bana!";
     public static String ERROR_GUILD_DONT_HAVE_BAN = "&4Blad: &cGildia nie ma bana!";
     public static String ERROR_DONT_HAVE_LUCKY_TO_EFFECT = "&4Blad: &cEfekt nie zostal wylosowany! Nie masz szczescia i straciles itemy! :(";

diff --git a/src/main/java/net/karolek/revoguild/managers/TabManager.java b/src/main/java/net/karolek/revoguild/managers/TabManager.java
@@ -3,6 +3,7 @@
 import lombok.Getter;
 import net.karolek.revoguild.base.Guild;
 import net.karolek.revoguild.base.User;
+import net.karolek.revoguild.data.Config;
 import net.karolek.revoguild.data.Lang;
 import net.karolek.revoguild.data.TabScheme;
 import net.karolek.revoguild.tablist.Tab;
@@ -11,7 +12,6 @@
 import net.karolek.revoguild.tablist.update.TabThread;
 import net.karolek.revoguild.utils.PacketUtil;
 import net.karolek.revoguild.utils.Util;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -79,31 +79,36 @@ public static String parse(String s, Player p) {
         User pU = UserManager.getUser(p);
 
         List<Data<User>> playerList = TabThread.getInstance().getRankList().getTopPlayers();
+
         for (int i = 0; i < 20; i++) {
+            String format = Config.TABLIST_FORMAT_PTOP;
             if (i >= playerList.size()) {
-                s = StringUtils.replace(s, "{PTOP-" + (i + 1) + "}", "brak");
+                format = format.replace("{NAME}", "brak");
             } else {
                 Data<User> u = playerList.get(i);
-                s = StringUtils.replace(s, "{PTOP-" + (i + 1) + "}", u == null ? "brak" : u.getKey().getName());
+                format = format.replace("{NAME}", u == null ? "brak" : u.getKey().getName());
             }
+            s = s.replace("{PTOP-" + (i + 1) + "}", format);
         }
 
         List<Data<Guild>> guildList = TabThread.getInstance().getRankList().getTopGuilds();
         for (int i = 0; i < 20; i++) {
+            String format = Config.TABLIST_FORMAT_GTOP;
             if (i >= guildList.size()) {
-                s = StringUtils.replace(s, "{GTOP-" + (i + 1) + "}", "brak");
+                format = "brak";
             } else {
                 Data<Guild> g = guildList.get(i);
-                s = StringUtils.replace(s, "{GTOP-" + (i + 1) + "}", g == null ? "brak" : g.getKey().getTag() + " &7[" + g.getPoints() + "]");
+                format = Lang.parse(format, g.getKey());
             }
+            s = s.replace("{GTOP-" + (i + 1) + "}", format);
         }
 
         s = Lang.parse(s, pU);
-        s = StringUtils.replace(s, "{ONLINE}", Integer.toString(Util.getOnlinePlayers().size()));
-        s = StringUtils.replace(s, "{TIME}", Util.getTime(System.currentTimeMillis()));
+        s = s.replace("{ONLINE}", Integer.toString(Util.getOnlinePlayers().size()));
+        s = s.replace("{TIME}", Util.getTime(System.currentTimeMillis()));
         Guild g = GuildManager.getGuild(p);
-        s = StringUtils.replace(s, "{TAG}", g == null ? "brak" : g.getTag());
-        s = StringUtils.replace(s, "{PING}", Integer.toString(PacketUtil.getPing(p)));
+        s = s.replace("{TAG}", g == null ? "brak" : g.getTag());
+        s = s.replace("{PING}", Integer.toString(PacketUtil.getPing(p)));
         return Util.fixColor(s);
     }
 }
diff --git a/src/main/java/net/karolek/revoguild/utils/ItemUtil.java b/src/main/java/net/karolek/revoguild/utils/ItemUtil.java
@@ -4,25 +4,12 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class ItemUtil {
 
-    public static ItemStack getItem(Material m, int a, String name, String... lore) {
-        ItemStack item = new ItemStack(m, a);
-        ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(Util.fixColor(name));
-        if (lore != null)
-            meta.setLore(Util.fixColor(Arrays.asList(lore)));
-        item.setItemMeta(meta);
-        return item;
-    }
-
-    @SuppressWarnings("deprecation")
     public static List<ItemStack> getItems(String string, int modifier) {
         List<ItemStack> items = new ArrayList<ItemStack>();
         for (String s : string.split(";")) {
@@ -42,6 +29,19 @@ public static boolean checkItems(List<ItemStack> items, Player p) {
         return true;
     }
 
+    public static String getItems(List<ItemStack> items) {
+        StringBuilder sb = new StringBuilder();
+        for (ItemStack item : items) {
+            sb.append(item.getType().name().toLowerCase().replace("_", " "));
+            sb.append(" ");
+            if (item.getData().getData() != 0)
+                sb.append("(" + sb.append(item.getTypeId()) + "/" + item.getData().getData() + ")");
+            else sb.append("(" + item.getTypeId() + ")");
+            sb.append(", ").append(item.getAmount() + " szt.").append("\n");
+        }
+        return sb.toString();
+    }
+
     public static void removeItems(List<ItemStack> items, Player player) {
         Inventory inv = player.getInventory();
         List<ItemStack> removes = new ArrayList<ItemStack>();

diff --git a/src/main/java/net/karolek/revoguild/utils/UptakeUtil.java b/src/main/java/net/karolek/revoguild/utils/UptakeUtil.java
@@ -7,6 +7,7 @@
 import net.karolek.revoguild.utils.Reflection.FieldAccessor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.HashMap;
 
@@ -93,6 +94,9 @@ public static void init() {
     }
 
     public static void init(Player p) {
+
+        p.setItemInHand(p.getItemInHand().getAmount() <= 1 ? null : new ItemStack(p.getItemInHand().getType(), p.getItemInHand().getAmount()-1));
+
         for (Guild g : GuildManager.getGuilds().values())
             respawnGuild(p, g);
     }

diff --git a/src/main/java/net/karolek/revoguild/utils/Util.java b/src/main/java/net/karolek/revoguild/utils/Util.java
@@ -126,6 +126,8 @@ public static void copy(InputStream in, File file) {
     }
 
     public static String secondsToString(int seconds) {
+        if(seconds == 0) return "nigdy";
+
         LinkedHashMap<Integer, String> values = new LinkedHashMap<Integer, String>(6);
 
         values.put(60 * 60 * 24 * 30 * 12, "y");