Altitude/VillagerShopUI
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync save time less dependent on tick time

Browse Source
This commit is contained in:
Teriuihi 2023-04-23 21:24:16 +02:00
parent 628dd2827e
commit 329d5993fe
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/alttd/VillagerUI.java
View File

@ -18,8 +18,6 @@ import org.bukkit.Bukkit;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.util.concurrent.TimeUnit;
public class VillagerUI extends JavaPlugin { public class VillagerUI extends JavaPlugin {
public static VillagerUI instance; public static VillagerUI instance;
@ -73,17 +71,12 @@ public class VillagerUI extends JavaPlugin {
private void scheduleTasks() { private void scheduleTasks() {
new SaveTask().runTaskTimerAsynchronously( new SaveTask().runTaskTimerAsynchronously(
this, this,
getSecondsToNextXMinutes(Config.SAVE_TIME) * 20, 0,
TimeUnit.MINUTES.toSeconds(Config.SAVE_TIME) * 60 * 20L); 20);
logInOut.runTaskTimerAsynchronously( logInOut.runTaskTimerAsynchronously(
this, this,
getSecondsToNextXMinutes(Config.LOG_TIME) * 20, 0,
TimeUnit.MINUTES.toSeconds(Config.LOG_TIME) * 20L); 20);
}
public static long getSecondsToNextXMinutes(int minutes) {
long seconds = TimeUnit.MINUTES.toSeconds(minutes);
return seconds - (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()) % seconds);
} }
private void registerEvents() { private void registerEvents() {

5
src/main/java/com/alttd/logging/LogInOut.java
View File

@ -20,6 +20,7 @@ public class LogInOut extends BukkitRunnable {
private final HashMap<String, Double> map; private final HashMap<String, Double> map;
private int day; private int day;
private File file; private File file;
private long nextExecution;
public LogInOut() { public LogInOut() {
createLogsDir(); createLogsDir();
@ -29,6 +30,7 @@ public class LogInOut extends BukkitRunnable {
map = loadFile(file); map = loadFile(file);
else else
map = new HashMap<>(); map = new HashMap<>();
this.nextExecution = Utilities.getNextXMinuteTime(Config.LOG_TIME);
} }
public void log(String material, double cost) { public void log(String material, double cost) {
@ -61,6 +63,9 @@ public class LogInOut extends BukkitRunnable {
public void run() { public void run() {
if (this.isCancelled()) if (this.isCancelled())
return; return;
if (System.currentTimeMillis() < nextExecution)
return;
nextExecution = Utilities.getNextXMinuteTime(Config.LOG_TIME);
int new_day = Calendar.getInstance().get(Calendar.DAY_OF_YEAR); int new_day = Calendar.getInstance().get(Calendar.DAY_OF_YEAR);
if (!file.exists()) { if (!file.exists()) {
boolean success = false; boolean success = false;

10
src/main/java/com/alttd/util/SaveTask.java
View File

@ -5,8 +5,18 @@ import com.alttd.objects.EconUser;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
public class SaveTask extends BukkitRunnable { public class SaveTask extends BukkitRunnable {
private long nextExecution;
public SaveTask() {
this.nextExecution = Utilities.getNextXMinuteTime(Config.SAVE_TIME);
}
@Override @Override
public void run() { public void run() {
if (System.currentTimeMillis() < nextExecution)
return;
nextExecution = Utilities.getNextXMinuteTime(Config.SAVE_TIME);
if (Config.DEBUG) if (Config.DEBUG)
Logger.info("Syncing users."); Logger.info("Syncing users.");
EconUser.getEconUsers().forEach(econUser -> { EconUser.getEconUsers().forEach(econUser -> {

8
src/main/java/com/alttd/util/Utilities.java
View File

@ -4,10 +4,10 @@ import com.alttd.objects.Price;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.*; import org.bukkit.inventory.*;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
public class Utilities { public class Utilities {
/** /**
@ -146,4 +146,10 @@ public class Utilities {
return str.toUpperCase(); return str.toUpperCase();
return str.substring(0, 1).toUpperCase() + str.substring(1); return str.substring(0, 1).toUpperCase() + str.substring(1);
} }
public static long getNextXMinuteTime(int minutes) {
long millis = TimeUnit.MINUTES.toMillis(minutes);
long currentMillis = System.currentTimeMillis();
return currentMillis + (currentMillis - (currentMillis % millis));
}
} }