majority of bug fixes
This commit is contained in:
@@ -2,7 +2,7 @@ package hdvtdev.blockAndSeek.roulette;
|
||||
|
||||
import hdvtdev.blockAndSeek.BlockAndSeek;
|
||||
import hdvtdev.blockAndSeek.BlockAndSeekMap;
|
||||
import hdvtdev.blockAndSeek.EventListener;
|
||||
import hdvtdev.blockAndSeek.eventListeners.EventListener;
|
||||
import me.libraryaddict.disguise.DisguiseAPI;
|
||||
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
|
||||
import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
|
||||
@@ -25,6 +25,102 @@ import java.util.List;
|
||||
public class RouletteCreator implements InventoryHolder {
|
||||
|
||||
|
||||
public static void newCreateRoulette(Player player, List<BlockAndSeekMap.Block> blocks) {
|
||||
final Inventory gui = Bukkit.createInventory(null, 45);
|
||||
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()
|
||||
}
|
||||
);
|
||||
|
||||
private volatile boolean finished = false;
|
||||
private long startTime = System.currentTimeMillis();
|
||||
private long lastActionTime = startTime;
|
||||
private long nextDelay = 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;
|
||||
}
|
||||
|
||||
|
||||
nextDelay = (long) (baseDelay + (maxDelay - baseDelay) * (1 - Math.exp(-k * elapsedSeconds)));
|
||||
|
||||
if (now - lastActionTime >= nextDelay) {
|
||||
i++;
|
||||
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);
|
||||
|
||||
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();
|
||||
lastActionTime = now;
|
||||
}
|
||||
|
||||
i++;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}.runTaskTimer(BlockAndSeek.getInstance(), 0, 4);
|
||||
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user