Skip to content

Commit ecc34b0

Browse files
Lagggpixelversion-bump[github-action]
Lagggpixel
and
version-bump[github-action]
authored
#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>
1 parent 980defa commit ecc34b0

24 files changed

+178
-170
lines changed

‎build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
/*
23
*
34
* BuildBattle - Ultimate building competition minigame
@@ -38,14 +39,15 @@ repositories {
3839
}
3940

4041
dependencies {
41-
implementation("plugily.projects:MiniGamesBox-Classic:1.3.7") { isTransitive = false }
42-
compileOnly("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT")
42+
implementation("plugily.projects:MiniGamesBox-Classic:1.3.9") { isTransitive = false }
43+
compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
44+
compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
4345
compileOnly("net.citizensnpcs:citizensapi:2.0.31-SNAPSHOT")
4446
compileOnly("org.jetbrains:annotations:24.0.1")
4547
}
4648

4749
group = "plugily.projects"
48-
version = "5.0.6"
50+
version = "5.0.6-SNAPSHOT1"
4951
description = "BuildBattle"
5052

5153
java {

‎src/main/java/plugily/projects/buildbattle/Main.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
package plugily.projects.buildbattle;
2222

23-
import org.bukkit.plugin.PluginDescriptionFile;
24-
import org.bukkit.plugin.java.JavaPluginLoader;
2523
import org.jetbrains.annotations.TestOnly;
2624
import plugily.projects.buildbattle.arena.ArenaEvents;
2725
import plugily.projects.buildbattle.arena.ArenaManager;
@@ -43,8 +41,6 @@
4341
import plugily.projects.minigamesbox.classic.handlers.setup.categories.PluginSetupCategoryManager;
4442
import plugily.projects.minigamesbox.classic.utils.services.metrics.Metrics;
4543

46-
import java.io.File;
47-
4844
/**
4945
* Created by Tom on 17/08/2015.
5046
* Updated by Tigerpanzer_02 on 03.12.2021
@@ -66,11 +62,6 @@ public Main() {
6662
super();
6763
}
6864

69-
@TestOnly
70-
protected Main(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
71-
super(loader, description, dataFolder, file);
72-
}
73-
7465
@Override
7566
public void onEnable() {
7667
long start = System.currentTimeMillis();

‎src/main/java/plugily/projects/buildbattle/api/event/guess/PlayerThemeGuessEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.bukkit.event.HandlerList;
2424
import plugily.projects.buildbattle.arena.GuessArena;
2525
import plugily.projects.buildbattle.handlers.themes.BBTheme;
26-
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
26+
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
2727

2828

2929
/**

‎src/main/java/plugily/projects/buildbattle/api/event/plot/PlotPlayerChooseEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.bukkit.event.HandlerList;
2626
import plugily.projects.buildbattle.arena.BaseArena;
2727
import plugily.projects.buildbattle.arena.managers.plots.Plot;
28-
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
28+
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
2929

3030
public class PlotPlayerChooseEvent extends PlugilyEvent implements Cancellable {
3131

‎src/main/java/plugily/projects/buildbattle/api/event/plot/PlotPlayerReceiveEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.bukkit.event.HandlerList;
2424
import plugily.projects.buildbattle.arena.BaseArena;
2525
import plugily.projects.buildbattle.arena.managers.plots.Plot;
26-
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
26+
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
2727

2828
/**
2929
* @author Plajer

‎src/main/java/plugily/projects/buildbattle/api/event/plot/PlotResetEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.bukkit.event.HandlerList;
2424
import plugily.projects.buildbattle.arena.BaseArena;
2525
import plugily.projects.buildbattle.arena.managers.plots.Plot;
26-
import plugily.projects.minigamesbox.classic.api.event.PlugilyEvent;
26+
import plugily.projects.minigamesbox.api.events.PlugilyEvent;
2727

2828
/**
2929
* @author Plajer

‎src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import org.bukkit.inventory.ItemStack;
4444
import plugily.projects.buildbattle.Main;
4545
import plugily.projects.buildbattle.arena.managers.plots.Plot;
46-
import plugily.projects.minigamesbox.classic.arena.ArenaState;
47-
import plugily.projects.minigamesbox.classic.arena.PluginArena;
46+
import plugily.projects.minigamesbox.api.arena.IArenaState;
47+
import plugily.projects.minigamesbox.api.arena.IPluginArena;
4848
import plugily.projects.minigamesbox.classic.arena.PluginArenaEvents;
4949
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
5050
import plugily.projects.minigamesbox.classic.utils.version.ServerVersion;
@@ -74,7 +74,7 @@ public void onBreak(BlockBreakEvent event) {
7474
if(arena == null) {
7575
return;
7676
}
77-
if(arena.getArenaState() != ArenaState.IN_GAME || (arena instanceof BuildArena && arena.getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING)
77+
if(arena.getArenaState() != IArenaState.IN_GAME || (arena instanceof BuildArena && arena.getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING)
7878
|| plugin.getBlacklistManager().getItemList().contains(event.getBlock().getType())) {
7979
event.setCancelled(true);
8080
return;
@@ -95,7 +95,7 @@ public void onPlace(BlockPlaceEvent event) {
9595
if(arena == null) {
9696
return;
9797
}
98-
if(arena.getArenaState() != ArenaState.IN_GAME || plugin.getBlacklistManager().getItemList().contains(event.getBlock().getType())
98+
if(arena.getArenaState() != IArenaState.IN_GAME || plugin.getBlacklistManager().getItemList().contains(event.getBlock().getType())
9999
|| (arena instanceof BuildArena && arena.getArenaInGameState() == BaseArena.ArenaInGameState.PLOT_VOTING)) {
100100
event.setCancelled(true);
101101
return;
@@ -119,7 +119,7 @@ public void onItemFrameRotate(PlayerInteractEntityEvent event) {
119119
if(event.getRightClicked().getType() == EntityType.ITEM_FRAME && ((ItemFrame) event.getRightClicked()).getItem().getType() != Material.AIR) {
120120
Location entityLocation = event.getRightClicked().getLocation();
121121

122-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
122+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
123123
if(!(arena instanceof BaseArena)) {
124124
continue;
125125
}
@@ -146,7 +146,7 @@ public void onNPCClick(PlugilyPlayerInteractEntityEvent event) {
146146

147147
BaseArena arena = plugin.getArenaRegistry().getArena(event.getPlayer());
148148

149-
if(arena == null || arena.getArenaState() != ArenaState.IN_GAME) {
149+
if(arena == null || arena.getArenaState() != IArenaState.IN_GAME) {
150150
return;
151151
}
152152

@@ -204,7 +204,7 @@ public void onEnderchestClick(PlugilyPlayerInteractEvent event) {
204204
return;
205205
}
206206

207-
if(arena.getArenaState() != ArenaState.IN_GAME || event.getClickedBlock().getType() == XMaterial.ENDER_CHEST.parseMaterial()) {
207+
if(arena.getArenaState() != IArenaState.IN_GAME || event.getClickedBlock().getType() == XMaterial.ENDER_CHEST.parseMaterial()) {
208208
event.setCancelled(true);
209209
}
210210
}
@@ -215,7 +215,7 @@ public void onMinecartMove(VehicleMoveEvent event) {
215215
if(vehicle.getType() != EntityType.MINECART) {
216216
return;
217217
}
218-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
218+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
219219
if(!(arena instanceof BaseArena)) {
220220
continue;
221221
}
@@ -232,7 +232,7 @@ public void onMinecartMove(VehicleMoveEvent event) {
232232
public void onIgniteEvent(BlockIgniteEvent event) {
233233
Location blockLocation = event.getBlock().getLocation();
234234

235-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
235+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
236236
if(!(arena instanceof BaseArena)) {
237237
continue;
238238
}
@@ -248,7 +248,7 @@ public void onIgniteEvent(BlockIgniteEvent event) {
248248
public void onPistonRetractEvent(BlockPistonRetractEvent event) {
249249
Location blockLocation = event.getBlock().getLocation();
250250

251-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
251+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
252252
if(!(arena instanceof BaseArena)) {
253253
continue;
254254
}
@@ -266,7 +266,7 @@ public void onPistonRetractEvent(BlockPistonRetractEvent event) {
266266
public void onLeavesDecay(LeavesDecayEvent event) {
267267
Location blockLocation = event.getBlock().getLocation();
268268

269-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
269+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
270270
if(!(arena instanceof BaseArena)) {
271271
continue;
272272
}
@@ -301,7 +301,7 @@ public void onCreatureSpawn(CreatureSpawnEvent event) {
301301
int maxMobPerPlot = plugin.getConfig().getInt("Mob.Max-Amount", 20);
302302
Location entityLoc = event.getEntity().getLocation();
303303

304-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
304+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
305305
if(!(arena instanceof BaseArena)) {
306306
continue;
307307
}
@@ -353,7 +353,7 @@ public void onBlockSpread(BlockSpreadEvent event) {
353353
if(event.getSource().getType() != Material.FIRE)
354354
return;
355355

356-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
356+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
357357
if(!(arena instanceof BaseArena)) {
358358
continue;
359359
}
@@ -373,7 +373,7 @@ public void onBlockSpread(BlockSpreadEvent event) {
373373
public void onDispense(BlockDispenseEvent event) {
374374
Location blockLoc = event.getBlock().getLocation();
375375

376-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
376+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
377377
if(!(arena instanceof BaseArena)) {
378378
continue;
379379
}
@@ -409,7 +409,7 @@ public void onEntityDamageEntity(EntityDamageByEntityEvent event) {
409409
return;
410410
}
411411
BaseArena arena = plugin.getArenaRegistry().getArena((Player) event.getEntity());
412-
if(arena == null || arena.getArenaState() != ArenaState.IN_GAME) {
412+
if(arena == null || arena.getArenaState() != IArenaState.IN_GAME) {
413413
return;
414414
}
415415
if(event.getEntity().getType() != EntityType.PLAYER) {
@@ -424,7 +424,7 @@ public void onDamage(EntityDamageEvent event) {
424424
return;
425425
}
426426
BaseArena arena = plugin.getArenaRegistry().getArena((Player) event.getEntity());
427-
if(arena == null || arena.getArenaState() != ArenaState.IN_GAME) {
427+
if(arena == null || arena.getArenaState() != IArenaState.IN_GAME) {
428428
return;
429429
}
430430
event.setCancelled(true);
@@ -455,7 +455,7 @@ public void onTNTInteract(PlugilyPlayerInteractEvent event) {
455455
public void onTNTExplode(EntityExplodeEvent event) {
456456
Location entityLocation = event.getEntity().getLocation();
457457

458-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
458+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
459459
if(!(arena instanceof BaseArena)) {
460460
continue;
461461
}
@@ -473,7 +473,7 @@ public void onWaterFlowEvent(BlockFromToEvent event) {
473473
Location toBlock = event.getToBlock().getLocation();
474474
Location blockLoc = event.getBlock().getLocation();
475475

476-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
476+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
477477
if(!(arena instanceof BaseArena)) {
478478
continue;
479479
}
@@ -507,7 +507,7 @@ public void onFoodChange(FoodLevelChangeEvent event) {
507507
@EventHandler
508508
public void onPistonExtendEvent(BlockPistonExtendEvent event) {
509509
Location blockLoc = event.getBlock().getLocation();
510-
for(PluginArena arena : plugin.getArenaRegistry().getArenas()) {
510+
for(IPluginArena arena : plugin.getArenaRegistry().getArenas()) {
511511
if(!(arena instanceof BaseArena)) {
512512
continue;
513513
}
@@ -548,7 +548,7 @@ public void onItemMove(InventoryClickEvent event) {
548548
if(humanEntity instanceof Player) {
549549
BaseArena baseArena = plugin.getArenaRegistry().getArena((Player) humanEntity);
550550

551-
if(baseArena != null && baseArena.getArenaState() != ArenaState.IN_GAME) {
551+
if(baseArena != null && baseArena.getArenaState() != IArenaState.IN_GAME) {
552552
if(event.getClickedInventory() == humanEntity.getInventory()) {
553553
if(event.getView().getType() == InventoryType.CRAFTING
554554
|| event.getView().getType() == InventoryType.PLAYER) {
@@ -566,7 +566,7 @@ public void onGTBGuessChat(AsyncPlayerChatEvent event) {
566566
if(!(arena instanceof GuessArena)) {
567567
return;
568568
}
569-
if(arena.getArenaState() != ArenaState.IN_GAME) {
569+
if(arena.getArenaState() != IArenaState.IN_GAME) {
570570
return;
571571
}
572572
if(arena.getSpectators().contains(player)) {

‎src/main/java/plugily/projects/buildbattle/arena/ArenaManager.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import org.jetbrains.annotations.NotNull;
2525
import plugily.projects.buildbattle.Main;
2626
import plugily.projects.buildbattle.arena.managers.plots.Plot;
27-
import plugily.projects.minigamesbox.classic.arena.ArenaState;
27+
import plugily.projects.minigamesbox.api.arena.IArenaState;
28+
import plugily.projects.minigamesbox.api.arena.IPluginArena;
29+
import plugily.projects.minigamesbox.api.user.IUser;
2830
import plugily.projects.minigamesbox.classic.arena.PluginArena;
2931
import plugily.projects.minigamesbox.classic.arena.PluginArenaManager;
3032
import plugily.projects.minigamesbox.classic.user.User;
@@ -45,7 +47,7 @@ public ArenaManager(Main plugin) {
4547
}
4648

4749
@Override
48-
public void additionalPartyJoin(Player player, PluginArena arena, Player partyLeader) {
50+
public void additionalPartyJoin(Player player, IPluginArena arena, Player partyLeader) {
4951
BaseArena pluginArena = plugin.getArenaRegistry().getArena(arena.getId());
5052
if(pluginArena == null) {
5153
return;
@@ -67,13 +69,13 @@ public void additionalPartyJoin(Player player, PluginArena arena, Player partyLe
6769
}
6870

6971
@Override
70-
public void leaveAttempt(@NotNull Player player, @NotNull PluginArena arena) {
72+
public void leaveAttempt(@NotNull Player player, @NotNull IPluginArena arena) {
7173
BaseArena pluginArena = plugin.getArenaRegistry().getArena(arena.getId());
7274
if(pluginArena == null) {
7375
return;
7476
}
7577
super.leaveAttempt(player, arena);
76-
User user = plugin.getUserManager().getUser(player);
78+
IUser user = plugin.getUserManager().getUser(player);
7779
user.setStatistic("LOCAL_POINTS", 0);
7880
user.setStatistic("LOCAL_POINTS_GTB", 0);
7981
Plot plot = pluginArena.getPlotManager().getPlot(player);
@@ -91,7 +93,7 @@ public void leaveAttempt(@NotNull Player player, @NotNull PluginArena arena) {
9193
((GuessArena) arena).getWhoGuessed().remove(player);
9294
if(guessArena.getCurrentBuilders().contains(player)) {
9395
if(plot.getMembers().isEmpty()) {
94-
if(arena.getArenaState() == ArenaState.IN_GAME) {
96+
if(arena.getArenaState() == IArenaState.IN_GAME) {
9597
//ToDo message force skipped
9698
pluginArena.setTimer(plugin.getConfig().getInt("Time-Manager." + pluginArena.getArenaType().getPrefix() + ".Round-Delay"), true);
9799
pluginArena.setArenaInGameState(BaseArena.ArenaInGameState.PLOT_VOTING);

‎src/main/java/plugily/projects/buildbattle/arena/ArenaRegistry.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.jetbrains.annotations.Nullable;
3030
import plugily.projects.buildbattle.Main;
3131
import plugily.projects.buildbattle.arena.managers.plots.Plot;
32+
import plugily.projects.minigamesbox.api.arena.IPluginArena;
3233
import plugily.projects.minigamesbox.classic.arena.PluginArena;
3334
import plugily.projects.minigamesbox.classic.arena.PluginArenaRegistry;
3435
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
@@ -156,7 +157,7 @@ public boolean additionalValidatorChecks(ConfigurationSection section, PluginAre
156157

157158
@Override
158159
public @Nullable BaseArena getArena(Player player) {
159-
PluginArena pluginArena = super.getArena(player);
160+
IPluginArena pluginArena = super.getArena(player);
160161
if(pluginArena instanceof BaseArena) {
161162
return (BaseArena) pluginArena;
162163
}
@@ -165,7 +166,7 @@ public boolean additionalValidatorChecks(ConfigurationSection section, PluginAre
165166

166167
@Override
167168
public @Nullable BaseArena getArena(String id) {
168-
PluginArena pluginArena = super.getArena(id);
169+
IPluginArena pluginArena = super.getArena(id);
169170
if(pluginArena instanceof BaseArena) {
170171
return (BaseArena) pluginArena;
171172
}
@@ -174,7 +175,7 @@ public boolean additionalValidatorChecks(ConfigurationSection section, PluginAre
174175

175176
public @NotNull List<BaseArena> getPluginArenas() {
176177
List<BaseArena> baseArenas = new ArrayList<>(super.getArenas().size());
177-
for(PluginArena pluginArena : super.getArenas()) {
178+
for(IPluginArena pluginArena : super.getArenas()) {
178179
if(pluginArena instanceof BaseArena) {
179180
baseArenas.add((BaseArena) pluginArena);
180181
}

‎src/main/java/plugily/projects/buildbattle/arena/BuildArena.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import plugily.projects.buildbattle.arena.states.build.StartingState;
2828
import plugily.projects.buildbattle.handlers.themes.vote.VoteMenu;
2929
import plugily.projects.buildbattle.handlers.themes.vote.VotePoll;
30-
import plugily.projects.minigamesbox.classic.arena.ArenaState;
30+
import plugily.projects.minigamesbox.api.arena.IArenaState;
3131

3232
import java.util.*;
3333

@@ -44,8 +44,8 @@ public class BuildArena extends BaseArena {
4444
public BuildArena(String id) {
4545
super(id);
4646
setArenaType(ArenaType.SOLO);
47-
addGameStateHandler(ArenaState.IN_GAME, new InGameState());
48-
addGameStateHandler(ArenaState.STARTING, new StartingState());
47+
addGameStateHandler(IArenaState.IN_GAME, new InGameState());
48+
addGameStateHandler(IArenaState.STARTING, new StartingState());
4949
getPlugin().getDebugger().debug("Init Arena {0} with ArenaType {1}", getId(), getArenaType());
5050
}
5151

0 commit comments

Comments
 (0)