Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/land/battle/practice/Practice.java
#	src/main/java/land/battle/practice/listeners/PlayerListener.java
#	src/main/java/land/battle/practice/managers/ItemManager.java
This commit is contained in:
Matheus 2024-06-13 18:50:55 -04:00
commit c341ed3132
215 changed files with 3212 additions and 1019 deletions

View File

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>com.solexgames.practice</groupId> <groupId>land.battle.practice</groupId>
<artifactId>practice</artifactId> <artifactId>practice</artifactId>
<version>LATEST</version> <version>LATEST</version>

View File

@ -1,30 +0,0 @@
package com.solexgames.practice.state.impl;
import com.solexgames.practice.party.Party;
import com.solexgames.practice.player.PlayerData;
import com.solexgames.practice.runnable.cache.StatusCache;
import com.solexgames.practice.state.PlayerStateAdapter;
import com.solexgames.practice.util.CC;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
/**
* @author GrowlyX
* @since 8/14/2021
*/
public class SpawnBoardAdapter implements PlayerStateAdapter {
@Override
public List<String> handleBoard(Player player, PlayerData playerData, Party party) {
final List<String> stringList = new ArrayList<>();
stringList.add(CC.WHITE + "Online: " + CC.GOLD + Bukkit.getOnlinePlayers().size());
stringList.add(CC.WHITE + "Fighting: " + CC.GOLD + StatusCache.getInstance().getFighting());
return stringList;
}
}

View File

@ -1,30 +0,0 @@
package com.solexgames.practice.util;
import com.solexgames.practice.completion.AbstractDivisionPrizeHandler;
import com.solexgames.practice.completion.impl.*;
import com.solexgames.practice.util.division.RankedDivision;
import lombok.experimental.UtilityClass;
import java.util.HashMap;
import java.util.Map;
/**
* @author GrowlyX
* @since 8/12/2021
*/
@UtilityClass
public class DivisionPrizes {
public static final Map<RankedDivision, AbstractDivisionPrizeHandler> REACHED_PRIZE_MAP = new HashMap<>();
static {
REACHED_PRIZE_MAP.put(RankedDivision.UNRATED, null);
REACHED_PRIZE_MAP.put(RankedDivision.IRON, new IronDivisionPrizeHandler());
REACHED_PRIZE_MAP.put(RankedDivision.BRONZE, new BronzeDivisionPrizeHandler());
REACHED_PRIZE_MAP.put(RankedDivision.SILVER, new SilverDivisionPrizeHandler());
REACHED_PRIZE_MAP.put(RankedDivision.GOLD, new GoldDivisionPrizeHandler());
REACHED_PRIZE_MAP.put(RankedDivision.DIAMOND, new DiamondDivisionPrizeHandler());
}
}

View File

@ -1,11 +1,11 @@
package com.solexgames.practice; package land.battle.practice;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.state.PlayerStateAdapter; import land.battle.practice.state.PlayerStateAdapter;
import com.solexgames.practice.state.impl.*; import land.battle.practice.state.impl.*;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import io.github.nosequel.scoreboard.element.ScoreboardElement; import io.github.nosequel.scoreboard.element.ScoreboardElement;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -18,7 +18,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/29/2021 * @since 7/29/2021
*/ */
@ -36,7 +36,7 @@ public class PracticeConstants {
public static final String JEDIS_PRACTICE_SETTING_CATEGORY = "practice_settings"; public static final String JEDIS_PRACTICE_SETTING_CATEGORY = "practice_settings";
public static final String JEDIS_DISCORD_REWARD_CATEGORY = "discord_rewards"; public static final String JEDIS_DISCORD_REWARD_CATEGORY = "discord_rewards";
public static final int DEFAULT_ELO = 750; public static final int DEFAULT_ELO = 1000;
public static final List<String> CHANGELOG = Arrays.asList( public static final List<String> CHANGELOG = Arrays.asList(
CC.GRAY + "Leaderboards " + CC.AQUA + "(/leaderboards)", CC.GRAY + "Leaderboards " + CC.AQUA + "(/leaderboards)",

View File

@ -1,7 +1,7 @@
package com.solexgames.practice; package land.battle.practice;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/2/2021 * @since 8/2/2021
*/ */

View File

@ -1,8 +1,8 @@
package com.solexgames.practice.arena; package land.battle.practice.arena;
import com.solexgames.practice.arena.type.StandaloneArena; import land.battle.practice.arena.type.StandaloneArena;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.arena.type; package land.battle.practice.arena.type;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,20 +1,20 @@
package com.solexgames.practice.board; package land.battle.practice.board;
import com.solexgames.core.CorePlugin; import com.solexgames.core.CorePlugin;
import com.solexgames.core.player.PotPlayer; import com.solexgames.core.player.PotPlayer;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.PracticeConstants; import land.battle.practice.PracticeConstants;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import io.github.nosequel.scoreboard.element.ScoreboardElement; import io.github.nosequel.scoreboard.element.ScoreboardElement;
import io.github.nosequel.scoreboard.element.ScoreboardElementHandler; import io.github.nosequel.scoreboard.element.ScoreboardElementHandler;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/14/2021 * @since 8/14/2021
*/ */
@ -27,7 +27,7 @@ public class BoardAdapter implements ScoreboardElementHandler {
final PlayerData playerData = Practice.getInstance().getPlayerManager() final PlayerData playerData = Practice.getInstance().getPlayerManager()
.getPlayerData(player.getUniqueId()); .getPlayerData(player.getUniqueId());
element.setTitle(CC.GOLD + CC.BOLD + "Practice"); element.setTitle(CC.GOLD + CC.BOLD + "Battle " + CC.GRAY + "" + CC.WHITE + " Practice");
if (playerData == null || !playerData.getOptions().isScoreboardEnabled()) { if (playerData == null || !playerData.getOptions().isScoreboardEnabled()) {
return element; return element;

View File

@ -1,7 +1,7 @@
package com.solexgames.practice.challenges; package land.battle.practice.challenges;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 6/25/2021 * @since 6/25/2021
*/ */

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.challenges; package land.battle.practice.challenges;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -6,7 +6,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 6/25/2021 * @since 6/25/2021
*/ */

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.challenges.tracker; package land.battle.practice.challenges.tracker;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -8,7 +8,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/30/2021 * @since 7/30/2021
*/ */

View File

@ -0,0 +1,54 @@
package land.battle.practice.commands;
import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.annotation.CommandAlias;
import com.solexgames.lib.acf.annotation.CommandPermission;
import com.solexgames.lib.acf.annotation.Default;
import land.battle.practice.Practice;
import land.battle.practice.player.PlayerData;
import land.battle.practice.player.PlayerState;
import land.battle.practice.util.CC;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
/**
* @author BattleLand Team
* @since 5/17/2021
*/
@CommandAlias("division")
public class DivisionCommand extends BaseCommand {
@Default
public void onDefault(Player player) {
player.sendMessage(ChatColor.BLUE + ChatColor.BOLD.toString() + "Divisions");
player.sendMessage("");
player.sendMessage(ChatColor.BLUE + "Bronze Division");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.RED + "Bronze IV" + ChatColor.GRAY + " 0 - 649");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.RED + "Bronze III" + ChatColor.GRAY + " 650 - 724");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.RED + "Bronze II" + ChatColor.GRAY + " 725 - 799");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.RED + "Bronze I" + ChatColor.GRAY + " 800 - 874");
player.sendMessage("");
player.sendMessage(ChatColor.BLUE + "Silver Division");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GRAY + "Silver IV" + ChatColor.GRAY + " 875 - 939");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GRAY + "Silver III" + ChatColor.GRAY + " 940 - 999");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GRAY + "Silver II" + ChatColor.GRAY + " 1000 - 1059");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GRAY + "Silver I" + ChatColor.GRAY + " 1060 - 1119");
player.sendMessage("");
player.sendMessage(ChatColor.BLUE + "Gold Division");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GOLD + "Gold IV" + ChatColor.GRAY + " 1120 - 1179");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GOLD + "Gold III" + ChatColor.GRAY + " 1180 - 1239");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GOLD + "Gold II" + ChatColor.GRAY + " 1240 - 1299");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.GOLD + "Gold I" + ChatColor.GRAY + " 1300 - 1359");
player.sendMessage("");
player.sendMessage(ChatColor.BLUE + "Diamond Division");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.AQUA + "Diamond IV" + ChatColor.GRAY + " 1360 - 1419");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.AQUA + "Diamond III" + ChatColor.GRAY + " 1420 - 1489");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.AQUA + "Diamond II" + ChatColor.GRAY + " 1490 - 1539");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.AQUA + "Diamond I" + ChatColor.GRAY + " 1540 - 1599");
player.sendMessage("");
player.sendMessage(ChatColor.BLUE + "Legendary Division");
player.sendMessage(ChatColor.GRAY + "* " + ChatColor.DARK_PURPLE + "Legendary" + ChatColor.GRAY + " 1600+");
}
}

View File

@ -1,14 +1,14 @@
package com.solexgames.practice.commands; package land.battle.practice.commands;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.annotation.*; import com.solexgames.lib.acf.annotation.*;
import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer; import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer;
import com.solexgames.lib.commons.command.context.CommonsPlayer; import com.solexgames.lib.commons.command.context.CommonsPlayer;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/10/2021 * @since 7/10/2021
*/ */

View File

@ -1,18 +1,18 @@
package com.solexgames.practice.commands; package land.battle.practice.commands;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.ConditionFailedException; import com.solexgames.lib.acf.ConditionFailedException;
import com.solexgames.lib.acf.annotation.CommandAlias; import com.solexgames.lib.acf.annotation.CommandAlias;
import com.solexgames.lib.acf.annotation.Default; import com.solexgames.lib.acf.annotation.Default;
import com.solexgames.lib.acf.annotation.Syntax; import com.solexgames.lib.acf.annotation.Syntax;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.match.snapshot.InventorySnapshot; import land.battle.practice.match.snapshot.InventorySnapshot;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.UUID; import java.util.UUID;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/17/2021 * @since 5/17/2021
*/ */

View File

@ -1,18 +1,18 @@
package com.solexgames.practice.commands; package land.battle.practice.commands;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.ConditionFailedException; import com.solexgames.lib.acf.ConditionFailedException;
import com.solexgames.lib.acf.annotation.CommandAlias; import com.solexgames.lib.acf.annotation.CommandAlias;
import com.solexgames.lib.acf.annotation.Default; import com.solexgames.lib.acf.annotation.Default;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.UUID; import java.util.UUID;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 6/9/2021 * @since 6/9/2021
*/ */

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.commands; package land.battle.practice.commands;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.clickable.Clickable; import com.solexgames.core.util.clickable.Clickable;
@ -8,12 +8,12 @@ import com.solexgames.lib.acf.ConditionFailedException;
import com.solexgames.lib.acf.annotation.*; import com.solexgames.lib.acf.annotation.*;
import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer; import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer;
import com.solexgames.lib.commons.command.context.CommonsPlayer; import com.solexgames.lib.commons.command.context.CommonsPlayer;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.PracticeConstants; import land.battle.practice.PracticeConstants;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.lang3.time.DurationFormatUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.commands; package land.battle.practice.commands;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.annotation.CommandAlias; import com.solexgames.lib.acf.annotation.CommandAlias;
@ -7,12 +7,12 @@ import com.solexgames.lib.acf.annotation.Optional;
import com.solexgames.lib.acf.annotation.Syntax; import com.solexgames.lib.acf.annotation.Syntax;
import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer; import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer;
import com.solexgames.lib.commons.command.context.CommonsPlayer; import com.solexgames.lib.commons.command.context.CommonsPlayer;
import com.solexgames.practice.menu.LeaderboardsMenu; import land.battle.practice.menu.LeaderboardsMenu;
import com.solexgames.practice.menu.StatisticsMenu; import land.battle.practice.menu.StatisticsMenu;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/22/2021 * @since 5/22/2021
*/ */

View File

@ -1,16 +1,16 @@
package com.solexgames.practice.commands.administration; package land.battle.practice.commands.administration;
import com.solexgames.core.command.BaseCommand; import com.solexgames.core.command.BaseCommand;
import com.solexgames.core.command.annotation.Command; import com.solexgames.core.command.annotation.Command;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.builder.PageListBuilder; import com.solexgames.core.util.builder.PageListBuilder;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.Arena; import land.battle.practice.arena.Arena;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.menu.management.ArenaManagementMainMenu; import land.battle.practice.menu.management.ArenaManagementMainMenu;
import com.solexgames.practice.runnable.ArenaCommandRunnable; import land.battle.practice.runnable.ArenaCommandRunnable;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;

View File

@ -1,14 +1,14 @@
package com.solexgames.practice.commands.administration; package land.battle.practice.commands.administration;
import com.solexgames.core.command.BaseCommand; import com.solexgames.core.command.BaseCommand;
import com.solexgames.core.command.annotation.Command; import com.solexgames.core.command.annotation.Command;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.builder.PageListBuilder; import com.solexgames.core.util.builder.PageListBuilder;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.ItemUtil; import land.battle.practice.util.ItemUtil;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;

View File

@ -1,20 +1,20 @@
package com.solexgames.practice.commands.administration; package land.battle.practice.commands.administration;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.annotation.*; import com.solexgames.lib.acf.annotation.*;
import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer; import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer;
import com.solexgames.lib.commons.command.context.CommonsPlayer; import com.solexgames.lib.commons.command.context.CommonsPlayer;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.PracticeConstants; import land.battle.practice.PracticeConstants;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/17/2021 * @since 5/17/2021
*/ */

View File

@ -1,19 +1,19 @@
package com.solexgames.practice.commands.administration; package land.battle.practice.commands.administration;
import com.solexgames.core.CorePlugin; import com.solexgames.core.CorePlugin;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.annotation.CommandAlias; import com.solexgames.lib.acf.annotation.CommandAlias;
import com.solexgames.lib.acf.annotation.CommandPermission; import com.solexgames.lib.acf.annotation.CommandPermission;
import com.solexgames.lib.acf.annotation.Syntax; import com.solexgames.lib.acf.annotation.Syntax;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.PracticeConstants; import land.battle.practice.PracticeConstants;
import com.solexgames.practice.PracticeServerType; import land.battle.practice.PracticeServerType;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/17/2021 * @since 5/17/2021
*/ */

View File

@ -1,14 +1,14 @@
package com.solexgames.practice.commands.administration; package land.battle.practice.commands.administration;
import com.solexgames.core.util.clickable.Clickable; import com.solexgames.core.util.clickable.Clickable;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.CommandHelp; import com.solexgames.lib.acf.CommandHelp;
import com.solexgames.lib.acf.ConditionFailedException; import com.solexgames.lib.acf.ConditionFailedException;
import com.solexgames.lib.acf.annotation.*; import com.solexgames.lib.acf.annotation.*;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.managers.SpawnManager; import land.battle.practice.managers.SpawnManager;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import org.bukkit.Location; import org.bukkit.Location;
@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/6/2021 * @since 8/6/2021
*/ */

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.commands.administration; package land.battle.practice.commands.administration;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.clickable.Clickable; import com.solexgames.core.util.clickable.Clickable;
@ -6,12 +6,12 @@ import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.CommandHelp; import com.solexgames.lib.acf.CommandHelp;
import com.solexgames.lib.acf.ConditionFailedException; import com.solexgames.lib.acf.ConditionFailedException;
import com.solexgames.lib.acf.annotation.*; import com.solexgames.lib.acf.annotation.*;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.PracticeConstants; import land.battle.practice.PracticeConstants;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.tournament.Tournament; import land.battle.practice.tournament.Tournament;
import com.solexgames.practice.tournament.TournamentState; import land.battle.practice.tournament.TournamentState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.comphenix; package land.battle.practice.comphenix;
import static com.comphenix.protocol.PacketType.Play.Server.*; import static com.comphenix.protocol.PacketType.Play.Server.*;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.commands.duel; package land.battle.practice.commands.duel;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
@ -6,17 +6,17 @@ import com.solexgames.lib.acf.ConditionFailedException;
import com.solexgames.lib.acf.annotation.*; import com.solexgames.lib.acf.annotation.*;
import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer; import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer;
import com.solexgames.lib.commons.command.context.CommonsPlayer; import com.solexgames.lib.commons.command.context.CommonsPlayer;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.managers.PartyManager; import land.battle.practice.managers.PartyManager;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.MatchRequest; import land.battle.practice.match.MatchRequest;
import com.solexgames.practice.match.team.impl.MatchTeam; import land.battle.practice.match.team.impl.MatchTeam;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.queue.QueueType; import land.battle.practice.queue.QueueType;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.commands.duel; package land.battle.practice.commands.duel;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.ConditionFailedException; import com.solexgames.lib.acf.ConditionFailedException;
@ -8,12 +8,12 @@ import com.solexgames.lib.acf.annotation.Default;
import com.solexgames.lib.acf.annotation.Syntax; import com.solexgames.lib.acf.annotation.Syntax;
import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer; import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer;
import com.solexgames.lib.commons.command.context.CommonsPlayer; import com.solexgames.lib.commons.command.context.CommonsPlayer;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.menu.duel.DuelMenu; import land.battle.practice.menu.duel.DuelMenu;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandAlias("duel|fight") @CommandAlias("duel|fight")

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.commands.duel; package land.battle.practice.commands.duel;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
@ -9,14 +9,14 @@ import com.solexgames.lib.acf.annotation.Default;
import com.solexgames.lib.acf.annotation.Syntax; import com.solexgames.lib.acf.annotation.Syntax;
import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer; import com.solexgames.lib.acf.bukkit.contexts.OnlinePlayer;
import com.solexgames.lib.commons.command.context.CommonsPlayer; import com.solexgames.lib.commons.command.context.CommonsPlayer;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.team.impl.MatchTeam; import land.battle.practice.match.team.impl.MatchTeam;
import com.solexgames.practice.menu.SpectateMenu; import land.battle.practice.menu.SpectateMenu;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandAlias("spectate|spec") @CommandAlias("spectate|spec")

View File

@ -1,17 +1,17 @@
package com.solexgames.practice.commands.spawn; package land.battle.practice.commands.spawn;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.annotation.CommandAlias; import com.solexgames.lib.acf.annotation.CommandAlias;
import com.solexgames.lib.acf.annotation.CommandPermission; import com.solexgames.lib.acf.annotation.CommandPermission;
import com.solexgames.lib.acf.annotation.Default; import com.solexgames.lib.acf.annotation.Default;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/17/2021 * @since 5/17/2021
*/ */

View File

@ -1,8 +1,8 @@
package com.solexgames.practice.commands.time; package land.battle.practice.commands.time;
import com.solexgames.lib.acf.BaseCommand; import com.solexgames.lib.acf.BaseCommand;
import com.solexgames.lib.acf.annotation.CommandAlias; import com.solexgames.lib.acf.annotation.CommandAlias;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class TimeCommand extends BaseCommand { public class TimeCommand extends BaseCommand {

View File

@ -1,12 +1,12 @@
package com.solexgames.practice.completion; package land.battle.practice.completion;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/12/2021 * @since 8/12/2021
*/ */

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.completion.impl; package land.battle.practice.completion.impl;
import com.solexgames.practice.completion.AbstractDivisionPrizeHandler; import land.battle.practice.completion.AbstractDivisionPrizeHandler;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/12/2021 * @since 8/12/2021
*/ */

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.completion.impl; package land.battle.practice.completion.impl;
import com.solexgames.practice.completion.AbstractDivisionPrizeHandler; import land.battle.practice.completion.AbstractDivisionPrizeHandler;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/12/2021 * @since 8/12/2021
*/ */

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.completion.impl; package land.battle.practice.completion.impl;
import com.solexgames.practice.completion.AbstractDivisionPrizeHandler; import land.battle.practice.completion.AbstractDivisionPrizeHandler;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/12/2021 * @since 8/12/2021
*/ */

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.completion.impl; package land.battle.practice.completion.impl;
import com.solexgames.practice.completion.AbstractDivisionPrizeHandler; import land.battle.practice.completion.AbstractDivisionPrizeHandler;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/12/2021 * @since 8/12/2021
*/ */

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.completion.impl; package land.battle.practice.completion.impl;
import com.solexgames.practice.completion.AbstractDivisionPrizeHandler; import land.battle.practice.completion.AbstractDivisionPrizeHandler;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/12/2021 * @since 8/12/2021
*/ */

View File

@ -1,10 +1,10 @@
package com.solexgames.practice.effects; package land.battle.practice.effects;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/23/2021 * @since 5/23/2021
*/ */

View File

@ -1,9 +1,9 @@
package com.solexgames.practice.effects; package land.battle.practice.effects;
import com.solexgames.practice.effects.impl.LightningDeathEffect; import land.battle.practice.effects.impl.LightningDeathEffect;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/7/2021 * @since 7/7/2021
*/ */

View File

@ -1,7 +1,7 @@
package com.solexgames.practice.effects.impl; package land.battle.practice.effects.impl;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.effects.DeathEffect; import land.battle.practice.effects.DeathEffect;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Location; import org.bukkit.Location;
@ -12,7 +12,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import java.util.Arrays; import java.util.Arrays;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/9/2021 * @since 7/9/2021
*/ */

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.effects.impl; package land.battle.practice.effects.impl;
import com.solexgames.practice.effects.DeathEffect; import land.battle.practice.effects.DeathEffect;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import xyz.xenondevs.particle.ParticleEffect; import xyz.xenondevs.particle.ParticleEffect;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/26/2021 * @since 5/26/2021
*/ */

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.effects.impl; package land.battle.practice.effects.impl;
import com.solexgames.practice.effects.DeathEffect; import land.battle.practice.effects.DeathEffect;
import net.minecraft.server.v1_8_R3.EntityLightning; import net.minecraft.server.v1_8_R3.EntityLightning;
import net.minecraft.server.v1_8_R3.Packet; import net.minecraft.server.v1_8_R3.Packet;
import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityWeather; import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityWeather;
@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/23/2021 * @since 5/23/2021
*/ */

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.event; package land.battle.practice.event;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

View File

@ -1,7 +1,7 @@
package com.solexgames.practice.event.match; package land.battle.practice.event.match;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.team.impl.MatchTeam; import land.battle.practice.match.team.impl.MatchTeam;
import lombok.Getter; import lombok.Getter;
@Getter @Getter

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.event.match; package land.battle.practice.event.match;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.event.Event; import org.bukkit.event.Event;

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.event.match; package land.battle.practice.event.match;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
public class MatchStartEvent extends MatchEvent { public class MatchStartEvent extends MatchEvent {
public MatchStartEvent(Match match) { public MatchStartEvent(Match match) {

View File

@ -1,12 +1,12 @@
package com.solexgames.practice.events; package land.battle.practice.events;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.PlayerUtil;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
@ -19,7 +19,7 @@ import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/14/2021 * @since 8/14/2021
*/ */

View File

@ -1,7 +1,7 @@
package com.solexgames.practice.events; package land.battle.practice.events;
import com.solexgames.core.util.clickable.Clickable; import com.solexgames.core.util.clickable.Clickable;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.events; package land.battle.practice.events;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.events; package land.battle.practice.events;
public enum EventState { public enum EventState {

View File

@ -1,18 +1,18 @@
package com.solexgames.practice.ffa; package land.battle.practice.ffa;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.comphenix.EntityHider; import land.battle.practice.comphenix.EntityHider;
import com.solexgames.practice.ffa.killstreak.KillStreak; import land.battle.practice.ffa.killstreak.KillStreak;
import com.solexgames.practice.ffa.killstreak.impl.DebuffKillStreak; import land.battle.practice.ffa.killstreak.impl.DebuffKillStreak;
import com.solexgames.practice.ffa.killstreak.impl.GappleKillStreak; import land.battle.practice.ffa.killstreak.impl.GappleKillStreak;
import com.solexgames.practice.ffa.killstreak.impl.GodAppleKillStreak; import land.battle.practice.ffa.killstreak.impl.GodAppleKillStreak;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.PlayerUtil;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.ffa.killstreak; package land.battle.practice.ffa.killstreak;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,8 +1,8 @@
package com.solexgames.practice.ffa.killstreak.impl; package land.battle.practice.ffa.killstreak.impl;
import com.solexgames.practice.ffa.killstreak.KillStreak; import land.battle.practice.ffa.killstreak.KillStreak;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.PlayerUtil;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

View File

@ -1,8 +1,8 @@
package com.solexgames.practice.ffa.killstreak.impl; package land.battle.practice.ffa.killstreak.impl;
import com.solexgames.practice.ffa.killstreak.KillStreak; import land.battle.practice.ffa.killstreak.KillStreak;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.PlayerUtil;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

View File

@ -1,8 +1,8 @@
package com.solexgames.practice.ffa.killstreak.impl; package land.battle.practice.ffa.killstreak.impl;
import com.solexgames.practice.ffa.killstreak.KillStreak; import land.battle.practice.ffa.killstreak.KillStreak;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.PlayerUtil;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

View File

@ -1,7 +1,7 @@
package com.solexgames.practice.flags; package land.battle.practice.flags;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 6/9/2021 * @since 6/9/2021
*/ */
@ -9,13 +9,14 @@ public enum Flag {
DEFAULT, DEFAULT,
HCF, HCF,
SUMO, SUMO,
BUILD, BUILD,
SPLEEF, SPLEEF,
PARKOUR, PARKOUR,
BEDWARS, BEDWARS,
BRIDGES, BRIDGES,
SIMULATOR,
GLADIATOR,
STICK_FIGHT, STICK_FIGHT,
} }

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.kit; package land.battle.practice.kit;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.kit; package land.battle.practice.kit;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@ -1,18 +1,19 @@
package com.solexgames.practice.listeners; package land.battle.practice.listeners;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.MatchState; import land.battle.practice.match.MatchState;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.runnable.NewRoundRunnable; import land.battle.practice.runnable.NewRoundRunnable;
import com.solexgames.practice.tournament.Tournament; import land.battle.practice.tournament.Tournament;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -78,6 +79,9 @@ public class EntityListener implements Listener {
@EventHandler @EventHandler
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
Player whoWasHit = (Player)event.getEntity();
Player whoHit = (Player)event.getDamager();
if (!(event.getEntity() instanceof Player)) { if (!(event.getEntity() instanceof Player)) {
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -159,6 +163,14 @@ public class EntityListener implements Listener {
entityData.setCombo(0); entityData.setCombo(0);
if (this.isCritical(whoHit)) {
damagerData.incrementCriticalHits();
}
if (whoWasHit.isBlocking()) {
entityData.incrementBlockedHits();
}
if (match.getKit().getName().contains("Boxing")) { if (match.getKit().getName().contains("Boxing")) {
if (damagerData.getHits() >= 100) { if (damagerData.getHits() >= 100) {
this.plugin.getMatchManager().removeFighter(entity, entityData, false); this.plugin.getMatchManager().removeFighter(entity, entityData, false);
@ -187,6 +199,16 @@ public class EntityListener implements Listener {
} }
} }
private boolean isCritical(Player attacker) {
return attacker.getFallDistance() > 0.0F
&& !attacker.isOnGround()
&& !attacker.isInsideVehicle()
&& !attacker.hasPotionEffect(PotionEffectType.BLINDNESS)
&& attacker.getLocation().getBlock().getType() != Material.LADDER
&& attacker.getLocation().getBlock().getType() != Material.VINE;
}
@EventHandler @EventHandler
public void onPotionSplash(PotionSplashEvent e) { public void onPotionSplash(PotionSplashEvent e) {
if (!(e.getEntity().getShooter() instanceof Player)) { if (!(e.getEntity().getShooter() instanceof Player)) {

View File

@ -1,8 +1,8 @@
package com.solexgames.practice.listeners; package land.battle.practice.listeners;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,15 +1,15 @@
package com.solexgames.practice.listeners; package land.battle.practice.listeners;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.event.match.MatchEndEvent; import land.battle.practice.event.match.MatchEndEvent;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/30/2021 * @since 7/30/2021
*/ */

View File

@ -1,24 +1,24 @@
package com.solexgames.practice.listeners; package land.battle.practice.listeners;
import com.solexgames.core.listener.custom.PlayerFreezeEvent; import com.solexgames.core.listener.custom.PlayerFreezeEvent;
import com.solexgames.core.menu.impl.player.PlayerInfoMenu; import com.solexgames.core.menu.impl.player.PlayerInfoMenu;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.clickable.Clickable; import com.solexgames.core.util.clickable.Clickable;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.type.StandaloneArena; import land.battle.practice.arena.type.StandaloneArena;
import com.solexgames.practice.event.match.MatchEndEvent; import land.battle.practice.event.match.MatchEndEvent;
import com.solexgames.practice.event.match.MatchStartEvent; import land.battle.practice.event.match.MatchStartEvent;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.MatchState; import land.battle.practice.match.MatchState;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.queue.QueueType; import land.battle.practice.queue.QueueType;
import com.solexgames.practice.runnable.MatchRunnable; import land.battle.practice.runnable.MatchRunnable;
import com.solexgames.practice.util.*; import land.battle.practice.util.*;
import com.solexgames.practice.util.calc.EloCalculator; import land.battle.practice.util.calc.EloCalculator;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.HoverEvent;
@ -114,7 +114,7 @@ public class MatchListener implements Listener {
return; return;
} }
if (match.getKit().getFlag().equals(Flag.BUILD) || match.getKit().getFlag().equals(Flag.SPLEEF)) { if (match.getKit().getFlag().equals(Flag.BUILD) || match.getKit().getFlag().equals(Flag.SPLEEF) || (match.getKit().getFlag().equals(Flag.GLADIATOR) || (match.getKit().getFlag().equals(Flag.SIMULATOR)))) {
final StandaloneArena arena = match.getArena().getAvailableArena(); final StandaloneArena arena = match.getArena().getAvailableArena();
if (arena != null) { if (arena != null) {
@ -207,8 +207,8 @@ public class MatchListener implements Listener {
return; return;
} }
match.broadcast(CC.GRAY + CC.STRIKE_THROUGH + "-----------------------------------------------------"); match.broadcast(CC.GRAY + " ");
match.broadcast(Color.MAIN_COLOR + "Match Results" + CC.GRAY + " (Click names to view inventories)"); match.broadcast(Color.MAIN_COLOR + "Match Overview" + CC.GRAY + " (click to view inventories)");
final ChatComponentBuilder wInventories = new ChatComponentBuilder(""); final ChatComponentBuilder wInventories = new ChatComponentBuilder("");
final ChatComponentBuilder lInventories = new ChatComponentBuilder(""); final ChatComponentBuilder lInventories = new ChatComponentBuilder("");
@ -319,10 +319,13 @@ public class MatchListener implements Listener {
final int[] rankings = EloCalculator.getNewRankings(winnerElo, loserElo, true); final int[] rankings = EloCalculator.getNewRankings(winnerElo, loserElo, true);
eloMessage = Color.SECONDARY_COLOR + "Elo updates: " + CC.GREEN + winnerLeader.getName() + " +" + (rankings[0] - winnerElo) +
" (" + rankings[0] + ")" + Color.SECONDARY_COLOR + ", " + eloMessage = String.join("\n",
CC.RED + loserLeader.getName() + " -" + (loserElo - rankings[1]) + " (" + CC.PINK + "ELO Updates:",
rankings[1] + ")"; CC.GRAY + Constants.THIN_VERTICAL_LINE + " " + CC.GREEN + winnerLeader.getName() + ":" + CC.WHITE + " " + (rankings[0]) + " " + CC.GRAY + "(" + CC.GREEN + "+" + (rankings[0] - winnerElo) + CC.GRAY + ")",
CC.GRAY + Constants.THIN_VERTICAL_LINE + " " + CC.RED + loserLeader.getName() + ":" + CC.WHITE + " " + (rankings[1]) + " " + CC.GRAY + "(" + CC.RED + (rankings[1] - loserElo) + CC.GRAY + ")",
("")
);
if (match.getType() == QueueType.RANKED) { if (match.getType() == QueueType.RANKED) {
winnerLeaderData.setElo(kitName, rankings[0]); winnerLeaderData.setElo(kitName, rankings[0]);
@ -379,7 +382,7 @@ public class MatchListener implements Listener {
} }
} }
match.broadcast(CC.GRAY + CC.STRIKE_THROUGH + "-----------------------------------------------------"); match.broadcast(CC.GRAY + " ");
match.getTeams().forEach(team -> team.getPlayers().forEach(uuid -> { match.getTeams().forEach(team -> team.getPlayers().forEach(uuid -> {
final Player player = Bukkit.getPlayer(uuid); final Player player = Bukkit.getPlayer(uuid);
@ -413,7 +416,8 @@ public class MatchListener implements Listener {
} }
} }
playerData.setLastPlayedArena(match.getArena()); TaskUtil.runAsync(() -> this.plugin.getVoteManager().sendVoteMessage(player, match.getArena()));
if (!playerData.canPlayRanked() && !player.hasPermission("practice.ranked.bypass")) { if (!playerData.canPlayRanked() && !player.hasPermission("practice.ranked.bypass")) {
player.sendMessage(Color.SECONDARY_COLOR + "You need to win " + Color.MAIN_COLOR + playerData.winsUntilRankedUnlocked() + Color.SECONDARY_COLOR + " more matches to play ranked."); player.sendMessage(Color.SECONDARY_COLOR + "You need to win " + Color.MAIN_COLOR + playerData.winsUntilRankedUnlocked() + Color.SECONDARY_COLOR + " more matches to play ranked.");

View File

@ -1,12 +1,12 @@
package com.solexgames.practice.listeners; package land.battle.practice.listeners;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.MatchState; import land.battle.practice.match.MatchState;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.BlockUtil; import land.battle.practice.util.BlockUtil;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -16,7 +16,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/20/2021 * @since 5/20/2021
*/ */

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.listeners; package land.battle.practice.listeners;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.type.StandaloneArena; import land.battle.practice.arena.type.StandaloneArena;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.MatchState; import land.battle.practice.match.MatchState;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.runnable.BlockRemoveRunnable; import land.battle.practice.runnable.BlockRemoveRunnable;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -43,7 +43,7 @@ public class WorldListener implements Listener {
if (playerData.getPlayerState() == PlayerState.FIGHTING) { if (playerData.getPlayerState() == PlayerState.FIGHTING) {
Match match = this.plugin.getMatchManager().getMatch(player.getUniqueId()); Match match = this.plugin.getMatchManager().getMatch(player.getUniqueId());
if (match.getKit().getFlag().equals(Flag.BUILD)) { if (match.getKit().getFlag().equals(Flag.BUILD) || match.getKit().getFlag().equals(Flag.SIMULATOR) || match.getKit().getFlag().equals(Flag.GLADIATOR)) {
if (!match.getPlacedBlockLocations().contains(event.getBlock().getLocation())) { if (!match.getPlacedBlockLocations().contains(event.getBlock().getLocation())) {
event.setCancelled(true); event.setCancelled(true);
} }
@ -111,7 +111,7 @@ public class WorldListener implements Listener {
return; return;
} }
if (!match.getKit().getFlag().equals(Flag.BUILD)) { if (!match.getKit().getFlag().equals(Flag.BUILD) || !match.getKit().getFlag().equals(Flag.GLADIATOR) || !match.getKit().getFlag().equals(Flag.SIMULATOR)) {
if (match.getKit().getFlag().equals(Flag.STICK_FIGHT)) { if (match.getKit().getFlag().equals(Flag.STICK_FIGHT)) {
event.setCancelled(false); event.setCancelled(false);
@ -167,7 +167,7 @@ public class WorldListener implements Listener {
} }
if (playerData.getPlayerState() == PlayerState.FIGHTING) { if (playerData.getPlayerState() == PlayerState.FIGHTING) {
Match match = this.plugin.getMatchManager().getMatch(player.getUniqueId()); Match match = this.plugin.getMatchManager().getMatch(player.getUniqueId());
if (!match.getKit().getFlag().equals(Flag.BUILD)) { if (!match.getKit().getFlag().equals(Flag.BUILD) || !match.getKit().getFlag().equals(Flag.GLADIATOR) || !match.getKit().getFlag().equals(Flag.SIMULATOR)) {
event.setCancelled(true); event.setCancelled(true);
} else { } else {
double minX = match.getStandaloneArena().getMin().getX(); double minX = match.getStandaloneArena().getMin().getX();

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.location; package land.battle.practice.location;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/6/2021 * @since 8/6/2021
*/ */

View File

@ -1,10 +1,10 @@
package com.solexgames.practice.location.impl; package land.battle.practice.location.impl;
import com.solexgames.practice.location.WrappedLocation; import land.battle.practice.location.WrappedLocation;
import lombok.Data; import lombok.Data;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/6/2021 * @since 8/6/2021
*/ */

View File

@ -1,8 +1,8 @@
package com.solexgames.practice.location.impl.impl; package land.battle.practice.location.impl.impl;
import com.solexgames.core.CorePlugin; import com.solexgames.core.CorePlugin;
import com.solexgames.practice.location.impl.LocationImpl; import land.battle.practice.location.impl.LocationImpl;
import com.solexgames.practice.util.old.DeprecatedLocation; import land.battle.practice.util.old.DeprecatedLocation;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,12 +1,12 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.Arena; import land.battle.practice.arena.Arena;
import com.solexgames.practice.arena.type.StandaloneArena; import land.battle.practice.arena.type.StandaloneArena;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.util.FlatFile; import land.battle.practice.util.FlatFile;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.bukkit.Material; import org.bukkit.Material;

View File

@ -1,9 +1,9 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.Arena; import land.battle.practice.arena.Arena;
import com.solexgames.practice.arena.type.StandaloneArena; import land.battle.practice.arena.type.StandaloneArena;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import lombok.Getter; import lombok.Getter;

View File

@ -1,11 +1,11 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.PlayerUtil;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,10 +1,10 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.events.Event; import land.battle.practice.events.Event;
import com.solexgames.practice.events.EventState; import land.battle.practice.events.EventState;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import lombok.Setter; import lombok.Setter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@ -14,7 +14,7 @@ import java.util.*;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/14/2021 * @since 8/14/2021
*/ */

View File

@ -1,10 +1,10 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.core.CorePlugin; import com.solexgames.core.CorePlugin;
import com.solexgames.core.player.PotPlayer; import com.solexgames.core.player.PotPlayer;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -12,7 +12,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/10/2021 * @since 7/10/2021
*/ */

View File

@ -1,21 +1,21 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.practice.effects.DeathEffect; import land.battle.practice.effects.DeathEffect;
import com.solexgames.practice.effects.impl.BloodDeathEffect; import land.battle.practice.effects.impl.BloodDeathEffect;
import com.solexgames.practice.effects.impl.ExplosionDeathEffect; import land.battle.practice.effects.impl.ExplosionDeathEffect;
import com.solexgames.practice.effects.impl.LightningDeathEffect; import land.battle.practice.effects.impl.LightningDeathEffect;
import com.solexgames.practice.message.KillMessage; import land.battle.practice.message.KillMessage;
import com.solexgames.practice.message.impl.DefaultDeathMessage; import land.battle.practice.message.impl.DefaultDeathMessage;
import com.solexgames.practice.message.impl.GamerKillMessages; import land.battle.practice.message.impl.GamerKillMessages;
import com.solexgames.practice.message.impl.KitchenKillMessages; import land.battle.practice.message.impl.KitchenKillMessages;
import com.solexgames.practice.message.impl.NerdyKillMessages; import land.battle.practice.message.impl.NerdyKillMessages;
import lombok.Getter; import lombok.Getter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/26/2021 * @since 5/26/2021
*/ */

View File

@ -1,9 +1,9 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.flags.Flag; import land.battle.practice.flags.Flag;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.util.FlatFile; import land.battle.practice.util.FlatFile;
import lombok.Getter; import lombok.Getter;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;

View File

@ -1,30 +1,30 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.solexgames.core.CorePlugin; import com.solexgames.core.CorePlugin;
import com.solexgames.core.player.PotPlayer; import com.solexgames.core.player.PotPlayer;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.Arena; import land.battle.practice.arena.Arena;
import com.solexgames.practice.event.match.MatchEndEvent; import land.battle.practice.event.match.MatchEndEvent;
import com.solexgames.practice.event.match.MatchStartEvent; import land.battle.practice.event.match.MatchStartEvent;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.kit.PlayerKit; import land.battle.practice.kit.PlayerKit;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.MatchRequest; import land.battle.practice.match.MatchRequest;
import com.solexgames.practice.match.MatchState; import land.battle.practice.match.MatchState;
import com.solexgames.practice.match.snapshot.InventorySnapshot; import land.battle.practice.match.snapshot.InventorySnapshot;
import com.solexgames.practice.match.team.impl.MatchTeam; import land.battle.practice.match.team.impl.MatchTeam;
import com.solexgames.practice.message.KillMessage; import land.battle.practice.message.KillMessage;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.queue.QueueType; import land.battle.practice.queue.QueueType;
import com.solexgames.practice.runnable.RematchRunnable; import land.battle.practice.runnable.RematchRunnable;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.ItemUtil; import land.battle.practice.util.ItemUtil;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.PlayerUtil;
import com.solexgames.practice.util.TtlHashMap; import land.battle.practice.util.TtlHashMap;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import lombok.Getter; import lombok.Getter;
import net.minecraft.server.v1_8_R3.EntityPlayer; import net.minecraft.server.v1_8_R3.EntityPlayer;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.mongodb.MongoClient; import com.mongodb.MongoClient;
import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCollection;
@ -28,7 +28,7 @@ public class MongoManager {
instance = this; instance = this;
this.client = CorePlugin.getInstance().getCoreDatabase().getClient(); this.client = CorePlugin.getInstance().getCoreDatabase().getClient();
this.database = this.client.getDatabase("SGSoftware"); this.database = this.client.getDatabase("Practice");
this.players = this.database.getCollection("practice_profiles"); this.players = this.database.getCollection("practice_profiles");
this.matchOverviews = this.database.getCollection("practice_matches"); this.matchOverviews = this.database.getCollection("practice_matches");

View File

@ -1,13 +1,13 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.PracticeConstants; import land.battle.practice.PracticeConstants;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.TtlHashMap; import land.battle.practice.util.TtlHashMap;
import lombok.Getter; import lombok.Getter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,23 +1,24 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.mongodb.client.model.Filters; import com.mongodb.client.model.Filters;
import com.mongodb.client.model.ReplaceOptions; import com.mongodb.client.model.ReplaceOptions;
import com.solexgames.core.CorePlugin; import com.solexgames.core.CorePlugin;
import com.solexgames.core.player.PotPlayer; import com.solexgames.core.player.PotPlayer;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.PracticeConstants; import land.battle.practice.PracticeConstants;
import com.solexgames.practice.kit.Kit; import land.battle.practice.arena.Arena;
import com.solexgames.practice.kit.PlayerKit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.party.Party; import land.battle.practice.kit.PlayerKit;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.settings.item.ProfileOptionsItemState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.util.CC; import land.battle.practice.settings.item.ProfileOptionsItemState;
import com.solexgames.practice.util.ItemUtil; import land.battle.practice.util.CC;
import com.solexgames.practice.util.PlayerUtil; import land.battle.practice.util.ItemUtil;
import com.solexgames.practice.util.division.RankedDivision; import land.battle.practice.util.PlayerUtil;
import com.solexgames.practice.util.timer.impl.EnderpearlTimer; import land.battle.practice.util.division.RankedDivision;
import land.battle.practice.util.timer.impl.EnderpearlTimer;
import lombok.Getter; import lombok.Getter;
import me.lucko.helper.Schedulers; import me.lucko.helper.Schedulers;
import org.bson.Document; import org.bson.Document;
@ -34,6 +35,8 @@ import java.util.concurrent.ConcurrentHashMap;
@Getter @Getter
public class PlayerManager { public class PlayerManager {
private Arena lastArenaPlayed;
private static final ItemStack REMATCH_ITEM = new ItemBuilder(Material.BLAZE_POWDER) private static final ItemStack REMATCH_ITEM = new ItemBuilder(Material.BLAZE_POWDER)
.setDisplayName(CC.AQUA + "Rematch " + CC.GRAY + "(Right Click)") .setDisplayName(CC.AQUA + "Rematch " + CC.GRAY + "(Right Click)")
.addLore( .addLore(

View File

@ -1,18 +1,18 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.PlayerUtil; import com.solexgames.core.util.PlayerUtil;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.Arena; import land.battle.practice.arena.Arena;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.team.impl.MatchTeam; import land.battle.practice.match.team.impl.MatchTeam;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.queue.QueueEntry; import land.battle.practice.queue.QueueEntry;
import com.solexgames.practice.queue.QueueType; import land.battle.practice.queue.QueueType;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,7 +1,7 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.practice.match.snapshot.InventorySnapshot; import land.battle.practice.match.snapshot.InventorySnapshot;
import com.solexgames.practice.util.TtlHashMap; import land.battle.practice.util.TtlHashMap;
import lombok.Getter; import lombok.Getter;
import java.util.Map; import java.util.Map;

View File

@ -1,7 +1,7 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.location.impl.impl.AsyncLocation; import land.battle.practice.location.impl.impl.AsyncLocation;
import lombok.Getter; import lombok.Getter;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;

View File

@ -1,19 +1,19 @@
package com.solexgames.practice.managers; package land.battle.practice.managers;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.match.team.impl.MatchTeam; import land.battle.practice.match.team.impl.MatchTeam;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.runnable.TournamentBroadcastRunnable; import land.battle.practice.runnable.TournamentBroadcastRunnable;
import com.solexgames.practice.runnable.TournamentRunnable; import land.battle.practice.runnable.TournamentRunnable;
import com.solexgames.practice.tournament.Tournament; import land.battle.practice.tournament.Tournament;
import com.solexgames.practice.tournament.TournamentState; import land.battle.practice.tournament.TournamentState;
import com.solexgames.practice.tournament.TournamentTeam; import land.battle.practice.tournament.TournamentTeam;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.EXPUtil; import land.battle.practice.util.EXPUtil;
import com.solexgames.practice.util.TeamUtil; import land.battle.practice.util.TeamUtil;
import lombok.Getter; import lombok.Getter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

View File

@ -1,15 +1,15 @@
package com.solexgames.practice.match; package land.battle.practice.match;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.solexgames.core.util.SaltUtil; import com.solexgames.core.util.SaltUtil;
import com.solexgames.core.util.clickable.Clickable; import com.solexgames.core.util.clickable.Clickable;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.arena.Arena; import land.battle.practice.arena.Arena;
import com.solexgames.practice.arena.type.StandaloneArena; import land.battle.practice.arena.type.StandaloneArena;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.match.snapshot.InventorySnapshot; import land.battle.practice.match.snapshot.InventorySnapshot;
import com.solexgames.practice.match.team.impl.MatchTeam; import land.battle.practice.match.team.impl.MatchTeam;
import com.solexgames.practice.queue.QueueType; import land.battle.practice.queue.QueueType;
import io.netty.util.internal.ConcurrentSet; import io.netty.util.internal.ConcurrentSet;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.match; package land.battle.practice.match;
import com.solexgames.practice.arena.Arena; import land.battle.practice.arena.Arena;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.match; package land.battle.practice.match;
public enum MatchState { public enum MatchState {

View File

@ -1,16 +1,16 @@
package com.solexgames.practice.match.snapshot; package land.battle.practice.match.snapshot;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.PlayerUtil; import com.solexgames.core.util.PlayerUtil;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.match.Match; import land.battle.practice.match.Match;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.MathUtil; import land.battle.practice.util.MathUtil;
import com.solexgames.practice.util.StringUtil; import land.battle.practice.util.StringUtil;
import lombok.Getter; import lombok.Getter;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -103,7 +103,7 @@ public class InventorySnapshot extends Menu {
if (potionMatch) { if (potionMatch) {
this.potCount = (int) Arrays.stream(contents).filter(Objects::nonNull).map(ItemStack::getDurability).filter(d -> d == 16421).count(); this.potCount = (int) Arrays.stream(contents).filter(Objects::nonNull).map(ItemStack::getDurability).filter(d -> d == 16421).count();
this.buttonMap.put(48, new ItemBuilder(Material.POTION) this.buttonMap.put(49, new ItemBuilder(Material.POTION)
.setDisplayName(CC.AQUA + "Potion Statistics") .setDisplayName(CC.AQUA + "Potion Statistics")
.setDurability(16421) .setDurability(16421)
.setAmount(this.potCount) .setAmount(this.potCount)
@ -116,7 +116,7 @@ public class InventorySnapshot extends Menu {
} else if (soupMatch) { } else if (soupMatch) {
this.soupCount = (int) Arrays.stream(contents).filter(Objects::nonNull).map(ItemStack::getType).filter(d -> d == Material.MUSHROOM_SOUP).count(); this.soupCount = (int) Arrays.stream(contents).filter(Objects::nonNull).map(ItemStack::getType).filter(d -> d == Material.MUSHROOM_SOUP).count();
this.buttonMap.put(48, new ItemBuilder(Material.MUSHROOM_SOUP) this.buttonMap.put(49, new ItemBuilder(Material.MUSHROOM_SOUP)
.setDisplayName(CC.GRAY + "Soups Left: " + CC.WHITE + this.soupCount) .setDisplayName(CC.GRAY + "Soups Left: " + CC.WHITE + this.soupCount)
.setAmount(this.soupCount) .setAmount(this.soupCount)
.toButton() .toButton()
@ -125,7 +125,7 @@ public class InventorySnapshot extends Menu {
final double roundedHealth = Math.round(health / 2.0 * 2.0) / 2.0; final double roundedHealth = Math.round(health / 2.0 * 2.0) / 2.0;
this.buttonMap.put(45, new ItemBuilder(Material.SPECKLED_MELON) this.buttonMap.put(47, new ItemBuilder(Material.SPECKLED_MELON)
.setDisplayName(CC.GRAY + "Health: " + CC.AQUA + roundedHealth) .setDisplayName(CC.GRAY + "Health: " + CC.AQUA + roundedHealth)
.setAmount((int) roundedHealth) .setAmount((int) roundedHealth)
.toButton() .toButton()
@ -133,38 +133,32 @@ public class InventorySnapshot extends Menu {
final double roundedFood = Math.round(health / 2.0 * 2.0) / 2.0; final double roundedFood = Math.round(health / 2.0 * 2.0) / 2.0;
this.buttonMap.put(46, new ItemBuilder(Material.COOKED_BEEF) this.buttonMap.put(48, new ItemBuilder(Material.COOKED_BEEF)
.setDisplayName(CC.GRAY + "Hunger: " + CC.AQUA + roundedFood) .setDisplayName(CC.GRAY + "Hunger: " + CC.AQUA + roundedFood)
.setAmount((int) roundedFood) .setAmount((int) roundedFood)
.toButton() .toButton()
); );
this.buttonMap.put(47, new ItemBuilder(Material.POTION)
.setDisplayName(CC.AQUA + "Potion Effects")
.setAmount(potionEffectStrings.size())
.addLore(
potionEffectStrings.isEmpty() ? InventorySnapshot.NO_EFFECT_LIST : potionEffectStrings
)
.toButton()
);
this.longestCombo = playerData.getLongestCombo(); this.longestCombo = playerData.getLongestCombo();
this.totalHits = playerData.getHits(); this.totalHits = playerData.getHits();
final int ping = PlayerUtil.getPing(player); final int ping = PlayerUtil.getPing(player);
this.buttonMap.put(49, new ItemBuilder(Material.PAPER) this.buttonMap.put(50, new ItemBuilder(Material.PAPER)
.setDisplayName(CC.AQUA + "Match Statistics") .setDisplayName(CC.AQUA + "Match Statistics")
.addLore( .addLore(
CC.GRAY + "Longest Combo: " + CC.WHITE + playerData.getLongestCombo() + " hit" + (playerData.getLongestCombo() > 1 ? "s" : ""), CC.GRAY + "Longest Combo: " + CC.WHITE + playerData.getLongestCombo() + " hit" + (playerData.getLongestCombo() > 1 ? "s" : ""),
CC.GRAY + "Total Hits: " + CC.WHITE + playerData.getHits() + " hit" + (playerData.getHits() > 1 ? "s" : ""), CC.GRAY + "Total Hits: " + CC.WHITE + playerData.getHits() + " hit" + (playerData.getHits() > 1 ? "s" : ""),
CC.GRAY + "Blocked Hits: " + CC.WHITE + playerData.getBlockedHits() + " hit" + (playerData.getBlockedHits() > 1 ? "s" : ""),
CC.GRAY + "Critical Hits: " + CC.WHITE + playerData.getCriticalHits() + " hit" + (playerData.getCriticalHits() > 1 ? "s" : ""),
CC.GRAY + "Average Ping: " + CC.WHITE + (ping == 1 ? "Unknown" : ping + " ms") CC.GRAY + "Average Ping: " + CC.WHITE + (ping == 1 ? "Unknown" : ping + " ms")
) )
.toButton() .toButton()
); );
if (!match.isParty()) { if (!match.isParty()) {
this.buttonMap.put(53, new ItemBuilder(Material.LEVER) for (int i = 0; i < 2; i++) {
this.buttonMap.put(i == 0 ? 53 : 45, new ItemBuilder(Material.PAPER)
.setDisplayName(Color.MAIN_COLOR + "Opponent's Inventory") .setDisplayName(Color.MAIN_COLOR + "Opponent's Inventory")
.addLore( .addLore(
CC.GRAY + "See your opponent's inventory", CC.GRAY + "See your opponent's inventory",
@ -190,6 +184,7 @@ public class InventorySnapshot extends Menu {
); );
} }
} }
}
@Override @Override
public String getTitle(Player player) { public String getTitle(Player player) {

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.match.team; package land.battle.practice.match.team;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,6 +1,6 @@
package com.solexgames.practice.match.team.impl; package land.battle.practice.match.team.impl;
import com.solexgames.practice.match.team.KillableTeam; import land.battle.practice.match.team.KillableTeam;
import lombok.Getter; import lombok.Getter;
import java.util.List; import java.util.List;

View File

@ -1,11 +1,11 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.HashMap; import java.util.HashMap;
@ -13,7 +13,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/7/2021 * @since 7/7/2021
*/ */

View File

@ -1,10 +1,10 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.pagination.PaginatedMenu; import com.solexgames.core.util.external.pagination.PaginatedMenu;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.division.RankedDivision; import land.battle.practice.util.division.RankedDivision;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -13,7 +13,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/12/2021 * @since 8/12/2021
*/ */

View File

@ -1,10 +1,10 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -13,7 +13,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/15/2021 * @since 5/15/2021
*/ */

View File

@ -1,18 +1,18 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.queue.QueueType; import land.battle.practice.queue.QueueType;
import com.solexgames.practice.runnable.LeaderboardUpdateRunnable; import land.battle.practice.runnable.LeaderboardUpdateRunnable;
import com.solexgames.practice.runnable.cache.StatusCache; import land.battle.practice.runnable.cache.StatusCache;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -25,7 +25,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.*; import java.util.*;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/15/2021 * @since 5/15/2021
*/ */

View File

@ -1,11 +1,11 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -14,7 +14,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/7/2021 * @since 7/7/2021
*/ */

View File

@ -1,4 +1,4 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.cryptomorin.xseries.XMaterial; import com.cryptomorin.xseries.XMaterial;
import com.solexgames.core.menu.impl.SettingsMenu; import com.solexgames.core.menu.impl.SettingsMenu;
@ -6,13 +6,13 @@ import com.solexgames.core.util.Color;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.player.PlayerState; import land.battle.practice.player.PlayerState;
import com.solexgames.practice.queue.QueueType; import land.battle.practice.queue.QueueType;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -27,7 +27,7 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/15/2021 * @since 5/15/2021
*/ */

View File

@ -1,15 +1,15 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.player.ranks.Rank; import com.solexgames.core.player.ranks.Rank;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.runnable.LeaderboardUpdateRunnable; import land.battle.practice.runnable.LeaderboardUpdateRunnable;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.division.RankedDivision; import land.battle.practice.util.division.RankedDivision;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -21,7 +21,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.*; import java.util.*;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/15/2021 * @since 5/15/2021
*/ */

View File

@ -1,11 +1,11 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -13,7 +13,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 7/29/2021 * @since 7/29/2021
*/ */

View File

@ -1,12 +1,12 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.Color; import com.solexgames.core.util.Color;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.pagination.PaginatedMenu; import com.solexgames.core.util.external.pagination.PaginatedMenu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.party.Party; import land.battle.practice.party.Party;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -18,7 +18,7 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/17/2021 * @since 5/17/2021
*/ */

View File

@ -1,10 +1,10 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.pagination.PaginatedMenu; import com.solexgames.core.util.external.pagination.PaginatedMenu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -14,7 +14,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 8/16/2021 * @since 8/16/2021
*/ */

View File

@ -1,14 +1,14 @@
package com.solexgames.practice.menu; package land.battle.practice.menu;
import com.solexgames.core.util.builder.ItemBuilder; import com.solexgames.core.util.builder.ItemBuilder;
import com.solexgames.core.util.external.Button; import com.solexgames.core.util.external.Button;
import com.solexgames.core.util.external.Menu; import com.solexgames.core.util.external.Menu;
import com.solexgames.practice.Practice; import land.battle.practice.Practice;
import com.solexgames.practice.challenges.tracker.KillStreakDataTracker; import land.battle.practice.challenges.tracker.KillStreakDataTracker;
import com.solexgames.practice.kit.Kit; import land.battle.practice.kit.Kit;
import com.solexgames.practice.player.PlayerData; import land.battle.practice.player.PlayerData;
import com.solexgames.practice.util.CC; import land.battle.practice.util.CC;
import com.solexgames.practice.util.division.RankedDivision; import land.battle.practice.util.division.RankedDivision;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -18,7 +18,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.*; import java.util.*;
/** /**
* @author GrowlyX * @author BattleLand Team
* @since 5/15/2021 * @since 5/15/2021
*/ */

Some files were not shown because too many files have changed in this diff Show More