Initial commit.
This commit is contained in:
@ -1,5 +1,12 @@
|
||||
package rip.tilly.bedwars;
|
||||
package com.loganmagnan.bedwars;
|
||||
|
||||
import com.loganmagnan.bedwars.listeners.*;
|
||||
import com.loganmagnan.bedwars.listeners.game.*;
|
||||
import com.loganmagnan.bedwars.managers.GameManager;
|
||||
import com.loganmagnan.bedwars.managers.arena.ArenaManager;
|
||||
import com.loganmagnan.bedwars.managers.queue.QueueManager;
|
||||
import com.loganmagnan.bedwars.providers.scoreboard.ScoreboardProvider;
|
||||
import com.loganmagnan.bedwars.utils.menusystem.PlayerMenuUtil;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Chunk;
|
||||
@ -8,37 +15,25 @@ import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import rip.tilly.bedwars.customitems.bridgeegg.BridgeEggListener;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.listeners.*;
|
||||
import rip.tilly.bedwars.listeners.game.*;
|
||||
import rip.tilly.bedwars.managers.CommandManager;
|
||||
import rip.tilly.bedwars.managers.GameManager;
|
||||
import rip.tilly.bedwars.managers.PlayerDataManager;
|
||||
import rip.tilly.bedwars.managers.SpawnManager;
|
||||
import rip.tilly.bedwars.managers.arena.ArenaManager;
|
||||
import rip.tilly.bedwars.managers.arena.chunk.ChunkClearingManager;
|
||||
import rip.tilly.bedwars.managers.arena.chunk.ChunkManager;
|
||||
import rip.tilly.bedwars.managers.hotbar.HotbarManager;
|
||||
import rip.tilly.bedwars.managers.mongo.MongoManager;
|
||||
import rip.tilly.bedwars.managers.party.PartyManager;
|
||||
import rip.tilly.bedwars.managers.queue.QueueManager;
|
||||
import rip.tilly.bedwars.providers.placeholderapi.PlaceholderAPIProvider;
|
||||
import rip.tilly.bedwars.providers.scoreboard.ScoreboardProvider;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.aether.Aether;
|
||||
import rip.tilly.bedwars.utils.config.file.Config;
|
||||
import rip.tilly.bedwars.utils.menusystem.PlayerMenuUtil;
|
||||
|
||||
import com.loganmagnan.bedwars.customitems.bridgeegg.BridgeEggListener;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.managers.CommandManager;
|
||||
import com.loganmagnan.bedwars.managers.PlayerDataManager;
|
||||
import com.loganmagnan.bedwars.managers.SpawnManager;
|
||||
import com.loganmagnan.bedwars.managers.arena.chunk.ChunkClearingManager;
|
||||
import com.loganmagnan.bedwars.managers.arena.chunk.ChunkManager;
|
||||
import com.loganmagnan.bedwars.managers.hotbar.HotbarManager;
|
||||
import com.loganmagnan.bedwars.managers.mongo.MongoManager;
|
||||
import com.loganmagnan.bedwars.managers.party.PartyManager;
|
||||
import com.loganmagnan.bedwars.providers.placeholderapi.PlaceholderAPIProvider;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.aether.Aether;
|
||||
import com.loganmagnan.bedwars.utils.config.file.Config;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Created by Lucanius & Trixkz
|
||||
* Project: BedWars
|
||||
*/
|
||||
@Getter
|
||||
public final class BedWars extends JavaPlugin {
|
||||
|
||||
@ -49,12 +44,12 @@ public final class BedWars extends JavaPlugin {
|
||||
private MongoManager mongoManager;
|
||||
private ChunkClearingManager chunkClearingManager;
|
||||
private PlayerDataManager playerDataManager;
|
||||
private SpawnManager spawnManager;
|
||||
private ArenaManager arenaManager;
|
||||
private GameManager gameManager;
|
||||
private SpawnManager spawnManager;
|
||||
private ChunkManager chunkManager;
|
||||
private HotbarManager hotbarManager;
|
||||
private CommandManager commandManager;
|
||||
private GameManager gameManager;
|
||||
private PartyManager partyManager;
|
||||
private QueueManager queueManager;
|
||||
|
||||
@ -70,8 +65,8 @@ public final class BedWars extends JavaPlugin {
|
||||
this.arenasConfig = new Config("arenas", this);
|
||||
|
||||
Bukkit.getConsoleSender().sendMessage("------------------------------------------------");
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&dBedWars &8- &av" + getDescription().getVersion()));
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&7Made on &dTilly RIP &7by &eTrixkz &7& &eLucanius"));
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&dzBedWars &8- &av" + this.getDescription().getVersion()));
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&7Made by &eLoganM Development"));
|
||||
Bukkit.getConsoleSender().sendMessage("------------------------------------------------");
|
||||
|
||||
this.loadManagers();
|
||||
@ -123,12 +118,12 @@ public final class BedWars extends JavaPlugin {
|
||||
this.mongoManager = new MongoManager();
|
||||
this.chunkClearingManager = new ChunkClearingManager();
|
||||
this.playerDataManager = new PlayerDataManager();
|
||||
this.spawnManager = new SpawnManager();
|
||||
this.arenaManager = new ArenaManager();
|
||||
this.gameManager = new GameManager();
|
||||
this.spawnManager = new SpawnManager();
|
||||
this.chunkManager = new ChunkManager();
|
||||
this.hotbarManager = new HotbarManager();
|
||||
this.commandManager = new CommandManager();
|
||||
this.gameManager = new GameManager();
|
||||
this.partyManager = new PartyManager();
|
||||
this.queueManager = new QueueManager();
|
||||
}
|
||||
@ -143,7 +138,7 @@ public final class BedWars extends JavaPlugin {
|
||||
}
|
||||
|
||||
private void loadRunnables() {
|
||||
new Aether(this, new ScoreboardProvider());
|
||||
// new Aether(this, new ScoreboardProvider());
|
||||
}
|
||||
|
||||
public PlayerMenuUtil getPlayerMenuUtil(Player player) {
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.commands;
|
||||
package com.loganmagnan.bedwars.commands;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@ -1,14 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.menus.arena.ArenaManageMenu;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.menus.arena.ArenaManagerMenu;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.menusystem.menu.UpgradesMenu;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
public class ArenaCommand implements CommandExecutor {
|
||||
|
||||
@ -168,7 +167,7 @@ public class ArenaCommand implements CommandExecutor {
|
||||
return true;
|
||||
}
|
||||
|
||||
new ArenaManagerMenu().openMenu(player);
|
||||
new ArenaManageMenu().openMenu(player);
|
||||
|
||||
break;
|
||||
case "generate":
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.runnables.ArenaCommandRunnable;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.runnables.ArenaCommandRunnable;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,11 +1,11 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class LevelCommand implements CommandExecutor {
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.managers.party.Party;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.managers.party.Party;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -18,7 +18,7 @@ public class InfoCommand extends BaseCommand {
|
||||
@Override
|
||||
public void executeAs(CommandSender sender, Command cmd, String label, String[] args) {
|
||||
Player player = (Player) sender;
|
||||
|
||||
|
||||
if (this.main.getPartyManager().getParty(player.getUniqueId()) == null) {
|
||||
player.sendMessage(CC.translate("&cYou are not in a party!"));
|
||||
return;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,11 +1,11 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class PartyCommand implements CommandExecutor {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.managers.party.Party;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.managers.party.Party;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class SetSpawnCommand implements CommandExecutor {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.spectate;
|
||||
package com.loganmagnan.bedwars.commands.spectate;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
public class SpectateCommand implements CommandExecutor {
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.toggle;
|
||||
package com.loganmagnan.bedwars.commands.toggle;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerSettings;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerSettings;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.toggle;
|
||||
package com.loganmagnan.bedwars.commands.toggle;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerSettings;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerSettings;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.toggle;
|
||||
package com.loganmagnan.bedwars.commands.toggle;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class ToggleCommand implements CommandExecutor {
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,11 +1,11 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class XpCommand implements CommandExecutor {
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.customitems.bridgeegg;
|
||||
package com.loganmagnan.bedwars.customitems.bridgeegg;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.entity.Egg;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.ProjectileHitEvent;
|
||||
import org.bukkit.event.entity.ProjectileLaunchEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
@ -1,5 +1,7 @@
|
||||
package rip.tilly.bedwars.customitems.bridgeegg;
|
||||
package com.loganmagnan.bedwars.customitems.bridgeegg;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Effect;
|
||||
import org.bukkit.Location;
|
||||
@ -9,9 +11,7 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Egg;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
@Getter
|
||||
@SuppressWarnings("WeakerAccess")
|
||||
@ -1,15 +1,15 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
public class PlaceTower {
|
||||
|
||||
private final BedWars plugin = BedWars.getInstance();
|
||||
private BedWars plugin = BedWars.getInstance();
|
||||
|
||||
public PlaceTower(Block block, String xyz, PlayerTeam playerTeam, Player player, boolean ladder, int ladderData) {
|
||||
int x = Integer.parseInt(xyz.split(", ")[0]);
|
||||
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,8 +1,8 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import lombok.Getter;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
@Getter
|
||||
public class GameEndEvent extends GameEvent {
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
@ -1,6 +1,6 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
public class GameStartEvent extends GameEvent {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import lombok.Getter;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -1,5 +1,14 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
import com.loganmagnan.bedwars.game.arena.CopiedArena;
|
||||
import com.loganmagnan.bedwars.generators.Generator;
|
||||
import com.loganmagnan.bedwars.generators.GeneratorTier;
|
||||
import com.loganmagnan.bedwars.generators.GeneratorType;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.TimeUtils;
|
||||
import io.netty.util.internal.ConcurrentSet;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
@ -12,15 +21,7 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Villager;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.github.paperspigot.Title;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.game.arena.CopiedArena;
|
||||
import rip.tilly.bedwars.generators.Generator;
|
||||
import rip.tilly.bedwars.generators.GeneratorTier;
|
||||
import rip.tilly.bedwars.generators.GeneratorType;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import rip.tilly.bedwars.utils.TimeUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
@ -37,9 +38,9 @@ public class Game {
|
||||
private final Set<Integer> runnables = new HashSet<>();
|
||||
private final Set<ItemStack> droppedItems = new ConcurrentSet<>();
|
||||
|
||||
private final List<GameTeam> teams;
|
||||
private final Arena arena;
|
||||
private final GameType gameType;
|
||||
private final List<GameTeam> teams;
|
||||
|
||||
private final UUID gameId = UUID.randomUUID();
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
public enum GameState {
|
||||
|
||||
STARTING,
|
||||
FIGHTING,
|
||||
ENDING
|
||||
ENDING;
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.game.arena;
|
||||
package com.loganmagnan.bedwars.game.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.game.arena;
|
||||
package com.loganmagnan.bedwars.game.arena;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -36,5 +36,4 @@ public class CopiedArena {
|
||||
private List<CustomLocation> teamGenerators = new ArrayList<>();
|
||||
private List<CustomLocation> diamondGenerators = new ArrayList<>();
|
||||
private List<CustomLocation> emeraldGenerators = new ArrayList<>();
|
||||
|
||||
}
|
||||
@ -1,15 +1,14 @@
|
||||
package rip.tilly.bedwars.generators;
|
||||
package com.loganmagnan.bedwars.generators;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.ArmorStand;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.bukkit.util.EulerAngle;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class Generator {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.generators;
|
||||
package com.loganmagnan.bedwars.generators;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.generators;
|
||||
package com.loganmagnan.bedwars.generators;
|
||||
|
||||
public enum GeneratorType {
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.menu.Button;
|
||||
import com.loganmagnan.bedwars.utils.menu.Menu;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
@ -9,9 +12,6 @@ import org.bukkit.event.inventory.ClickType;
|
||||
import org.bukkit.event.inventory.InventoryAction;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.inventory.InventoryCloseEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.utils.menu.Button;
|
||||
import rip.tilly.bedwars.utils.menu.Menu;
|
||||
|
||||
public class ButtonListener implements Listener {
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.menus.settings.SettingsMenu;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
@ -14,14 +17,11 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.material.TrapDoor;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import rip.tilly.bedwars.menus.queue.PlayAGameMenu;
|
||||
import rip.tilly.bedwars.menus.settings.SettingsMenu;
|
||||
import rip.tilly.bedwars.menus.shop.blocks.BlocksMenu;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.menusystem.menu.UpgradesMenu;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import com.loganmagnan.bedwars.menus.queue.PlayAGameMenu;
|
||||
import com.loganmagnan.bedwars.menus.shop.blocks.BlocksMenu;
|
||||
import com.loganmagnan.bedwars.utils.menusystem.menu.UpgradesMenu;
|
||||
|
||||
public class InteractListener implements Listener {
|
||||
|
||||
@ -29,18 +29,24 @@ public class InteractListener implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
|
||||
PlayerData playerData = this.plugin.getPlayerDataManager().getPlayerData(player.getUniqueId());
|
||||
|
||||
if (playerData.getPlayerState() == PlayerState.PLAYING) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (player.getGameMode() == GameMode.CREATIVE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.getAction() == Action.PHYSICAL && event.getClickedBlock().getType() == Material.SOIL) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Player player = event.getPlayer();
|
||||
|
||||
if (player.getGameMode() == GameMode.CREATIVE) {
|
||||
if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -59,16 +65,13 @@ public class InteractListener implements Listener {
|
||||
}
|
||||
|
||||
ItemStack itemStack = player.getItemInHand();
|
||||
|
||||
if (!event.hasItem() || itemStack == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
PlayerData playerData = this.plugin.getPlayerDataManager().getPlayerData(player.getUniqueId());
|
||||
if (playerData.getPlayerState() == PlayerState.PLAYING) {
|
||||
return;
|
||||
}
|
||||
HotbarItem hotbarItem = HotbarItem.getItemByItemStack(itemStack);
|
||||
|
||||
HotbarItem hotbarItem = HotbarItem.getItemByItemStack(player.getItemInHand());
|
||||
if (hotbarItem == null) {
|
||||
return;
|
||||
}
|
||||
@ -95,7 +98,7 @@ public class InteractListener implements Listener {
|
||||
|
||||
break;
|
||||
case COSMETICS_MENU:
|
||||
new BlocksMenu().openMenu(player);
|
||||
// new BlocksMenu().openMenu(player);
|
||||
// open cosmetics menu
|
||||
break;
|
||||
case PREFERENCES_MENU:
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.menusystem.Menu;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.inventory.InventoryHolder;
|
||||
import rip.tilly.bedwars.utils.menusystem.Menu;
|
||||
|
||||
public class MenuListener implements Listener {
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.managers.party.Party;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerSettings;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.managers.party.Party;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerSettings;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class PartyChatListener implements Listener {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.*;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
|
||||
public class PlayerDataListener implements Listener {
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -13,9 +16,6 @@ import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.inventory.InventoryType;
|
||||
import org.bukkit.event.player.PlayerToggleFlightEvent;
|
||||
import org.bukkit.event.weather.WeatherChangeEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
|
||||
public class RandomListeners implements Listener {
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.events.PlayerKillEvent;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.GameState;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -8,13 +15,6 @@ import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.PlayerKillEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class DamageListener implements Listener {
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.github.paperspigot.Title;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.GameEndEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import rip.tilly.bedwars.generators.Generator;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.PlayerUtil;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.events.GameEndEvent;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.GameState;
|
||||
import com.loganmagnan.bedwars.generators.Generator;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.PlayerUtil;
|
||||
|
||||
public class GameEndListener implements Listener {
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.events.GameStartEvent;
|
||||
import com.loganmagnan.bedwars.runnables.GameRunnable;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.GameStartEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.arena.CopiedArena;
|
||||
import rip.tilly.bedwars.generators.Generator;
|
||||
import rip.tilly.bedwars.generators.GeneratorType;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.runnables.GameRunnable;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import rip.tilly.bedwars.utils.PlayerUtil;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.arena.CopiedArena;
|
||||
import com.loganmagnan.bedwars.generators.Generator;
|
||||
import com.loganmagnan.bedwars.generators.GeneratorType;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.PlayerUtil;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
@ -105,6 +105,6 @@ public class GameStartListener implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
new GameRunnable(game).runTaskTimer(this.plugin, 20, 20);
|
||||
new GameRunnable(game).runTaskTimer(this.plugin, 20L, 20L);
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,9 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -8,16 +12,11 @@ import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.PlayerKillEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.upgrades.Upgrade;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.LocationUtils;
|
||||
import com.loganmagnan.bedwars.events.PlayerKillEvent;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.GameState;
|
||||
import com.loganmagnan.bedwars.upgrades.Upgrade;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class MovementListener implements Listener {
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.playerdata.currentgame.PlayerCurrentGameData;
|
||||
import com.loganmagnan.bedwars.runnables.RespawnRunnable;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.PlayerKillEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData;
|
||||
import rip.tilly.bedwars.runnables.RespawnRunnable;
|
||||
import com.loganmagnan.bedwars.events.PlayerKillEvent;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
public class PlayerKillListener implements Listener {
|
||||
|
||||
@ -1,5 +1,15 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.types.TowerEast;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.types.TowerNorth;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.types.TowerSouth;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.types.TowerWest;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.GameState;
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Entity;
|
||||
@ -13,16 +23,6 @@ import org.bukkit.event.block.BlockPlaceEvent;
|
||||
import org.bukkit.event.player.PlayerDropItemEvent;
|
||||
import org.bukkit.event.player.PlayerPickupItemEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.types.TowerEast;
|
||||
import rip.tilly.bedwars.customitems.popuptower.types.TowerNorth;
|
||||
import rip.tilly.bedwars.customitems.popuptower.types.TowerSouth;
|
||||
import rip.tilly.bedwars.customitems.popuptower.types.TowerWest;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
|
||||
public class WorldListener implements Listener {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.managers;
|
||||
package com.loganmagnan.bedwars.managers;
|
||||
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.arena.ArenaCommand;
|
||||
import rip.tilly.bedwars.commands.level.LevelCommand;
|
||||
import rip.tilly.bedwars.commands.party.PartyCommand;
|
||||
import rip.tilly.bedwars.commands.setspawn.SetSpawnCommand;
|
||||
import rip.tilly.bedwars.commands.spectate.SpectateCommand;
|
||||
import rip.tilly.bedwars.commands.toggle.ToggleCommand;
|
||||
import rip.tilly.bedwars.commands.xp.XpCommand;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.party.PartyCommand;
|
||||
import com.loganmagnan.bedwars.commands.arena.ArenaCommand;
|
||||
import com.loganmagnan.bedwars.commands.level.LevelCommand;
|
||||
import com.loganmagnan.bedwars.commands.setspawn.SetSpawnCommand;
|
||||
import com.loganmagnan.bedwars.commands.spectate.SpectateCommand;
|
||||
import com.loganmagnan.bedwars.commands.toggle.ToggleCommand;
|
||||
import com.loganmagnan.bedwars.commands.xp.XpCommand;
|
||||
|
||||
public class CommandManager {
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
package rip.tilly.bedwars.managers;
|
||||
package com.loganmagnan.bedwars.managers;
|
||||
|
||||
import com.loganmagnan.bedwars.events.GameStartEvent;
|
||||
import com.loganmagnan.bedwars.game.*;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Color;
|
||||
import org.bukkit.Material;
|
||||
@ -9,20 +11,18 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.GameEndEvent;
|
||||
import rip.tilly.bedwars.events.GameStartEvent;
|
||||
import rip.tilly.bedwars.game.*;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData;
|
||||
import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
|
||||
import rip.tilly.bedwars.upgrades.Upgrade;
|
||||
import rip.tilly.bedwars.utils.ItemBuilder;
|
||||
import rip.tilly.bedwars.utils.PlayerUtil;
|
||||
import rip.tilly.bedwars.utils.TtlHashMap;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.events.GameEndEvent;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.playerdata.currentgame.PlayerCurrentGameData;
|
||||
import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
|
||||
import com.loganmagnan.bedwars.upgrades.Upgrade;
|
||||
import com.loganmagnan.bedwars.utils.ItemBuilder;
|
||||
import com.loganmagnan.bedwars.utils.PlayerUtil;
|
||||
import com.loganmagnan.bedwars.utils.TtlHashMap;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.managers;
|
||||
package com.loganmagnan.bedwars.managers;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.PlayerUtil;
|
||||
import com.mongodb.client.MongoCursor;
|
||||
import com.mongodb.client.model.Filters;
|
||||
import com.mongodb.client.model.UpdateOptions;
|
||||
import lombok.Getter;
|
||||
import org.bson.Document;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.PlayerUtil;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.managers;
|
||||
package com.loganmagnan.bedwars.managers;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ -1,15 +1,15 @@
|
||||
package rip.tilly.bedwars.managers.arena;
|
||||
package com.loganmagnan.bedwars.managers.arena;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.game.arena.CopiedArena;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import rip.tilly.bedwars.utils.config.file.Config;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
import com.loganmagnan.bedwars.game.arena.CopiedArena;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.config.file.Config;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
@ -1,15 +1,15 @@
|
||||
package rip.tilly.bedwars.managers.arena.chunk;
|
||||
package com.loganmagnan.bedwars.managers.arena.chunk;
|
||||
|
||||
import com.loganmagnan.bedwars.game.arena.CopiedArena;
|
||||
import com.loganmagnan.bedwars.managers.arena.chunk.data.BedWarsChunk;
|
||||
import com.loganmagnan.bedwars.managers.arena.chunk.data.BedWarsChunkData;
|
||||
import com.loganmagnan.bedwars.managers.arena.chunk.data.BedWarsNMSUtil;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.cuboid.Cuboid;
|
||||
import net.minecraft.server.v1_8_R3.Chunk;
|
||||
import net.minecraft.server.v1_8_R3.ChunkSection;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_8_R3.CraftChunk;
|
||||
import rip.tilly.bedwars.game.arena.CopiedArena;
|
||||
import rip.tilly.bedwars.managers.arena.chunk.data.BedWarsChunk;
|
||||
import rip.tilly.bedwars.managers.arena.chunk.data.BedWarsChunkData;
|
||||
import rip.tilly.bedwars.managers.arena.chunk.data.BedWarsNMSUtil;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.cuboid.Cuboid;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
@ -1,11 +1,11 @@
|
||||
package rip.tilly.bedwars.managers.arena.chunk;
|
||||
package com.loganmagnan.bedwars.managers.arena.chunk;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
import com.loganmagnan.bedwars.game.arena.CopiedArena;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.game.arena.CopiedArena;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
public class ChunkManager {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.managers.arena.chunk.data;
|
||||
package com.loganmagnan.bedwars.managers.arena.chunk.data;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.managers.arena.chunk.data;
|
||||
package com.loganmagnan.bedwars.managers.arena.chunk.data;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.managers.arena.chunk.data;
|
||||
package com.loganmagnan.bedwars.managers.arena.chunk.data;
|
||||
|
||||
import lombok.SneakyThrows;
|
||||
import net.minecraft.server.v1_8_R3.Chunk;
|
||||
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.managers.hotbar;
|
||||
package com.loganmagnan.bedwars.managers.hotbar;
|
||||
|
||||
import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Material;
|
||||
import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.ItemUtil;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.ItemUtil;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -27,27 +27,27 @@ public class HotbarManager {
|
||||
private void loadSpawnItems() {
|
||||
spawnItems.add(new HotbarItem(
|
||||
ItemUtil.createUnbreakableItem(
|
||||
Material.IRON_SWORD, CC.translate("&e&l» &dPlay A Game &e&l«"), 1, (short) 0
|
||||
Material.IRON_SWORD, CC.translate("&7&l» &bPlay A Game &7&l«"), 1, (short) 0
|
||||
), 0, true, "QUEUE_MENU")
|
||||
);
|
||||
spawnItems.add(new HotbarItem(
|
||||
ItemUtil.createUnbreakableItem(
|
||||
Material.NAME_TAG, CC.translate("&e&l» &dCreate Party &e&l«"), 1, (short) 0
|
||||
Material.NAME_TAG, CC.translate("&7&l» &bCreate Party &7&l«"), 1, (short) 0
|
||||
), 1, true, "CREATE_PARTY")
|
||||
);
|
||||
spawnItems.add(new HotbarItem(
|
||||
ItemUtil.createUnbreakableItem(
|
||||
Material.EMERALD, CC.translate("&e&l» &dCosmetics &e&l«"), 1, (short) 0
|
||||
Material.EMERALD, CC.translate("&7&l» &bCosmetics &7&l«"), 1, (short) 0
|
||||
), 4, true, "COSMETICS_MENU")
|
||||
);
|
||||
spawnItems.add(new HotbarItem(
|
||||
ItemUtil.createUnbreakableItem(
|
||||
Material.BOOK, CC.translate("&e&l» &dHotbar Preference &e&l«"), 1, (short) 0
|
||||
Material.BOOK, CC.translate("&7&l» &bHotBar Preferences &7&l«"), 1, (short) 0
|
||||
), 7, true, "PREFERENCES_MENU")
|
||||
);
|
||||
spawnItems.add(new HotbarItem(
|
||||
ItemUtil.createUnbreakableItem(
|
||||
Material.WATCH, CC.translate("&e&l» &dSettings &e&l«"), 1, (short) 0
|
||||
Material.WATCH, CC.translate("&7&l» &bSettings &7&l«"), 1, (short) 0
|
||||
), 8, true, "SETTINGS_MENU")
|
||||
);
|
||||
}
|
||||
@ -55,7 +55,7 @@ public class HotbarManager {
|
||||
private void loadQueueItems() {
|
||||
queueItems.add(new HotbarItem(
|
||||
ItemUtil.createUnbreakableItem(
|
||||
Material.INK_SACK, CC.translate("&e&l» &cLeave Queue &e&l«"), 1, (short) 1
|
||||
Material.INK_SACK, CC.translate("&7&l» &cLeave Queue &7&l«"), 1, (short) 1
|
||||
), 8, true, "LEAVE_QUEUE")
|
||||
);
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.managers.hotbar.impl;
|
||||
package com.loganmagnan.bedwars.managers.hotbar.impl;
|
||||
|
||||
public enum ActionType {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.managers.hotbar.impl;
|
||||
package com.loganmagnan.bedwars.managers.hotbar.impl;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import lombok.Getter;
|
||||
@ -0,0 +1,115 @@
|
||||
package com.loganmagnan.bedwars.managers.mongo;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.config.file.Config;
|
||||
import com.mongodb.MongoClient;
|
||||
import com.mongodb.MongoClientURI;
|
||||
import com.mongodb.MongoCredential;
|
||||
import com.mongodb.ServerAddress;
|
||||
import com.mongodb.client.FindIterable;
|
||||
import com.mongodb.client.MongoCollection;
|
||||
import com.mongodb.client.MongoCursor;
|
||||
import com.mongodb.client.MongoDatabase;
|
||||
import lombok.Getter;
|
||||
import org.bson.Document;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
public class MongoManager {
|
||||
|
||||
private final BedWars plugin = BedWars.getInstance();
|
||||
private final MongoManager instance;
|
||||
|
||||
private final FileConfiguration config = this.plugin.getMainConfig().getConfig();
|
||||
|
||||
private MongoClient mongoClient;
|
||||
private MongoDatabase mongoDatabase;
|
||||
|
||||
private final boolean uriMode = config.getBoolean("MONGO.URI-MODE");
|
||||
private final String host = config.getString("MONGO.NORMAL.HOST");
|
||||
private final int port = config.getInt("MONGO.NORMAL.PORT");
|
||||
private final String database = config.getString("MONGO.NORMAL.DATABASE");
|
||||
private final boolean auth = config.getBoolean("MONGO.NORMAL.AUTH.ENABLED");
|
||||
private final String user = config.getString("MONGO.NORMAL.AUTH.USERNAME");
|
||||
private final String password = config.getString("MONGO.NORMAL.AUTH.PASSWORD");
|
||||
private final String authDatabase = config.getString("MONGO.NORMAL.AUTH.AUTH-DATABASE");
|
||||
private final String uriString = config.getString("MONGO.URI.CONNECTION-STRING");
|
||||
private final String uriDatabase = config.getString("MONGO.URI.DATABASE-NAME");
|
||||
|
||||
private boolean connected;
|
||||
|
||||
private MongoCollection<Document> players;
|
||||
|
||||
private Gson gson = new Gson();
|
||||
|
||||
private Type type = (new TypeToken<List<String>>() {
|
||||
|
||||
}).getType();
|
||||
|
||||
public MongoManager() {
|
||||
instance = this;
|
||||
try {
|
||||
if (this.uriMode) {
|
||||
MongoClientURI mongoClientURI = new MongoClientURI(this.uriString);
|
||||
|
||||
MongoClient mongoClient = new MongoClient(mongoClientURI);
|
||||
mongoClient.getDatabase(this.uriDatabase);
|
||||
mongoDatabase = mongoClient.getDatabase(this.uriDatabase);
|
||||
} else {
|
||||
if (auth) {
|
||||
final MongoCredential credential = MongoCredential.createCredential(user, authDatabase, password.toCharArray());
|
||||
mongoClient = new MongoClient(new ServerAddress(host, port), Collections.singletonList(credential));
|
||||
} else {
|
||||
mongoClient = new MongoClient(host, port);
|
||||
}
|
||||
|
||||
mongoDatabase = mongoClient.getDatabase(database);
|
||||
}
|
||||
connected = true;
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &aSuccessfully connected to the database!"));
|
||||
this.players = this.mongoDatabase.getCollection("players");
|
||||
} catch (Exception exception) {
|
||||
connected = false;
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &cFailed to connect to the database!"));
|
||||
exception.printStackTrace();
|
||||
Bukkit.getPluginManager().disablePlugin(this.plugin);
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &cDisabling BedWars..."));
|
||||
}
|
||||
}
|
||||
|
||||
public void disconnect() {
|
||||
if (this.mongoClient != null) {
|
||||
this.mongoClient.close();
|
||||
this.connected = false;
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &aSuccessfully disconnected from the database!"));
|
||||
}
|
||||
}
|
||||
|
||||
public List<Document> getAllDocuments(MongoCollection<Document> mongoCollection) {
|
||||
List<Document> documents = new ArrayList<Document>();
|
||||
|
||||
FindIterable<Document> findIterable = mongoCollection.find();
|
||||
|
||||
MongoCursor<Document> mongoCursor = findIterable.iterator();
|
||||
|
||||
try {
|
||||
while (mongoCursor.hasNext()) {
|
||||
documents.add(mongoCursor.next());
|
||||
}
|
||||
} finally {
|
||||
mongoCursor.close();
|
||||
}
|
||||
|
||||
return documents;
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.managers.party;
|
||||
package com.loganmagnan.bedwars.managers.party;
|
||||
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.managers.party;
|
||||
package com.loganmagnan.bedwars.managers.party;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.Clickable;
|
||||
import com.loganmagnan.bedwars.utils.TtlHashMap;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.Clickable;
|
||||
import rip.tilly.bedwars.utils.TtlHashMap;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user