Skip to content

Commit b29dc61

Browse files
LarsEsDochLarsEsDoch
committed
Updated API version
1 parent c0874cf commit b29dc61

File tree

5 files changed

+24
-27
lines changed

5 files changed

+24
-27
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
compileOnly 'me.lucko:spark-api:0.1-SNAPSHOT'
2121
compileOnly 'net.dmulloy2:ProtocolLib:5.4.0'
2222
implementation 'net.dv8tion:JDA:5.0.0-beta.20'
23-
implementation 'com.github.LarsEsDoch:ApiManager:4.2.3'
23+
implementation 'com.github.LarsEsDoch:ApiManager:4.3.1'
2424
}
2525

2626
tasks {

‎src/main/java/de/lars/utilsmanager/features/court/CourtManager.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import de.lars.utilsmanager.utils.Statements;
99
import net.kyori.adventure.text.Component;
1010
import net.kyori.adventure.text.ComponentBuilder;
11+
import net.kyori.adventure.text.TextComponent;
1112
import net.kyori.adventure.text.event.ClickEvent;
1213
import net.kyori.adventure.text.event.HoverEvent;
1314
import net.kyori.adventure.text.format.NamedTextColor;
@@ -151,7 +152,6 @@ public void checkCriminal() {
151152
if (criminal == 3) {
152153
return;
153154
}
154-
timeToCourt = 60;
155155
if (isPlayerOffline(CourtAPI.getApi().getProsecutor(player))) {
156156
CourtAPI.getApi().resetPlayer(player);
157157
return;
@@ -578,16 +578,16 @@ public void checkCriminal() {
578578
wittnesChecker.append(witnessYes);
579579
member.sendMessage(wittnesChecker.build());
580580
}
581-
TimerAPI.getApi().setOff(member, false);
581+
TimerAPI.getApi().setEnabled(member, true);
582582
TimerAPI.getApi().setTimer(member, true);
583583
TimerAPI.getApi().setTime(member, 120);
584584
TimerAPI.getApi().setRunning(member,true);
585585
}
586-
TimerAPI.getApi().setOff(prosecutor, false);
586+
TimerAPI.getApi().setEnabled(prosecutor, true);
587587
TimerAPI.getApi().setTimer(prosecutor, true);
588588
TimerAPI.getApi().setTime(prosecutor, 120);
589589
TimerAPI.getApi().setRunning(prosecutor,true);
590-
TimerAPI.getApi().setOff(player, false);
590+
TimerAPI.getApi().setEnabled(player, true);
591591
TimerAPI.getApi().setTimer(player, true);
592592
TimerAPI.getApi().setTime(player, 120);
593593
TimerAPI.getApi().setRunning(player,true);
@@ -603,9 +603,9 @@ public void checkCriminal() {
603603
TimerAPI.getApi().setRunning(member, false);
604604
TimerAPI.getApi().setTime(member, 0);
605605
TimerAPI.getApi().setTimer(member, false);
606-
TimerAPI.getApi().setOff(member, true);
606+
TimerAPI.getApi().setEnabled(member, false);
607607
}
608-
TimerAPI.getApi().setOff(player, true);
608+
TimerAPI.getApi().setEnabled(player, false);
609609
TimerAPI.getApi().setTimer(player, false);
610610
TimerAPI.getApi().setTime(player, 0);
611611
TimerAPI.getApi().setRunning(player,false);
@@ -617,14 +617,14 @@ public void checkCriminal() {
617617
TimerAPI.getApi().setRunning(member, false);
618618
TimerAPI.getApi().setTime(member, 0);
619619
TimerAPI.getApi().setTimer(member, false);
620-
TimerAPI.getApi().setOff(member, true);
620+
TimerAPI.getApi().setEnabled(member, false);
621621
}
622-
TimerAPI.getApi().setOff(player, true);
622+
TimerAPI.getApi().setEnabled(player, false);
623623
TimerAPI.getApi().setTimer(player, false);
624624
TimerAPI.getApi().setTime(player, 0);
625625
TimerAPI.getApi().setRunning(player,false);
626626

627-
TimerAPI.getApi().setOff(prosecutor, true);
627+
TimerAPI.getApi().setEnabled(prosecutor, false);
628628
TimerAPI.getApi().setTimer(prosecutor, false);
629629
TimerAPI.getApi().setTime(prosecutor, 0);
630630
TimerAPI.getApi().setRunning(prosecutor,false);
@@ -640,15 +640,15 @@ public void checkCriminal() {
640640
TimerAPI.getApi().setRunning(member, false);
641641
TimerAPI.getApi().setTime(member, 0);
642642
TimerAPI.getApi().setTimer(member, false);
643-
TimerAPI.getApi().setOff(member, true);
643+
TimerAPI.getApi().setEnabled(member, false);
644644
}
645645
UUID prosecutorUUID = UUID.fromString(CourtAPI.getApi().getProsecutor(player));
646646
Player prosecutor = Bukkit.getPlayer(prosecutorUUID);
647-
TimerAPI.getApi().setOff(player, true);
647+
TimerAPI.getApi().setEnabled(player, false);
648648
TimerAPI.getApi().setTimer(player, false);
649649
TimerAPI.getApi().setTime(player, 0);
650650
TimerAPI.getApi().setRunning(player,false);
651-
TimerAPI.getApi().setOff(prosecutor, true);
651+
TimerAPI.getApi().setEnabled(prosecutor, false);
652652
TimerAPI.getApi().setTimer(prosecutor, false);
653653
TimerAPI.getApi().setTime(prosecutor, 0);
654654
TimerAPI.getApi().setRunning(prosecutor,false);
@@ -757,7 +757,7 @@ public void checkCriminal() {
757757
}
758758
}
759759
Integer cell = new Random().nextInt(5) + 1;
760-
TimerAPI.getApi().setOff(player, false);
760+
TimerAPI.getApi().setEnabled(player, true);
761761
TimerAPI.getApi().setTime(player, 600);
762762
TimerAPI.getApi().setTimer(player, true);
763763
TimerAPI.getApi().setRunning(player,true);
@@ -945,7 +945,6 @@ public Integer free(Player player) {
945945
public void sitOn() {
946946
for (int i = 0; i < members.size(); i++) {
947947
Player player = members.get(i);
948-
Player member = player;
949948
World world = Bukkit.getWorld("world");
950949
int place = i + 1;
951950
switch (place) {

‎src/main/java/de/lars/utilsmanager/features/timer/Timer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public Timer() {
1919
private void run() {
2020
Bukkit.getScheduler().runTaskTimerAsynchronously(UtilsManager.getInstance(), bukkitTask -> {
2121
for (Player player : Bukkit.getOnlinePlayers()) {
22-
if (TimerAPI.getApi().isOff(player)) {
22+
if (!TimerAPI.getApi().isEnabled(player)) {
2323
return;
2424
}
2525
if (TimerAPI.getApi().isPublic(player)) {

‎src/main/java/de/lars/utilsmanager/features/timer/TimerCommand.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
6565
}
6666
}
6767
}
68-
if(timer.isOff(player)) {
68+
if(!timer.isEnabled(player)) {
6969
if (LanguageAPI.getApi().getLanguage(player) == 2) {
7070
player.sendMessage(Statements.getPrefix()
7171
.append(Component.text("Der Timer ist ausgeschaltet!", NamedTextColor.RED)));
@@ -319,7 +319,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
319319
}
320320
}
321321
timer.setRunning(player,false);
322-
if (timer.isOff(player)) {
322+
if (!timer.isEnabled(player)) {
323323
if (LanguageAPI.getApi().getLanguage(player) == 2) {
324324
player.sendMessage(Statements.getPrefix()
325325
.append(Component.text("Der Timer ist bereits ausgeschaltet!", NamedTextColor.RED)));
@@ -337,7 +337,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
337337
.append(Component.text("The timer was switched off.", NamedTextColor.WHITE)));
338338
}
339339

340-
timer.setOff(player, true);
340+
timer.setEnabled(player, false);
341341
break;
342342
}
343343
case "on": {
@@ -355,7 +355,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
355355
}
356356
}
357357
}
358-
if (!timer.isOff(player)) {
358+
if (timer.isEnabled(player)) {
359359
if (LanguageAPI.getApi().getLanguage(player) == 2) {
360360
player.sendMessage(Statements.getPrefix()
361361
.append(Component.text("Der Timer ist bereits angeschaltet!", NamedTextColor.RED)));
@@ -373,7 +373,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
373373
.append(Component.text("The timer was switched on.", NamedTextColor.WHITE)));
374374
}
375375

376-
timer.setOff(player,false);
376+
timer.setEnabled(player,true);
377377
break;
378378
}
379379
case "public": {
@@ -414,7 +414,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
414414
}
415415
for (Player onlinePlayer: Bukkit.getOnlinePlayers()) {
416416
timer.setRunning(onlinePlayer, false);
417-
timer.setOff(onlinePlayer, false);
417+
timer.setEnabled(onlinePlayer, true);
418418
}
419419
timer.setRunning(player, true);
420420
timer.setPublic(player, true);
@@ -456,11 +456,9 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
456456
}
457457
timer.setPublic(player, false);
458458
for (Player onlinePlayer: Bukkit.getOnlinePlayers()) {
459-
timer.setRunning(onlinePlayer, false);
460-
timer.setOff(onlinePlayer, true);
459+
timer.setEnabled(onlinePlayer, false);
461460
}
462-
timer.setRunning(player, true);
463-
timer.setOff(player, false);
461+
timer.setEnabled(player, true);
464462
if (LanguageAPI.getApi().getLanguage(player) == 2) {
465463
player.sendMessage(Statements.getPrefix()
466464
.append(Component.text("Der Timer ist nicht mehr öffentlich.", NamedTextColor.WHITE)));

‎src/main/java/de/lars/utilsmanager/listener/player/BedListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private void run() {
4848
.append(Component.text(" Spieler schlafen.", NamedTextColor.DARK_PURPLE));
4949
}
5050
for (Player player : Bukkit.getOnlinePlayers()) {
51-
if (!TimerAPI.getApi().isOff(player)) {
51+
if (TimerAPI.getApi().isEnabled(player)) {
5252
return;
5353
}
5454
if (LanguageAPI.getApi().getLanguage(player) == 2) {

0 commit comments

Comments
 (0)