some improvments, bugs and bugfixed )

This commit is contained in:
hdvt
2025-07-15 16:36:46 +03:00
parent 9f36ac3e4b
commit 66a77bd59a
13 changed files with 272 additions and 80 deletions

View File

@@ -13,6 +13,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -27,7 +28,7 @@ public final class RouletteCreator implements InventoryHolder {
private final Inventory roulette;
private Task task;
private volatile boolean closedByPlayer = true;
private volatile Boolean closedByPlayer = true;
public RouletteCreator(@NotNull Player player, List<BlockAndSeekMap.Block> blocks) {
roulette = Bukkit.createInventory(this, 45, Localization.getComponent(player, "roulette-title"));
@@ -38,7 +39,7 @@ public final class RouletteCreator implements InventoryHolder {
return task;
}
public boolean isClosedByPlayer() {
public @Nullable Boolean isClosedByPlayer() {
return closedByPlayer;
}
@@ -47,13 +48,13 @@ public final class RouletteCreator implements InventoryHolder {
return roulette;
}
public void closeInventory() {
public void closeInventoryBySystem() {
closedByPlayer = false;
roulette.close();
}
public void closeInventoryByPlayer() {
closedByPlayer = true;
public void closeInventory() {
closedByPlayer = null;
roulette.close();
}
@@ -104,23 +105,21 @@ public final class RouletteCreator implements InventoryHolder {
long now = System.currentTimeMillis();
double elapsed = (now - startTime) / 1000.0;
if (elapsed >= 9.5) {
if (elapsed >= 5) {
this.cancel();
}
double speed;
if (elapsed < 3.0) speed = 1.0;
else if (elapsed < 3.5) speed = 0.8;
else if (elapsed < 4.0) speed = 0.6;
else if (elapsed < 4.5) speed = 0.5;
else if (elapsed < 5.0) speed = 0.4;
else if (elapsed < 5.5) speed = 0.33;
else if (elapsed < 6.0) speed = 0.28;
else if (elapsed < 6.5) speed = 0.25;
else if (elapsed < 7.0) speed = 0.22;
else if (elapsed < 7.5) speed = 0.2;
else if (elapsed < 8.0) speed = 0.12;
else speed = 0.05;
if (elapsed < 2) speed = 1.0;
else if (elapsed < 2.2) speed = 0.8;
else if (elapsed < 2.4) speed = 0.6;
else if (elapsed < 2.6) speed = 0.5;
else if (elapsed < 2.8) speed = 0.4;
else if (elapsed < 3) speed = 0.33;
else if (elapsed < 3.2) speed = 0.28;
else if (elapsed < 3.5) speed = 0.22;
else if (elapsed < 3.8) speed = 0.15;
else speed = 0.1;
task(speed);
@@ -154,7 +153,7 @@ public final class RouletteCreator implements InventoryHolder {
}.runTaskTimer(BlockAndSeek.getInstance(), 0, 1);
task = new Task(rouletteTask, Bukkit.getScheduler().runTaskLater(BlockAndSeek.getInstance(), this::closeInventory, 300));
task = new Task(rouletteTask, Bukkit.getScheduler().runTaskLater(BlockAndSeek.getInstance(), this::closeInventoryBySystem, 300));
player.openInventory(gui);
}