Compare commits

..
12 Commits
Author SHA1 Message Date
version-bump[github-action] 4fb500c015 Bump version from 5.0.7-SNAPSHOT1 to 5.0.8 2024-06-24 09:18:23 +00:00
Wanbin Caoandversion-bump[github-action] 86202128d2 #patch bumped minigames box version (#85)
* Bump version from 5.0.7 to 5.0.7-SNAPSHOT0

* feat: bumped minigames box version

* Bump version from 5.0.7-SNAPSHOT0 to 5.0.7-SNAPSHOT1

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
2024-06-24 10:17:07 +01:00
version-bump[github-action] 83fc1a5904 Bump version from 5.0.6-SNAPSHOT1 to 5.0.7 2024-06-21 16:10:21 +00:00
Wanbin Caoandversion-bump[github-action] ecc34b0816 #patch API update and minor improvements (#84)
* Bump version from 5.0.6 to 5.0.6-SNAPSHOT0

* feat: added new API compatibility

* feat: optimised scoreboard

* feat: added allowing disabling of super votes
https://github.com/Sowgro

* Bump version from 5.0.6-SNAPSHOT0 to 5.0.6-SNAPSHOT1

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
2024-06-21 17:09:17 +01:00
version-bump[github-action] 980defa641 Bump version from 5.0.5-SNAPSHOT1 to 5.0.6 2024-04-23 23:23:03 +00:00
Tigerpanzer_02andversion-bump[github-action] ddbc20a599 #patch General optimization (#81)
* Bump version from 5.0.5 to 5.0.5-SNAPSHOT0

* Updated to minigamesbox 1.3.8

* Bump version from 5.0.5-SNAPSHOT0 to 5.0.5-SNAPSHOT1

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
2024-04-24 01:21:49 +02:00
version-bump[github-action] b79439d225 Bump version from 5.0.4-SNAPSHOT2 to 5.0.5 2024-01-15 22:36:58 +00:00
Tigerpanzer_02andversion-bump[github-action] e3a69aca1b #patch Minigamesbox 1.3.7 (#80)
* Bump version from 5.0.4 to 5.0.4-SNAPSHOT0

* Fetched latest changes from minigamesbox

* Bump version from 5.0.4-SNAPSHOT0 to 5.0.4-SNAPSHOT1

* Updated to minigamesbox 1.3.7

* Bump version from 5.0.4-SNAPSHOT1 to 5.0.4-SNAPSHOT2

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
2024-01-15 23:36:06 +01:00
version-bump[github-action] 9ca6a7b364 Bump version from 5.0.3-SNAPSHOT1 to 5.0.4 2024-01-13 01:38:53 +00:00
Tigerpanzer_02andversion-bump[github-action] b99e2ee4db #patch General improvements / code maintenance (#79)
* Bump version from 5.0.3 to 5.0.3-SNAPSHOT0

* Fetched minigamesbox 1.3.6

* Bump version from 5.0.3-SNAPSHOT0 to 5.0.3-SNAPSHOT1

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
2024-01-13 02:37:59 +01:00
version-bump[github-action] 1ebedf3741 Bump version from 5.0.2-SNAPSHOT1 to 5.0.3 2024-01-03 00:02:28 +00:00
Tigerpanzer_02andversion-bump[github-action] 19cc22aca6 #patch Fixed startup issues (#78)
* Bump version from 5.0.2 to 5.0.2-SNAPSHOT0

* Fetched 1.3.5 MiniGamesBox

* Bump version from 5.0.2-SNAPSHOT0 to 5.0.2-SNAPSHOT1

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
2024-01-03 01:01:35 +01:00
29 changed files with 208 additions and 191 deletions

No files matched your search

+14
View File
@@ -10,6 +10,20 @@ deploy webhooks to print changelog successfully
That's all, matcher will stop when detects next line started with `###` match
### 5.0.6 Release (24.04.2024)
* Updated to minigamesbox 1.3.8
### 5.0.5 Release (15.01.2024)
* Updated to minigamesbox 1.3.7
### 5.0.4 Release (13.01.2024)
* Updated to minigamesbox 1.3.6
### 5.0.3 Release (03.01.2024)
* Added new command /bba locale <locale> to set your locale
* Fixed GameProfile API 1.20 change
* Fixed none kits related plugins issues
### 5.0.2 Release (31.12.2023)
* Fixed gtb round reset on player leave
* Fixed gtb "could not pass event AsyncPlayerChatEvent" if spectators ingame
+3 -3
View File
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Bump Version
@@ -25,11 +25,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3
with:
ref: 'development'
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4.2.1
with:
distribution: 'temurin'
java-version: '17'
+3 -3
View File
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Bump Version
@@ -28,11 +28,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3
with:
ref: 'master'
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4.2.1
with:
distribution: 'temurin'
java-version: '17'
+5 -3
View File
@@ -1,3 +1,4 @@
/*
*
* BuildBattle - Ultimate building competition minigame
@@ -38,14 +39,15 @@ repositories {
}
dependencies {
implementation("plugily.projects:MiniGamesBox-Classic:1.3.4") { isTransitive = false }
compileOnly("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT")
implementation("plugily.projects:MiniGamesBox-Classic:1.3.10") { isTransitive = false }
compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
compileOnly("net.citizensnpcs:citizensapi:2.0.31-SNAPSHOT")
compileOnly("org.jetbrains:annotations:24.0.1")
}
group = "plugily.projects"
version = "5.0.2"
version = "5.0.8"
description = "BuildBattle"
java {
@@ -20,8 +20,6 @@
package plugily.projects.buildbattle;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPluginLoader;
import org.jetbrains.annotations.TestOnly;
import plugily.projects.buildbattle.arena.ArenaEvents;
import plugily.projects.buildbattle.arena.ArenaManager;
@@ -43,8 +41,6 @@ import plugily.projects.minigamesbox.classic.handlers.setup.SetupInventory;
import plugily.projects.minigamesbox.classic.handlers.setup.categories.PluginSetupCategoryManager;
import plugily.projects.minigamesbox.classic.utils.services.metrics.Metrics;
import java.io.File;
/**
* Created by Tom on 17/08/2015.
* Updated by Tigerpanzer_02 on 03.12.2021
@@ -66,11 +62,6 @@ public class Main extends PluginMain {
super();
}
@TestOnly
protected Main(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
super(loader, description, dataFolder, file);
}
@Override
public void onEnable() {
long start = System.currentTimeMillis();
@@ -23,7 +23,7 @@ package plugily.projects.buildbattle.api.event.guess;
import org.bukkit.event.HandlerList;
import plugily.projects.buildbattle.arena.GuessArena;
import plugily.projects.buildbattle.handlers.themes.BBTheme;
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
/**
@@ -25,7 +25,7 @@ import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
public class PlotPlayerChooseEvent extends PlugilyEvent implements Cancellable {
@@ -23,7 +23,7 @@ package plugily.projects.buildbattle.api.event.plot;
import org.bukkit.event.HandlerList;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
/**
* @author Plajer
@@ -23,7 +23,7 @@ package plugily.projects.buildbattle.api.event.plot;
import org.bukkit.event.HandlerList;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
/**
* @author Plajer
@@ -43,8 +43,8 @@ import org.bukkit.event.world.StructureGrowEvent;
import org.bukkit.inventory.ItemStack;
import plugily.projects.buildbattle.Main;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.api.arena.IPluginArena;
import plugily.projects.minigamesbox.classic.arena.PluginArenaEvents;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.utils.version.ServerVersion;
@@ -74,7 +74,7 @@ public class ArenaEvents extends PluginArenaEvents {
if(arena == null) {
return;
}
if(arena.getArenaState() != ArenaState.IN_GAME || (arena instanceof BuildArena && arena.getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING)
if(arena.getArenaState() != IArenaState.IN_GAME || (arena instanceof BuildArena && arena.getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING)
|| plugin.getBlacklistManager().getItemList().contains(event.getBlock().getType())) {
event.setCancelled(true);
return;
@@ -95,7 +95,7 @@ public class ArenaEvents extends PluginArenaEvents {
if(arena == null) {
return;
}
if(arena.getArenaState() != ArenaState.IN_GAME || plugin.getBlacklistManager().getItemList().contains(event.getBlock().getType())
if(arena.getArenaState() != IArenaState.IN_GAME || plugin.getBlacklistManager().getItemList().contains(event.getBlock().getType())
|| (arena instanceof BuildArena && arena.getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING)) {
event.setCancelled(true);
return;
@@ -119,7 +119,7 @@ public class ArenaEvents extends PluginArenaEvents {
if(event.getRightClicked().getType() == EntityType.ITEM_FRAME && ((ItemFrame) event.getRightClicked()).getItem().getType() != Material.AIR) {
Location entityLocation = event.getRightClicked().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -146,7 +146,7 @@ public class ArenaEvents extends PluginArenaEvents {
BaseArena arena = plugin.getArenaRegistry().getArena(event.getPlayer());
if(arena == null || arena.getArenaState() != ArenaState.IN_GAME) {
if(arena == null || arena.getArenaState() != IArenaState.IN_GAME) {
return;
}
@@ -204,7 +204,7 @@ public class ArenaEvents extends PluginArenaEvents {
return;
}
if(arena.getArenaState() != ArenaState.IN_GAME || event.getClickedBlock().getType() == XMaterial.ENDER_CHEST.parseMaterial()) {
if(arena.getArenaState() != IArenaState.IN_GAME || event.getClickedBlock().getType() == XMaterial.ENDER_CHEST.parseMaterial()) {
event.setCancelled(true);
}
}
@@ -215,7 +215,7 @@ public class ArenaEvents extends PluginArenaEvents {
if(vehicle.getType() != EntityType.MINECART) {
return;
}
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -232,7 +232,7 @@ public class ArenaEvents extends PluginArenaEvents {
public void onIgniteEvent(BlockIgniteEvent event) {
Location blockLocation = event.getBlock().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -248,7 +248,7 @@ public class ArenaEvents extends PluginArenaEvents {
public void onPistonRetractEvent(BlockPistonRetractEvent event) {
Location blockLocation = event.getBlock().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -266,7 +266,7 @@ public class ArenaEvents extends PluginArenaEvents {
public void onLeavesDecay(LeavesDecayEvent event) {
Location blockLocation = event.getBlock().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -301,7 +301,7 @@ public class ArenaEvents extends PluginArenaEvents {
int maxMobPerPlot = plugin.getConfig().getInt("Mob.Max-Amount", 20);
Location entityLoc = event.getEntity().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -353,7 +353,7 @@ public class ArenaEvents extends PluginArenaEvents {
if(event.getSource().getType() != Material.FIRE)
return;
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -373,7 +373,7 @@ public class ArenaEvents extends PluginArenaEvents {
public void onDispense(BlockDispenseEvent event) {
Location blockLoc = event.getBlock().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -409,7 +409,7 @@ public class ArenaEvents extends PluginArenaEvents {
return;
}
BaseArena arena = plugin.getArenaRegistry().getArena((Player) event.getEntity());
if(arena == null || arena.getArenaState() != ArenaState.IN_GAME) {
if(arena == null || arena.getArenaState() != IArenaState.IN_GAME) {
return;
}
if(event.getEntity().getType() != EntityType.PLAYER) {
@@ -424,7 +424,7 @@ public class ArenaEvents extends PluginArenaEvents {
return;
}
BaseArena arena = plugin.getArenaRegistry().getArena((Player) event.getEntity());
if(arena == null || arena.getArenaState() != ArenaState.IN_GAME) {
if(arena == null || arena.getArenaState() != IArenaState.IN_GAME) {
return;
}
event.setCancelled(true);
@@ -455,7 +455,7 @@ public class ArenaEvents extends PluginArenaEvents {
public void onTNTExplode(EntityExplodeEvent event) {
Location entityLocation = event.getEntity().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -473,7 +473,7 @@ public class ArenaEvents extends PluginArenaEvents {
Location toBlock = event.getToBlock().getLocation();
Location blockLoc = event.getBlock().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -507,7 +507,7 @@ public class ArenaEvents extends PluginArenaEvents {
@EventHandler
public void onPistonExtendEvent(BlockPistonExtendEvent event) {
Location blockLoc = event.getBlock().getLocation();
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(!(arena instanceof BaseArena)) {
continue;
}
@@ -548,7 +548,7 @@ public class ArenaEvents extends PluginArenaEvents {
if(humanEntity instanceof Player) {
BaseArena baseArena = plugin.getArenaRegistry().getArena((Player) humanEntity);
if(baseArena != null && baseArena.getArenaState() != ArenaState.IN_GAME) {
if(baseArena != null && baseArena.getArenaState() != IArenaState.IN_GAME) {
if(event.getClickedInventory() == humanEntity.getInventory()) {
if(event.getView().getType() == InventoryType.CRAFTING
|| event.getView().getType() == InventoryType.PLAYER) {
@@ -566,7 +566,7 @@ public class ArenaEvents extends PluginArenaEvents {
if(!(arena instanceof GuessArena)) {
return;
}
if(arena.getArenaState() != ArenaState.IN_GAME) {
if(arena.getArenaState() != IArenaState.IN_GAME) {
return;
}
if(arena.getSpectators().contains(player)) {
@@ -24,7 +24,9 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import plugily.projects.buildbattle.Main;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.api.arena.IPluginArena;
import plugily.projects.minigamesbox.api.user.IUser;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.classic.arena.PluginArenaManager;
import plugily.projects.minigamesbox.classic.user.User;
@@ -45,7 +47,7 @@ public class ArenaManager extends PluginArenaManager {
}
@Override
public void additionalPartyJoin(Player player, PluginArena arena, Player partyLeader) {
public void additionalPartyJoin(Player player, IPluginArena arena, Player partyLeader) {
BaseArena pluginArena = plugin.getArenaRegistry().getArena(arena.getId());
if(pluginArena == null) {
return;
@@ -67,13 +69,13 @@ public class ArenaManager extends PluginArenaManager {
}
@Override
public void leaveAttempt(@NotNull Player player, @NotNull PluginArena arena) {
public void leaveAttempt(@NotNull Player player, @NotNull IPluginArena arena) {
BaseArena pluginArena = plugin.getArenaRegistry().getArena(arena.getId());
if(pluginArena == null) {
return;
}
super.leaveAttempt(player, arena);
User user = plugin.getUserManager().getUser(player);
IUser user = plugin.getUserManager().getUser(player);
user.setStatistic("LOCAL_POINTS", 0);
user.setStatistic("LOCAL_POINTS_GTB", 0);
Plot plot = pluginArena.getPlotManager().getPlot(player);
@@ -91,7 +93,7 @@ public class ArenaManager extends PluginArenaManager {
((GuessArena) arena).getWhoGuessed().remove(player);
if(guessArena.getCurrentBuilders().contains(player)) {
if(plot.getMembers().isEmpty()) {
if(arena.getArenaState() == ArenaState.IN_GAME) {
if(arena.getArenaState() == IArenaState.IN_GAME) {
//ToDo message force skipped
pluginArena.setTimer(plugin.getConfig().getInt("Time-Manager." + pluginArena.getArenaType().getPrefix() + ".Round-Delay"), true);
pluginArena.setArenaInGameState(BaseArena.ArenaInGameState.PLOT_VOTING);
@@ -29,6 +29,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import plugily.projects.buildbattle.Main;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.api.arena.IPluginArena;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.classic.arena.PluginArenaRegistry;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
@@ -156,7 +157,7 @@ public class ArenaRegistry extends PluginArenaRegistry {
@Override
public @Nullable BaseArena getArena(Player player) {
PluginArena pluginArena = super.getArena(player);
IPluginArena pluginArena = super.getArena(player);
if(pluginArena instanceof BaseArena) {
return (BaseArena) pluginArena;
}
@@ -165,7 +166,7 @@ public class ArenaRegistry extends PluginArenaRegistry {
@Override
public @Nullable BaseArena getArena(String id) {
PluginArena pluginArena = super.getArena(id);
IPluginArena pluginArena = super.getArena(id);
if(pluginArena instanceof BaseArena) {
return (BaseArena) pluginArena;
}
@@ -174,7 +175,7 @@ public class ArenaRegistry extends PluginArenaRegistry {
public @NotNull List<BaseArena> getPluginArenas() {
List<BaseArena> baseArenas = new ArrayList<>(super.getArenas().size());
for(PluginArena pluginArena : super.getArenas()) {
for(IPluginArena pluginArena : super.getArenas()) {
if(pluginArena instanceof BaseArena) {
baseArenas.add((BaseArena) pluginArena);
}
@@ -27,7 +27,7 @@ import plugily.projects.buildbattle.arena.states.build.InGameState;
import plugily.projects.buildbattle.arena.states.build.StartingState;
import plugily.projects.buildbattle.handlers.themes.vote.VoteMenu;
import plugily.projects.buildbattle.handlers.themes.vote.VotePoll;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import java.util.*;
@@ -44,8 +44,8 @@ public class BuildArena extends BaseArena {
public BuildArena(String id) {
super(id);
setArenaType(ArenaType.SOLO);
addGameStateHandler(ArenaState.IN_GAME, new InGameState());
addGameStateHandler(ArenaState.STARTING, new StartingState());
addGameStateHandler(IArenaState.IN_GAME, new InGameState());
addGameStateHandler(IArenaState.STARTING, new StartingState());
getPlugin().getDebugger().debug("Init Arena {0} with ArenaType {1}", getId(), getArenaType());
}
@@ -29,7 +29,7 @@ import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.buildbattle.arena.states.guess.InGameState;
import plugily.projects.buildbattle.arena.states.guess.StartingState;
import plugily.projects.buildbattle.handlers.themes.BBTheme;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.utils.version.VersionUtils;
@@ -60,8 +60,8 @@ public class GuessArena extends BaseArena {
public GuessArena(String id) {
super(id);
setArenaType(ArenaType.GUESS_THE_BUILD);
addGameStateHandler(ArenaState.IN_GAME, new InGameState());
addGameStateHandler(ArenaState.STARTING, new StartingState());
addGameStateHandler(IArenaState.IN_GAME, new InGameState());
addGameStateHandler(IArenaState.STARTING, new StartingState());
getPlugin().getDebugger().debug("Init Arena {0} with ArenaType {1}", getId(), getArenaType());
}
@@ -23,11 +23,11 @@ package plugily.projects.buildbattle.arena.managers;
import org.bukkit.entity.Player;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.GuessArena;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IPluginArena;
import plugily.projects.minigamesbox.api.user.IUser;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.classic.arena.managers.PluginScoreboardManager;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.user.User;
import plugily.projects.minigamesbox.classic.utils.scoreboard.common.EntryBuilder;
import plugily.projects.minigamesbox.classic.utils.scoreboard.type.Entry;
@@ -47,31 +47,39 @@ public class ScoreboardManager extends PluginScoreboardManager {
}
@Override
public List<Entry> formatScoreboard(User user) {
public List<Entry> formatScoreboard(IUser user) {
EntryBuilder builder = new EntryBuilder();
List<String> lines;
PluginArena userArena = user.getArena();
IPluginArena userArena = user.getArena();
if(userArena.getArenaState() == ArenaState.FULL_GAME) {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content.Starting");
} else if(userArena.getArenaState() == ArenaState.IN_GAME) {
if(userArena instanceof GuessArena) {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Guess-The-Build" + (((GuessArena) userArena).getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING ? "-Waiting" : ""));
} else {
if(userArena.getArenaOption("PLOT_MEMBER_SIZE") <= 1) {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Classic");
switch (userArena.getArenaState()) {
case FULL_GAME: {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content.Starting");
break;
}
case IN_GAME: {
if(userArena instanceof GuessArena) {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Guess-The-Build" + (((GuessArena) userArena).getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING ? "-Waiting" : ""));
} else {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Teams");
if(userArena.getArenaOption("PLOT_MEMBER_SIZE") <= 1) {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Classic");
} else {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Teams");
}
}
break;
}
} else if(userArena.getArenaState() == ArenaState.ENDING) {
if(userArena instanceof GuessArena) {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Guess-The-Build");
} else {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Classic");
case ENDING: {
if(userArena instanceof GuessArena) {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Guess-The-Build");
} else {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName() + ".Classic");
}
break;
}
default: {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName());
}
} else {
lines = userArena.getPlugin().getLanguageManager().getLanguageList("Scoreboard.Content." + userArena.getArenaState().getFormattedName());
}
Player player = user.getPlayer();
@@ -26,9 +26,7 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import plugily.projects.buildbattle.api.event.plot.PlotPlayerReceiveEvent;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.classic.utils.dimensional.Cuboid;
import plugily.projects.minigamesbox.classic.utils.version.ServerVersion;
import plugily.projects.minigamesbox.classic.utils.version.VersionUtils;
import java.util.ArrayList;
@@ -27,11 +27,11 @@ import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.BuildArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.buildbattle.arena.vote.VoteItems;
import plugily.projects.minigamesbox.api.user.IUser;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.classic.arena.states.PluginInGameState;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.handlers.language.TitleBuilder;
import plugily.projects.minigamesbox.classic.user.User;
import plugily.projects.minigamesbox.classic.utils.version.VersionUtils;
import java.util.ArrayList;
@@ -77,7 +77,7 @@ public class InGameState extends PluginInGameState {
handleBuildTime(pluginArena);
if(arena.getTimer() <= 0) {
for(Player player : pluginArena.getPlayersLeft()) {
User user = getPlugin().getUserManager().getUser(player);
IUser user = getPlugin().getUserManager().getUser(player);
if(user.isSpectator()) continue;
@@ -139,7 +139,7 @@ public class InGameState extends PluginInGameState {
new TitleBuilder("IN_GAME_MESSAGES_PLOT_VOTING_PLOT_OWNER_TITLE").asKey().arena(pluginArena).player(player).value(formattedMembers).sendArena();
}
User user = getPlugin().getUserManager().getUser(player);
IUser user = getPlugin().getUserManager().getUser(player);
int points = user.getStatistic("LOCAL_POINTS");
//no vote made, in this case make it a good vote
@@ -161,7 +161,7 @@ public class InGameState extends PluginInGameState {
private void adjustStatistics(BuildArena pluginArena) {
for(Plot plot : pluginArena.getPlotManager().getTopPlotsOrder()) {
plot.getMembers().forEach(player -> {
User user = getPlugin().getUserManager().getUser(player);
IUser user = getPlugin().getUserManager().getUser(player);
if(plot.getPoints() > user.getStatistic("POINTS_HIGHEST")) {
user.setStatistic("POINTS_HIGHEST", plot.getPoints());
}
@@ -207,7 +207,7 @@ public class InGameState extends PluginInGameState {
if(votingPlot.getPoints() == 0) {
List<Plot> plotsVoted = new ArrayList<>();
for(Player player : pluginArena.getPlayersLeft()) {
User user = getPlugin().getUserManager().getUser(player);
IUser user = getPlugin().getUserManager().getUser(player);
Plot plot = pluginArena.getPlotFromPlayer(player);
if(!votingPlot.getMembers().contains(player)) {
if(!plotsVoted.contains(plot)) {
@@ -30,11 +30,11 @@ import plugily.projects.buildbattle.arena.GuessArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.buildbattle.handlers.themes.BBTheme;
import plugily.projects.buildbattle.handlers.themes.ThemeManager;
import plugily.projects.minigamesbox.api.user.IUser;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.classic.arena.states.PluginInGameState;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.handlers.language.TitleBuilder;
import plugily.projects.minigamesbox.classic.user.User;
import plugily.projects.minigamesbox.classic.utils.actionbar.ActionBar;
import plugily.projects.minigamesbox.classic.utils.helper.ItemBuilder;
import plugily.projects.minigamesbox.inventory.common.item.SimpleClickableItem;
@@ -265,7 +265,7 @@ public class InGameState extends PluginInGameState {
private void adjustStatistics(GuessArena pluginArena) {
for(Plot plot : pluginArena.getPlotManager().getTopPlotsOrder()) {
plot.getMembers().forEach(player -> {
User user = getPlugin().getUserManager().getUser(player);
IUser user = getPlugin().getUserManager().getUser(player);
/*
//ToDo GTB stats
if(plot.getPoints() > user.getStatistic("POINTS_HIGHEST")) {
@@ -28,9 +28,9 @@ import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.BuildArena;
import plugily.projects.buildbattle.arena.GuessArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.api.user.IUser;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.user.User;
import plugily.projects.minigamesbox.classic.utils.misc.complement.ComplementAccessor;
import plugily.projects.minigamesbox.classic.utils.version.VersionUtils;
import plugily.projects.minigamesbox.classic.utils.version.events.api.PlugilyPlayerInteractEvent;
@@ -60,7 +60,7 @@ public class VoteEvents implements Listener {
}
BaseArena arena = plugin.getArenaRegistry().getArena(event.getPlayer());
if(arena == null || arena.getArenaState() != ArenaState.IN_GAME || arena instanceof GuessArena) {
if(arena == null || arena.getArenaState() != IArenaState.IN_GAME || arena instanceof GuessArena) {
return;
}
@@ -72,7 +72,7 @@ public class VoteEvents implements Listener {
Plot plot = solo.getVotingPlot();
if(plugin.getVoteItems().getReportItem().equals(event.getItem())) {
User user = plugin.getUserManager().getUser(event.getPlayer());
IUser user = plugin.getUserManager().getUser(event.getPlayer());
user.adjustStatistic("REPORTS_TRIGGERED", 1);
@@ -21,6 +21,7 @@
package plugily.projects.buildbattle.boot;
import plugily.projects.buildbattle.Main;
import plugily.projects.minigamesbox.api.preferences.IConfigPreferences;
import plugily.projects.minigamesbox.classic.api.StatisticType;
import plugily.projects.minigamesbox.classic.api.StatsStorage;
import plugily.projects.minigamesbox.classic.arena.options.ArenaOption;
@@ -31,7 +32,6 @@ import plugily.projects.minigamesbox.classic.handlers.permissions.PermissionsMan
import plugily.projects.minigamesbox.classic.handlers.reward.RewardType;
import plugily.projects.minigamesbox.classic.handlers.reward.RewardsFactory;
import plugily.projects.minigamesbox.classic.preferences.ConfigOption;
import plugily.projects.minigamesbox.classic.preferences.ConfigPreferences;
/**
* @author Tigerpanzer_02
@@ -53,13 +53,14 @@ public class AdditionalValueInitializer {
}
private void registerConfigOptions() {
ConfigPreferences configPreferences = plugin.getConfigPreferences();
IConfigPreferences configPreferences = plugin.getConfigPreferences();
configPreferences.registerOption("MOB_SPAWN", new ConfigOption("Mob.Spawn", false));
configPreferences.registerOption("HEAD_MENU_CUSTOM", new ConfigOption("Head-Menu.Custom", false));
configPreferences.registerOption("REPORT_COMMANDS", new ConfigOption("Report.Commands", false));
configPreferences.registerOption("PLOT_HIDE_OWNER", new ConfigOption("Plot.Hide-Owner", false));
configPreferences.registerOption("PLOT_MOVE_OUTSIDE", new ConfigOption("Plot.Move-Outside", false));
configPreferences.registerOption("SUPER_VOTES", new ConfigOption("Super-Votes", true));
}
private void registerStatistics() {
@@ -29,8 +29,8 @@ import plugily.projects.buildbattle.arena.BuildArena;
import plugily.projects.buildbattle.arena.GuessArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.buildbattle.handlers.themes.BBTheme;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.api.arena.IPluginArena;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.handlers.placeholder.Placeholder;
import plugily.projects.minigamesbox.classic.handlers.placeholder.PlaceholderManager;
@@ -58,17 +58,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("theme", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getTheme(player, arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getTheme(arena);
}
@Nullable
private String getTheme(PluginArena arena) {
private String getTheme(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -81,7 +81,7 @@ public class PlaceholderInitializer {
}
@Nullable
private String getTheme(Player player, PluginArena arena) {
private String getTheme(Player player, IPluginArena arena) {
String theme = getTheme(arena);
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
@@ -102,17 +102,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("difficulty", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getTheme(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getTheme(arena);
}
@Nullable
private String getTheme(PluginArena arena) {
private String getTheme(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena instanceof GuessArena) {
BBTheme theme = ((GuessArena) pluginArena).getCurrentBBTheme();
@@ -127,17 +127,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("difficulty_points_reward", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getTheme(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getTheme(arena);
}
@Nullable
private String getTheme(PluginArena arena) {
private String getTheme(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena instanceof GuessArena) {
BBTheme theme = ((GuessArena) pluginArena).getCurrentBBTheme();
@@ -152,17 +152,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("builder", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getBuilder(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getBuilder(arena);
}
@Nullable
private String getBuilder(PluginArena arena) {
private String getBuilder(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(!(pluginArena instanceof GuessArena)) {
return null;
@@ -176,17 +176,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("type", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getType(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getType(arena);
}
@Nullable
private String getType(PluginArena arena) {
private String getType(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -196,17 +196,17 @@ public class PlaceholderInitializer {
});
placeholderManager.registerPlaceholder(new Placeholder("type_pretty", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getType(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getType(arena);
}
@Nullable
private String getType(PluginArena arena) {
private String getType(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -218,22 +218,22 @@ public class PlaceholderInitializer {
final int number = i;
placeholderManager.registerPlaceholder(new Placeholder("place_member_" + number, Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getPlace(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getPlace(arena);
}
@Nullable
private String getPlace(PluginArena arena) {
private String getPlace(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
}
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != ArenaState.ENDING) {
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != IArenaState.ENDING) {
return "???";
}
List<Plot> plotRanking = pluginArena.getPlotManager().getTopPlotsOrder();
@@ -249,22 +249,22 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("place_points_" + number, Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getPlace(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getPlace(arena);
}
@Nullable
private String getPlace(PluginArena arena) {
private String getPlace(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
}
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != ArenaState.ENDING) {
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != IArenaState.ENDING) {
return "???";
}
List<Plot> plotRanking = pluginArena.getPlotManager().getTopPlotsOrder();
@@ -277,17 +277,17 @@ public class PlaceholderInitializer {
}
placeholderManager.registerPlaceholder(new Placeholder("ingame_state", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getState(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getState(arena);
}
@Nullable
private String getState(PluginArena arena) {
private String getState(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -301,17 +301,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("ingame_state_pretty", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getState(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getState(arena);
}
@Nullable
private String getState(PluginArena arena) {
private String getState(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -326,12 +326,12 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("teammates", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getMembers(player, arena);
}
@Nullable
private String getMembers(Player player, PluginArena arena) {
private String getMembers(Player player, IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -355,12 +355,12 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("summary_player", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getSummary(arena, player);
}
@Nullable
private String getSummary(PluginArena arena, Player player) {
private String getSummary(IPluginArena arena, Player player) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -375,17 +375,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("summary_place_own", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getSummary(arena, player);
}
@Nullable
private String getSummary(PluginArena arena, Player player) {
private String getSummary(IPluginArena arena, Player player) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
}
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != ArenaState.ENDING) {
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != IArenaState.ENDING) {
return null;
}
List<Plot> plotRanking = pluginArena.getPlotManager().getTopPlotsOrder();
@@ -404,17 +404,17 @@ public class PlaceholderInitializer {
placeholderManager.registerPlaceholder(new Placeholder("summary", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getSummary(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getSummary(arena);
}
@Nullable
private String getSummary(PluginArena arena) {
private String getSummary(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -428,22 +428,22 @@ public class PlaceholderInitializer {
});
placeholderManager.registerPlaceholder(new Placeholder("summary_place_list", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getSummary(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getSummary(arena);
}
@Nullable
private String getSummary(PluginArena arena) {
private String getSummary(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
}
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != ArenaState.ENDING) {
if(pluginArena.getArenaInGameState() != BaseArena.ArenaInGameState.PLOT_VOTING && pluginArena.getArenaState() != IArenaState.ENDING) {
return null;
}
int places = pluginArena.getPlotManager().getTopPlotsOrder().size();
@@ -460,17 +460,17 @@ public class PlaceholderInitializer {
});
placeholderManager.registerPlaceholder(new Placeholder("gtb_rounds", Placeholder.PlaceholderType.ARENA, Placeholder.PlaceholderExecutor.ALL) {
@Override
public String getValue(Player player, PluginArena arena) {
public String getValue(Player player, IPluginArena arena) {
return getSummary(arena);
}
@Override
public String getValue(PluginArena arena) {
public String getValue(IPluginArena arena) {
return getSummary(arena);
}
@Nullable
private String getSummary(PluginArena arena) {
private String getSummary(IPluginArena arena) {
BaseArena pluginArena = arenaRegistry.getArena(arena.getId());
if(pluginArena == null) {
return null;
@@ -30,7 +30,7 @@ import plugily.projects.buildbattle.commands.arguments.admin.plot.AddPlotArgumen
import plugily.projects.buildbattle.commands.arguments.admin.plot.RemovePlotArgument;
import plugily.projects.buildbattle.commands.arguments.admin.plot.SelectPlotArgument;
import plugily.projects.buildbattle.commands.arguments.game.GuessArgument;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.api.arena.IPluginArena;
import plugily.projects.minigamesbox.classic.commands.arguments.PluginArgumentsRegistry;
import java.util.List;
@@ -55,7 +55,7 @@ public class ArgumentsRegistry extends PluginArgumentsRegistry {
}
@Override
public List<PluginArena> getSpecificFilteredArenas(List<PluginArena> arenas, String filter) {
public List<IPluginArena> getSpecificFilteredArenas(List<IPluginArena> arenas, String filter) {
switch(filter.toLowerCase(Locale.ENGLISH)) {
case "gtb":
case "guessthebuild":
@@ -24,7 +24,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.commands.arguments.ArgumentsRegistry;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.classic.commands.arguments.data.CommandArgument;
/**
@@ -41,7 +41,7 @@ public class SelectPlotArgument {
Player player = (Player) sender;
BaseArena arena = (BaseArena) registry.getPlugin().getArenaRegistry().getArena(player);
if(arena != null && (arena.getArenaState() == ArenaState.WAITING_FOR_PLAYERS || arena.getArenaState() == ArenaState.STARTING))
if(arena != null && (arena.getArenaState() == IArenaState.WAITING_FOR_PLAYERS || arena.getArenaState() == IArenaState.STARTING))
arena.getPlugin().getPlotMenuHandler().createMenu(player, arena);
}
});
@@ -25,7 +25,7 @@ import org.bukkit.entity.Player;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.GuessArena;
import plugily.projects.buildbattle.commands.arguments.ArgumentsRegistry;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.classic.commands.arguments.data.CommandArgument;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
@@ -50,7 +50,7 @@ public class GuessArgument {
Player player = (Player) sender;
BaseArena arena = (BaseArena) registry.getPlugin().getArenaRegistry().getArena(player);
if(!(arena instanceof GuessArena) || arena.getArenaState() != ArenaState.IN_GAME) {
if(!(arena instanceof GuessArena) || arena.getArenaState() != IArenaState.IN_GAME) {
new MessageBuilder("COMMANDS_NOT_PLAYING").asKey().player(player).sendPlayer();
return;
}
@@ -25,6 +25,7 @@ import org.bukkit.Location;
import org.bukkit.scheduler.BukkitTask;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.managers.plots.Plot;
import plugily.projects.minigamesbox.api.arena.IPluginArena;
import plugily.projects.minigamesbox.classic.PluginMain;
import plugily.projects.minigamesbox.classic.arena.PluginArena;
import plugily.projects.minigamesbox.classic.utils.version.VersionUtils;
@@ -55,7 +56,7 @@ public class ParticleRefreshScheduler {
final int particleAmount = amountParticle;
task = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
if(arena instanceof BaseArena && !arena.getPlayers().isEmpty()) {
for(Plot buildPlot : ((BaseArena) arena).getPlotManager().getPlots()) {
if(!buildPlot.getMembers().isEmpty()) {
@@ -33,21 +33,16 @@ import plugily.projects.buildbattle.Main;
import plugily.projects.buildbattle.arena.BaseArena;
import plugily.projects.buildbattle.arena.BuildArena;
import plugily.projects.buildbattle.handlers.themes.ThemeManager;
import plugily.projects.minigamesbox.classic.arena.ArenaState;
import plugily.projects.minigamesbox.api.arena.IArenaState;
import plugily.projects.minigamesbox.api.user.IUser;
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
import plugily.projects.minigamesbox.classic.user.User;
import plugily.projects.minigamesbox.classic.utils.helper.ItemBuilder;
import plugily.projects.minigamesbox.classic.utils.version.xseries.XMaterial;
import plugily.projects.minigamesbox.inventory.common.item.ClickableItem;
import plugily.projects.minigamesbox.inventory.common.item.SimpleClickableItem;
import plugily.projects.minigamesbox.inventory.normal.NormalFastInv;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Consumer;
/**
@@ -102,7 +97,7 @@ public class VoteMenu {
NormalFastInv gui = new NormalFastInv(9 * themeSelection.size(), new MessageBuilder("MENU_THEME_INVENTORY").asKey().build());
gui.addCloseHandler(event -> {
if(arena.getArenaState() == ArenaState.IN_GAME && arena.getArenaInGameState() == BaseArena.ArenaInGameState.THEME_VOTING) {
if(arena.getArenaState() == IArenaState.IN_GAME && arena.getArenaInGameState() == BaseArena.ArenaInGameState.THEME_VOTING) {
plugin.getServer().getScheduler().runTask(plugin, () -> {
HumanEntity humanEntity = event.getPlayer();
Inventory inventory = event.getInventory();
@@ -130,25 +125,30 @@ public class VoteMenu {
setGlassPanes(gui, multiplied, percent);
gui.setItem(multiplied + 8, new SimpleClickableItem(new ItemBuilder(new ItemStack(Material.PAPER))
.name(new MessageBuilder("MENU_THEME_VOTE_SUPER_ITEM_NAME").asKey().arena(arena).value(theme).build())
.lore(new MessageBuilder("MENU_THEME_VOTE_SUPER_ITEM_LORE").asKey().player(guiPlayer).arena(arena).value(theme).build().split(";"))
.build(), event -> {
HumanEntity humanEntity = event.getWhoClicked();
if (plugin.getConfigPreferences().getOption("SUPER_VOTES")) {
gui.setItem(multiplied + 8, new SimpleClickableItem(new ItemBuilder(new ItemStack(Material.PAPER))
.name(new MessageBuilder("MENU_THEME_VOTE_SUPER_ITEM_NAME").asKey().arena(arena).value(theme).build())
.lore(new MessageBuilder("MENU_THEME_VOTE_SUPER_ITEM_LORE").asKey().player(guiPlayer).arena(arena).value(theme).build().split(";"))
.build(), event -> {
HumanEntity humanEntity = event.getWhoClicked();
if(!(humanEntity instanceof Player))
return;
if(!(humanEntity instanceof Player))
return;
Player player = (Player) humanEntity;
User user = plugin.getUserManager().getUser(player);
Player player = (Player) humanEntity;
IUser user = plugin.getUserManager().getUser(player);
if(user.getStatistic("SUPER_VOTES") > 0) {
user.adjustStatistic("SUPER_VOTES", -1);
new MessageBuilder("MENU_THEME_VOTE_SUPER_USED").asKey().arena(arena).player(player).value(theme).sendArena();
arena.setTheme(theme);
arena.setTimer(0, true);
}
}));
if(user.getStatistic("SUPER_VOTES") > 0) {
user.adjustStatistic("SUPER_VOTES", -1);
new MessageBuilder("MENU_THEME_VOTE_SUPER_USED").asKey().arena(arena).player(player).value(theme).sendArena();
arena.setTheme(theme);
arena.setTimer(0, true);
}
}));
}
else {
gui.setItem(multiplied + 8, ClickableItem.of(new ItemBuilder(XMaterial.IRON_BARS.parseItem()).name("&7<-").colorizeItem().build()));
}
i++;
}
+11 -12
View File
@@ -49,14 +49,10 @@ Commands:
Executes: "buildbattle leave"
Enabled: true
'3':
Short: "kit"
Executes: "buildbattle selectkit"
Enabled: false
'4':
Short: "stats"
Executes: "buildbattle stats"
Enabled: false
'5':
'4':
Short: "top"
Executes: "buildbattle top"
Enabled: true
@@ -82,16 +78,18 @@ Database: false
# Should we enable in game rewards? See rewards.yml for more...
# You should also check out our script engine tutorial for rewards! https://tutorial.plugily.xyz
Rewards: true
Rewards: false
# Enable in game (eg. '[KIT][LEVEL] Tigerpanzer_02: hey') special formatting?
# Formatting is configurable in old_language.yml
# You can use PlaceholderAPI placeholders in chat format!
Plugin-Chat-Format: true
# Enable the super votes in the theme vote menu
Super-Votes: true
Chat:
# Enable in game (eg. '[KIT][LEVEL] Tigerpanzer_02: hey') special formatting?
# Formatting is configurable in language.yml
# You can use PlaceholderAPI placeholders in chat format!
Format: true
Separate:
# Should we enable a separate arena chat for players inside a arena
# Useful on multi arena servers that don't want the same chat for all players on the server
@@ -142,7 +140,8 @@ Damage:
Drowning: false
# Should players get fire damage?
Fire: false
# Should players lose food ingame & get damage?
Hunger: false
Cycle:
# Should we make permanent clear weather on all worlds where our arenas are?
@@ -275,4 +274,4 @@ Update-Notifier:
# You edited it, huh? Next time hurt yourself!
Do-Not-Edit:
File-Version: 1
Core-Version: 2
Core-Version: 4
+2 -2
View File
@@ -231,7 +231,7 @@ In-Game:
# Join cancelled via external plugin that uses the API of our plugin.
Cancelled-Via-API: "%color_chat_issue%%plugin_prefix% You can't join this game!"
As-Party-Member: "%color_chat_issue%%plugin_prefix% You joined %arena_name% because the party leader joined it!"
Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% BaseArena is not configured yet! Contact staff!"
Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% BaseArena is not configured yet! Contact your server's staff!"
Title: "20,30,20;%arena_name%;%arena_players_size%/%arena_max_players%"
Death:
Tag: "&8Dead"
@@ -572,4 +572,4 @@ Leaderboard:
# You edited it, huh? Next time hurt yourself!
Do-Not-Edit:
File-Version: 1
Core-Version: 1
Core-Version: 2
@@ -228,7 +228,7 @@ In-Game:
# Join cancelled via external plugin that uses the API of our plugin.
Cancelled-Via-API: "%color_chat_issue%%plugin_prefix% You can't join this game!"
As-Party-Member: "%color_chat_issue%%plugin_prefix% You joined %arena_name% because the party leader joined it!"
Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% BaseArena is not configured yet! Contact staff!"
Arena-Not-Configured: "%color_chat_issue%%plugin_prefix% BaseArena is not configured yet! Contact your server's staff!"
Title: "20,30,20;%arena_name%;%arena_players_size%/%arena_max_players%"
Death:
Tag: "&8Dead"