hyro/lighteco
1
0
Fork 0
mirror of https://github.com/xHyroM/lighteco.git synced 2024-11-21 14:31:09 +01:00
Code Issues Projects Releases Wiki Activity

feat: task schedulers

Browse source
This commit is contained in:
Jozef Steinhübl 2023-08-30 00:41:09 +02:00
parent 2cfba60fbe
commit 63dc921539
20 changed files with 165 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/BukkitLightEcoBootstrap.java
View file

@ -4,6 +4,7 @@ import dev.xhyrom.lighteco.bukkit.logger.BukkitLogger;
import dev.xhyrom.lighteco.common.plugin.bootstrap.LightEcoBootstrap;
import dev.xhyrom.lighteco.common.plugin.bootstrap.LoaderBootstrap;
import dev.xhyrom.lighteco.common.plugin.logger.PluginLogger;
import dev.xhyrom.lighteco.common.plugin.scheduler.SchedulerAdapter;
import lombok.Getter;
import org.bukkit.Server;
import org.bukkit.entity.Entity;
@ -49,6 +50,11 @@ public class BukkitLightEcoBootstrap implements LightEcoBootstrap, LoaderBootstr
return this.loader.getServer();
}
@Override
public SchedulerAdapter getScheduler() {
return new BukkitSchedulerAdapter(this);
}
@Override
public Path getDataDirectory() {
return this.loader.getDataFolder().toPath();

53
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/BukkitSchedulerAdapter.java Normal file
View file

@ -0,0 +1,53 @@
package dev.xhyrom.lighteco.bukkit;
import dev.xhyrom.lighteco.common.plugin.scheduler.SchedulerAdapter;
import dev.xhyrom.lighteco.common.plugin.scheduler.SchedulerTask;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import java.util.concurrent.TimeUnit;
public class BukkitSchedulerAdapter implements SchedulerAdapter {
private final BukkitLightEcoBootstrap bootstrap;
private final BukkitScheduler scheduler;
public BukkitSchedulerAdapter(BukkitLightEcoBootstrap bootstrap) {
this.bootstrap = bootstrap;
this.scheduler = bootstrap.getServer().getScheduler();
}
@Override
public SchedulerTask asyncLater(Runnable runnable, long delay, TimeUnit unit) {
return new Task(
this.scheduler.runTaskLaterAsynchronously(
this.bootstrap.getLoader(),
runnable,
unit.toSeconds(delay) * 20
)
);
}
@Override
public SchedulerTask asyncRepeating(Runnable runnable, long interval, TimeUnit unit) {
return new Task(
this.scheduler.runTaskTimerAsynchronously(
this.bootstrap.getLoader(),
runnable,
0,
unit.toSeconds(interval) * 20
)
);
}
public class Task implements SchedulerTask {
private final BukkitTask task;
public Task(BukkitTask task) {
this.task = task;
}
@Override
public void cancel() {
this.task.cancel();
}
}
}

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/BalanceCommand.java
View file

@ -45,7 +45,7 @@ public class BalanceCommand implements Command {
}
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {
.thenAccept(result -> {
String username = result.getUsername() == null ?
target.getName() != null
? target.getName()

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/GiveCommand.java
View file

@ -44,7 +44,7 @@ public class GiveCommand implements Command {
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {
.thenAccept(result -> {
String name = target.getName() != null ? target.getName() : args.getRaw("target");
result.setUsername(name);

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/PayCommand.java
View file

@ -43,7 +43,7 @@ public class PayCommand implements Command {
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {
.thenAccept(result -> {
String username = result.getUsername() == null ?
target.getName() != null
? target.getName()

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/SetCommand.java
View file

@ -44,7 +44,7 @@ public class SetCommand implements Command {
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {
.thenAccept(result -> {
String name = target.getName() != null ? target.getName() : args.getRaw("target");
result.setUsername(name);

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/TakeCommand.java
View file

@ -44,7 +44,7 @@ public class TakeCommand implements Command {
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {
.thenAccept(result -> {
String name = target.getName() != null ? target.getName() : args.getRaw("target");
result.setUsername(name);

21
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/listeners/BukkitConnectionListener.java
View file

@ -1,13 +1,17 @@
package dev.xhyrom.lighteco.bukkit.listeners;
import dev.xhyrom.lighteco.bukkit.BukkitLightEcoPlugin;
import dev.xhyrom.lighteco.common.model.user.User;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import java.util.UUID;
public class BukkitConnectionListener implements Listener {
private final BukkitLightEcoPlugin plugin;
private final MiniMessage miniMessage = MiniMessage.miniMessage();
@ -34,7 +38,22 @@ public class BukkitConnectionListener implements Listener {
}
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
this.plugin.getUserManager().unload(event.getPlayer().getUniqueId());
UUID uniqueId = event.getPlayer().getUniqueId();
User user = this.plugin.getUserManager().getIfLoaded(uniqueId);
if (!user.isDirty()) {
this.plugin.getUserManager().unload(uniqueId);
return;
}
this.plugin.getUserManager().saveUser(user)
.thenAccept(v -> {
// make sure the player is offline before unloading
if (Bukkit.getPlayer(uniqueId) != null) return;
this.plugin.getUserManager().unload(uniqueId);
});
}
}

1
bukkittest/src/main/java/dev/xhyrom/lighteco/bukkittest/TestPlugin.java
View file

@ -7,7 +7,6 @@ import dev.xhyrom.lighteco.api.model.user.User;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.List;

12
common/src/main/java/dev/xhyrom/lighteco/common/manager/command/AbstractCommandManager.java
View file

@ -112,8 +112,7 @@ public abstract class AbstractCommandManager implements CommandManager {
)
);
this.plugin.getUserManager().saveUser(target)
.thenAccept(v -> removeFromMustWait(target.getUniqueId(), sender.getUniqueId()));
removeFromMustWait(target.getUniqueId(), sender.getUniqueId());
}
@Override
@ -133,8 +132,7 @@ public abstract class AbstractCommandManager implements CommandManager {
)
);
this.plugin.getUserManager().saveUser(target)
.thenAccept(v -> removeFromMustWait(target.getUniqueId(), sender.getUniqueId()));
removeFromMustWait(target.getUniqueId(), sender.getUniqueId());
}
@Override
@ -154,8 +152,7 @@ public abstract class AbstractCommandManager implements CommandManager {
)
);
this.plugin.getUserManager().saveUser(target)
.thenAccept(v -> removeFromMustWait(target.getUniqueId(), sender.getUniqueId()));
removeFromMustWait(target.getUniqueId(), sender.getUniqueId());
}
@Override
@ -209,7 +206,6 @@ public abstract class AbstractCommandManager implements CommandManager {
)
);
this.plugin.getUserManager().saveUsers(user, target)
.thenAccept(v -> removeFromMustWait(sender.getUniqueId(), target.getUniqueId()));
removeFromMustWait(target.getUniqueId(), sender.getUniqueId());
}
}

1
common/src/main/java/dev/xhyrom/lighteco/common/manager/user/StandardUserManager.java
View file

@ -5,6 +5,7 @@ import dev.xhyrom.lighteco.common.model.user.User;
import dev.xhyrom.lighteco.common.plugin.LightEcoPlugin;
import java.util.Arrays;
import java.util.Collection;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

1
common/src/main/java/dev/xhyrom/lighteco/common/manager/user/UserManager.java
View file

@ -3,6 +3,7 @@ package dev.xhyrom.lighteco.common.manager.user;
import dev.xhyrom.lighteco.common.manager.Manager;
import dev.xhyrom.lighteco.common.model.user.User;
import java.util.Collection;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

19
common/src/main/java/dev/xhyrom/lighteco/common/model/user/User.java
View file

@ -20,9 +20,14 @@ public class User {
@Getter
private final UUID uniqueId;
@Getter
@Setter
private boolean dirty = false;
@Getter
@Setter
private String username;
private final HashMap<Currency, BigDecimal> balances = new HashMap<>();
public User(LightEcoPlugin plugin, UUID uniqueId) {
@ -46,6 +51,8 @@ public class User {
balance = balance.setScale(currency.fractionalDigits(), RoundingMode.DOWN);
balances.put(currency, balance);
this.setDirty(true);
}
public void deposit(@NonNull Currency currency, @NonNull BigDecimal amount) throws IllegalArgumentException {
@ -53,7 +60,7 @@ public class User {
throw new IllegalArgumentException("Amount cannot be negative");
}
setBalance(currency, getBalance(currency).add(amount));
this.setBalance(currency, this.getBalance(currency).add(amount));
}
public void withdraw(@NonNull Currency currency, @NonNull BigDecimal amount) throws IllegalArgumentException {
@ -61,15 +68,11 @@ public class User {
throw new IllegalArgumentException("Amount cannot be negative");
}
if (getBalance(currency).compareTo(amount) < 0) {
if (this.getBalance(currency).compareTo(amount) < 0) {
// Withdraw all
amount = getBalance(currency);
amount = this.getBalance(currency);
}
setBalance(currency, getBalance(currency).subtract(amount));
}
public void invalidateCaches() {
balances.clear();
this.setBalance(currency, this.getBalance(currency).subtract(amount));
}
}

5
common/src/main/java/dev/xhyrom/lighteco/common/plugin/AbstractLightEcoPlugin.java
View file

@ -8,10 +8,13 @@ import dev.xhyrom.lighteco.common.dependencies.DependencyManager;
import dev.xhyrom.lighteco.common.dependencies.DependencyManagerImpl;
import dev.xhyrom.lighteco.common.storage.Storage;
import dev.xhyrom.lighteco.common.storage.StorageFactory;
import dev.xhyrom.lighteco.common.task.UserSaveTask;
import eu.okaeri.configs.ConfigManager;
import eu.okaeri.configs.yaml.snakeyaml.YamlSnakeYamlConfigurer;
import lombok.Getter;
import java.util.concurrent.TimeUnit;
@Getter
public abstract class AbstractLightEcoPlugin implements LightEcoPlugin {
private DependencyManager dependencyManager;
@ -51,6 +54,8 @@ public abstract class AbstractLightEcoPlugin implements LightEcoPlugin {
this.api = new LightEcoApi(this);
LightEcoProvider.set(this.api);
this.registerApiOnPlatform(this.api);
this.getBootstrap().getScheduler().asyncRepeating(new UserSaveTask(this), 3, TimeUnit.SECONDS);
}
public final void disable() {

2
common/src/main/java/dev/xhyrom/lighteco/common/plugin/bootstrap/LightEcoBootstrap.java
View file

@ -1,6 +1,7 @@
package dev.xhyrom.lighteco.common.plugin.bootstrap;
import dev.xhyrom.lighteco.common.plugin.logger.PluginLogger;
import dev.xhyrom.lighteco.common.plugin.scheduler.SchedulerAdapter;
import java.io.InputStream;
import java.nio.file.Path;
@ -10,6 +11,7 @@ import java.util.UUID;
public interface LightEcoBootstrap {
Object getLoader();
PluginLogger getLogger();
SchedulerAdapter getScheduler();
Path getDataDirectory();
List<UUID> getOnlinePlayers();
InputStream getResourceStream(String filename);

9
common/src/main/java/dev/xhyrom/lighteco/common/plugin/scheduler/SchedulerAdapter.java Normal file
View file

@ -0,0 +1,9 @@
package dev.xhyrom.lighteco.common.plugin.scheduler;
import java.util.concurrent.TimeUnit;
public interface SchedulerAdapter {
SchedulerTask asyncLater(Runnable runnable, long delay, TimeUnit unit);
SchedulerTask asyncRepeating(Runnable runnable, long interval, TimeUnit unit);
}

5
common/src/main/java/dev/xhyrom/lighteco/common/plugin/scheduler/SchedulerTask.java Normal file
View file

@ -0,0 +1,5 @@
package dev.xhyrom.lighteco.common.plugin.scheduler;
public interface SchedulerTask {
void cancel();
}

1
common/src/main/java/dev/xhyrom/lighteco/common/storage/Storage.java
View file

@ -5,7 +5,6 @@ import dev.xhyrom.lighteco.api.storage.StorageProvider;
import dev.xhyrom.lighteco.common.plugin.LightEcoPlugin;
import dev.xhyrom.lighteco.common.util.ThrowableRunnable;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Callable;

35
common/src/main/java/dev/xhyrom/lighteco/common/task/UserSaveTask.java Normal file
View file

@ -0,0 +1,35 @@
package dev.xhyrom.lighteco.common.task;
import dev.xhyrom.lighteco.common.model.user.User;
import dev.xhyrom.lighteco.common.plugin.LightEcoPlugin;
import java.util.concurrent.ExecutionException;
public class UserSaveTask implements Runnable {
private final LightEcoPlugin plugin;
public UserSaveTask(LightEcoPlugin plugin) {
this.plugin = plugin;
}
@Override
public void run() {
User[] users = this.plugin.getUserManager().values().stream()
.filter(User::isDirty)
.toArray(User[]::new);
if (users.length == 0) {
return;
}
try {
this.plugin.getUserManager().saveUsers(users).get();
for (User user : users) {
user.setDirty(false);
}
} catch (InterruptedException | RuntimeException | ExecutionException e) {
this.plugin.getBootstrap().getLogger().error("Failed to save users", e);
}
}
}

26
currency-money/src/main/java/dev/xhyrom/lighteco/currency/money/bukkit/hooks/vault/Vault.java
View file

@ -7,12 +7,10 @@ import dev.xhyrom.lighteco.api.model.user.User;
import net.milkbowl.vault.economy.AbstractEconomy;
import net.milkbowl.vault.economy.EconomyResponse;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class Vault extends AbstractEconomy {
private final LightEco provider;
@ -118,21 +116,8 @@ public class Vault extends AbstractEconomy {
);
}
return saveUser(amount, user);
}
@NotNull
private EconomyResponse saveUser(double amount, User user) {
try {
provider.getUserManager().saveUser(user).get();
} catch (InterruptedException | ExecutionException e) {
return new EconomyResponse(
amount,
bigDecimalToDouble(user.getBalance(currency)),
EconomyResponse.ResponseType.FAILURE,
"Cannot save user"
);
}
// Can happen on background
this.provider.getUserManager().saveUser(user);
return new EconomyResponse(
amount,
@ -163,7 +148,12 @@ public class Vault extends AbstractEconomy {
);
}
return saveUser(amount, user);
return new EconomyResponse(
amount,
bigDecimalToDouble(user.getBalance(currency)),
EconomyResponse.ResponseType.SUCCESS,
""
);
}
@Override