hdvt/blockandseek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some improvments, bugs and bugfixed )

Browse Source
This commit is contained in:
hdvt
2025-07-03 02:40:14 +03:00
parent 611ac6c213
commit 9f36ac3e4b
33 changed files with 526 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

272
src/main/java/hdvtdev/blockAndSeek/roulette/RouletteCreator.java
View File

@@ -2,35 +2,74 @@ package hdvtdev.blockAndSeek.roulette;
import hdvtdev.blockAndSeek.BlockAndSeek;
import hdvtdev.blockAndSeek.BlockAndSeekMap;
import hdvtdev.blockAndSeek.eventListeners.EventListener;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import net.kyori.adventure.text.Component;
import hdvtdev.blockAndSeek.Localization;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class RouletteCreator implements InventoryHolder {
public final class RouletteCreator implements InventoryHolder {
public static void newCreateRoulette(Player player, List<BlockAndSeekMap.Block> blocks) {
final Inventory gui = Bukkit.createInventory(null, 45);
new BukkitRunnable() {
private static final int[] slots = {3, 5, 7, 12, 14, 16, 21, 23, 25, 30, 32, 34, 39, 41, 43};
private static final int[] midSlots = {21, 23, 25};
private static final Random random = new Random();
private final Inventory roulette;
private Task task;
private volatile boolean closedByPlayer = true;
public RouletteCreator(@NotNull Player player, List<BlockAndSeekMap.Block> blocks) {
roulette = Bukkit.createInventory(this, 45, Localization.getComponent(player, "roulette-title"));
this.createUnoptimizedRoulette(roulette, player, blocks);
}
public @NotNull Task getTask() {
return task;
}
public boolean isClosedByPlayer() {
return closedByPlayer;
}
@Override
public @NotNull Inventory getInventory() {
return roulette;
}
public void closeInventory() {
closedByPlayer = false;
roulette.close();
}
public void closeInventoryByPlayer() {
closedByPlayer = true;
roulette.close();
}
public ItemStack randomPropItem() {
return roulette.getItem(slots[random.nextInt(0, 15)]);
}
public ItemStack randomMidPropItem() {
return roulette.getItem(midSlots[random.nextInt(0, 3)]);
}
@ApiStatus.Experimental
private void createUnoptimizedRoulette(Inventory gui, Player player, List<BlockAndSeekMap.Block> blocks) {
BukkitTask rouletteTask = new BukkitRunnable() {
int i = 0;
final RouletteGenerator rouletteGenerator = new RouletteGenerator(blocks);
final List<RouletteList<ItemStack>> rows = List.of(
@@ -39,57 +78,58 @@ public class RouletteCreator implements InventoryHolder {
new RouletteList<>(rouletteGenerator.getRandomRow(15))
);
final List<ItemStack[]> items = List.of(
new ItemStack[]{
rows.getFirst().next(),
rows.getFirst().next(),
rows.getFirst().next(),
rows.getFirst().next(),
rows.getFirst().next()
},
new ItemStack[]{
rows.get(1).next(),
rows.get(1).next(),
rows.get(1).next(),
rows.get(1).next(),
rows.get(1).next()
},
new ItemStack[]{
rows.get(2).next(),
rows.get(2).next(),
rows.get(2).next(),
rows.get(2).next(),
rows.get(2).next()
final List<ItemStack[]> items;
{
List<ItemStack[]> rawItems = new ArrayList<>();
for (int j = 0; j < 3; j++) {
ItemStack[] itemStacks = new ItemStack[5];
for (int l = 0; l < 5; l++) {
itemStacks[l] = rows.get(j).next();
}
);
rawItems.add(j, itemStacks);
}
items = rawItems;
}
private volatile boolean finished = false;
private long startTime = System.currentTimeMillis();
private long lastActionTime = startTime;
private long nextDelay = 0;
final long startTime = System.currentTimeMillis();
double currentSpeed = 0;
int i = 0;
private final long baseDelay = 30;
private final long maxDelay = 450;
private final double k = 0.2;
@Override
public void run() {
if (finished) this.cancel();
long now = System.currentTimeMillis();
long elapsedSeconds = (now - startTime) / 1000;
if (elapsedSeconds >= 10) {
finished = true;
return;
double elapsed = (now - startTime) / 1000.0;
if (elapsed >= 9.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;
nextDelay = (long) (baseDelay + (maxDelay - baseDelay) * (1 - Math.exp(-k * elapsedSeconds)));
task(speed);
if (now - lastActionTime >= nextDelay) {
i++;
i++;
}
private void task(double speed) {
if (currentSpeed >= 1) {
currentSpeed = 0;
for (int j = 0; j < 5; j++) {
gui.setItem(3 + j * 9, items.getFirst()[j]);
gui.setItem(5 + j * 9, items.get(1)[j]);
@@ -107,136 +147,24 @@ public class RouletteCreator implements InventoryHolder {
items.getFirst()[0] = rows.getFirst().next();
items.get(1)[0] = rows.get(1).next();
items.get(2)[0] = rows.get(2).next();
lastActionTime = now;
}
i++;
} else currentSpeed += speed;
}
}.runTaskTimer(BlockAndSeek.getInstance(), 0, 1);
}.runTaskTimer(BlockAndSeek.getInstance(), 0, 4);
task = new Task(rouletteTask, Bukkit.getScheduler().runTaskLater(BlockAndSeek.getInstance(), this::closeInventory, 300));
player.openInventory(gui);
}
@Deprecated
public static void createRoulette(Player player, Inventory inventory, boolean openInventory, List<BlockAndSeekMap.Block> blocks) {
Inventory gui = inventory == null ? new RouletteCreator().getInventory() : inventory;
EventListener.createTask(player, new BukkitRunnable() {
int i = 0;
final RouletteGenerator rouletteGenerator = new RouletteGenerator(blocks);
final List<RouletteList<ItemStack>> rows = List.of(
new RouletteList<>(rouletteGenerator.getRandomRow(15)),
new RouletteList<>(rouletteGenerator.getRandomRow(15)),
new RouletteList<>(rouletteGenerator.getRandomRow(15))
);
final List<ItemStack[]> items = List.of(
new ItemStack[]{
rows.getFirst().next(),
rows.getFirst().next(),
rows.getFirst().next(),
rows.getFirst().next(),
rows.getFirst().next()
},
new ItemStack[]{
rows.get(1).next(),
rows.get(1).next(),
rows.get(1).next(),
rows.get(1).next(),
rows.get(1).next()
},
new ItemStack[]{
rows.get(2).next(),
rows.get(2).next(),
rows.get(2).next(),
rows.get(2).next(),
rows.get(2).next()
}
);
@Override
public void run() {
for (int j = 0; j < 5; j++) {
gui.setItem(3 + j * 9, items.getFirst()[j]);
gui.setItem(5 + j * 9, items.get(1)[j]);
gui.setItem(7 + j * 9, items.get(2)[j]);
}
player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 0.5f, 2f);
if (i == 30) {
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.5f, 0.5f);
EventListener.stopTask(player);
}
for (int j = 4; j >= 1; j--) {
items.getFirst()[j] = items.getFirst()[j - 1];
items.get(1)[j] = items.get(1)[j - 1];
items.get(2)[j] = items.get(2)[j - 1];
}
items.getFirst()[0] = rows.getFirst().next();
items.get(1)[0] = rows.get(1).next();
items.get(2)[0] = rows.get(2).next();
i++;
}
}.runTaskTimer(BlockAndSeek.getInstance(), 0, 3L));
new BukkitRunnable() {
@Override
public void run() {
Inventory inventory = player.getOpenInventory().getTopInventory();
if (inventory.getHolder() instanceof RouletteCreator) {
inventory.close();
MiscDisguise miscDisguise = new MiscDisguise(DisguiseType.FALLING_BLOCK, inventory.getItem(21));
DisguiseAPI.disguiseToAll(player, miscDisguise);
}
}
}.runTaskLater(BlockAndSeek.getInstance(), 300L);
if (openInventory) {
player.openInventory(gui);
player.setMetadata("RollingMenu", new FixedMetadataValue(BlockAndSeek.getInstance(), "RollingMenu"));
public record Task(BukkitTask rouletteTask, BukkitTask autoCloseTask) {
public void cancelBoth() {
rouletteTask.cancel();
autoCloseTask.cancel();
}
}
@Override
public @NotNull Inventory getInventory() {
Inventory gui = Bukkit.createInventory(this, 45, Component.text("РулетОЧКА"));
ItemStack filler = new ItemStack(Material.BLUE_STAINED_GLASS_PANE);
ItemMeta fillerMeta = filler.getItemMeta();
fillerMeta.displayName(Component.text(""));
fillerMeta.lore(null);
fillerMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
filler.setItemMeta(fillerMeta);
for (int i = 0; i < 45; i++) {
gui.setItem(i, filler);
}
return gui;
}
}