Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing static imports of TimeUnit

Browse Source
This commit is contained in:
P0nk
2021-09-10 19:18:20 +02:00
parent cdc17ef3dd
commit 8b60684103
10 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/client/processor/npc/FredrickProcessor.java
View File

@@ -43,7 +43,8 @@ import java.sql.*;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.DAYS;
/** /**
* @author RonanLana - synchronization of Fredrick modules and operation results * @author RonanLana - synchronization of Fredrick modules and operation results
@@ -81,7 +82,7 @@ public class FredrickProcessor {
} }
public static int timestampElapsedDays(Timestamp then, long timeNow) { public static int timestampElapsedDays(Timestamp then, long timeNow) {
return (int) ((timeNow - then.getTime()) / TimeUnit.DAYS.toMillis(1)); return (int) ((timeNow - then.getTime()) / DAYS.toMillis(1));
} }
private static String fredrickReminderMessage(int daynotes) { private static String fredrickReminderMessage(int daynotes) {

1
src/main/java/net/server/channel/handlers/ItemRewardHandler.java
View File

@@ -63,6 +63,7 @@ public final class ItemRewardHandler extends AbstractPacketHandler {
if (ItemConstants.getInventoryType(reward.itemid) == InventoryType.EQUIP) { if (ItemConstants.getInventoryType(reward.itemid) == InventoryType.EQUIP) {
final Item item = ii.getEquipById(reward.itemid); final Item item = ii.getEquipById(reward.itemid);
if (reward.period != -1) { if (reward.period != -1) {
// TODO is this a bug, meant to be 60 * 60 * 1000?
item.setExpiration(currentServerTime() + reward.period * 60 * 60 * 10); item.setExpiration(currentServerTime() + reward.period * 60 * 60 * 10);
} }
InventoryManipulator.addFromDrop(c, item, false); InventoryManipulator.addFromDrop(c, item, false);

5
src/main/java/net/server/coordinator/session/HostHwid.java
View File

@@ -3,7 +3,8 @@ package net.server.coordinator.session;
import net.server.Server; import net.server.Server;
import java.time.Instant; import java.time.Instant;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.DAYS;
record HostHwid(Hwid hwid, Instant expiry) { record HostHwid(Hwid hwid, Instant expiry) {
static HostHwid createWithDefaultExpiry(Hwid hwid) { static HostHwid createWithDefaultExpiry(Hwid hwid) {
@@ -11,6 +12,6 @@ record HostHwid(Hwid hwid, Instant expiry) {
} }
private static Instant getDefaultExpiry() { private static Instant getDefaultExpiry() {
return Instant.ofEpochMilli(Server.getInstance().getCurrentTime() + TimeUnit.DAYS.toMillis(7)); return Instant.ofEpochMilli(Server.getInstance().getCurrentTime() + DAYS.toMillis(7));
} }
} }

12
src/main/java/net/server/coordinator/session/HwidAssociationExpiry.java
View File

@@ -3,7 +3,9 @@ package net.server.coordinator.session;
import net.server.Server; import net.server.Server;
import java.time.Instant; import java.time.Instant;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.HOURS;
public class HwidAssociationExpiry { public class HwidAssociationExpiry {
public static Instant getHwidAccountExpiry(int relevance) { public static Instant getHwidAccountExpiry(int relevance) {
@@ -15,9 +17,9 @@ public class HwidAssociationExpiry {
final long baseHours = switch (degree) { final long baseHours = switch (degree) {
case 0 -> 2; case 0 -> 2;
case 1 -> TimeUnit.DAYS.toHours(1); case 1 -> DAYS.toHours(1);
case 2 -> TimeUnit.DAYS.toHours(7); case 2 -> DAYS.toHours(7);
default -> TimeUnit.DAYS.toHours(70); default -> DAYS.toHours(70);
}; };
int subdegreeTime = (degree * 3) + 1; int subdegreeTime = (degree * 3) + 1;
@@ -25,7 +27,7 @@ public class HwidAssociationExpiry {
subdegreeTime = 10; subdegreeTime = 10;
} }
return TimeUnit.HOURS.toMillis(baseHours + subdegreeTime); return HOURS.toMillis(baseHours + subdegreeTime);
} }
private static int getHwidExpirationDegree(int relevance) { private static int getHwidExpirationDegree(int relevance) {

5
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -54,7 +54,8 @@ import tools.Pair;
import java.awt.*; import java.awt.*;
import java.util.List; import java.util.List;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.DAYS;
public class AbstractPlayerInteraction { public class AbstractPlayerInteraction {
@@ -503,7 +504,7 @@ public class AbstractPlayerInteraction {
Pet evolved = null; Pet evolved = null;
Pet target; Pet target;
long period = TimeUnit.DAYS.toMillis(90); //refreshes expiration date: 90 days long period = DAYS.toMillis(90); //refreshes expiration date: 90 days
target = getPlayer().getPet(slot); target = getPlayer().getPet(slot);

12
src/main/java/scripting/event/EventManager.java
View File

@@ -48,10 +48,10 @@ import javax.script.Invocable;
import javax.script.ScriptException; import javax.script.ScriptException;
import java.util.*; import java.util.*;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
//import jdk.nashorn.api.scripting.ScriptUtils; //import jdk.nashorn.api.scripting.ScriptUtils;
@@ -392,7 +392,7 @@ public class EventManager {
} }
try { try {
if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, TimeUnit.MILLISECONDS)) { if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, MILLISECONDS)) {
playerPermit.add(leader.getId()); playerPermit.add(leader.getId());
startLock.lock(); startLock.lock();
@@ -464,7 +464,7 @@ public class EventManager {
} }
try { try {
if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, TimeUnit.MILLISECONDS)) { if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, MILLISECONDS)) {
playerPermit.add(leader.getId()); playerPermit.add(leader.getId());
startLock.lock(); startLock.lock();
@@ -536,7 +536,7 @@ public class EventManager {
} }
try { try {
if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, TimeUnit.MILLISECONDS)) { if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, MILLISECONDS)) {
playerPermit.add(leader.getId()); playerPermit.add(leader.getId());
startLock.lock(); startLock.lock();
@@ -608,7 +608,7 @@ public class EventManager {
} }
try { try {
if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, TimeUnit.MILLISECONDS)) { if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, MILLISECONDS)) {
playerPermit.add(leader.getId()); playerPermit.add(leader.getId());
startLock.lock(); startLock.lock();
@@ -684,7 +684,7 @@ public class EventManager {
} }
try { try {
if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, TimeUnit.MILLISECONDS)) { if (!playerPermit.contains(leader.getId()) && startSemaphore.tryAcquire(7777, MILLISECONDS)) {
playerPermit.add(leader.getId()); playerPermit.add(leader.getId());
startLock.lock(); startLock.lock();

7
src/main/java/server/ThreadManager.java
View File

@@ -21,6 +21,9 @@ package server;
import java.util.concurrent.*; import java.util.concurrent.*;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
/** /**
* @author Ronan * @author Ronan
*/ */
@@ -53,13 +56,13 @@ public class ThreadManager {
RejectedExecutionHandler reh = new RejectedExecutionHandlerImpl(); RejectedExecutionHandler reh = new RejectedExecutionHandlerImpl();
ThreadFactory tf = Executors.defaultThreadFactory(); ThreadFactory tf = Executors.defaultThreadFactory();
tpe = new ThreadPoolExecutor(20, 1000, 77, TimeUnit.SECONDS, new ArrayBlockingQueue<>(50), tf, reh); tpe = new ThreadPoolExecutor(20, 1000, 77, SECONDS, new ArrayBlockingQueue<>(50), tf, reh);
} }
public void stop() { public void stop() {
tpe.shutdown(); tpe.shutdown();
try { try {
tpe.awaitTermination(5, TimeUnit.MINUTES); tpe.awaitTermination(5, MINUTES);
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
} }
} }

12
src/main/java/server/TimerManager.java
View File

@@ -30,9 +30,11 @@ import java.lang.management.ManagementFactory;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
public class TimerManager implements TimerManagerMBean { public class TimerManager implements TimerManagerMBean {
private static final TimerManager instance = new TimerManager(); private static final TimerManager instance = new TimerManager();
@@ -69,7 +71,7 @@ public class TimerManager implements TimerManagerMBean {
stpe.setContinueExistingPeriodicTasksAfterShutdownPolicy(false); stpe.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
stpe.setRemoveOnCancelPolicy(true); stpe.setRemoveOnCancelPolicy(true);
stpe.setKeepAliveTime(5, TimeUnit.MINUTES); stpe.setKeepAliveTime(5, MINUTES);
stpe.allowCoreThreadTimeOut(true); stpe.allowCoreThreadTimeOut(true);
ses = stpe; ses = stpe;
@@ -87,15 +89,15 @@ public class TimerManager implements TimerManagerMBean {
} }
public ScheduledFuture<?> register(Runnable r, long repeatTime, long delay) { public ScheduledFuture<?> register(Runnable r, long repeatTime, long delay) {
return ses.scheduleAtFixedRate(new LoggingSaveRunnable(r), delay, repeatTime, TimeUnit.MILLISECONDS); return ses.scheduleAtFixedRate(new LoggingSaveRunnable(r), delay, repeatTime, MILLISECONDS);
} }
public ScheduledFuture<?> register(Runnable r, long repeatTime) { public ScheduledFuture<?> register(Runnable r, long repeatTime) {
return ses.scheduleAtFixedRate(new LoggingSaveRunnable(r), 0, repeatTime, TimeUnit.MILLISECONDS); return ses.scheduleAtFixedRate(new LoggingSaveRunnable(r), 0, repeatTime, MILLISECONDS);
} }
public ScheduledFuture<?> schedule(Runnable r, long delay) { public ScheduledFuture<?> schedule(Runnable r, long delay) {
return ses.schedule(new LoggingSaveRunnable(r), delay, TimeUnit.MILLISECONDS); return ses.schedule(new LoggingSaveRunnable(r), delay, MILLISECONDS);
} }
public ScheduledFuture<?> scheduleAtTimestamp(Runnable r, long timestamp) { public ScheduledFuture<?> scheduleAtTimestamp(Runnable r, long timestamp) {

4
src/main/java/server/partyquest/AriantColiseum.java
View File

@@ -33,9 +33,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
/** /**
* @author Ronan * @author Ronan
@@ -65,7 +65,7 @@ public class AriantColiseum {
map.resetFully(); map.resetFully();
long pqTimer = MINUTES.toMillis(10); long pqTimer = MINUTES.toMillis(10);
long pqTimerBoard = MINUTES.toMillis(9) + TimeUnit.SECONDS.toMillis(50); long pqTimerBoard = MINUTES.toMillis(9) + SECONDS.toMillis(50);
List<Character> players = exped.getActiveMembers(); List<Character> players = exped.getActiveMembers();
score = new HashMap<>(); score = new HashMap<>();

5
src/main/java/tools/mapletools/CodeCouponGenerator.java
View File

@@ -9,7 +9,8 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.HOURS;
/** /**
* @author RonanLana * @author RonanLana
@@ -238,7 +239,7 @@ public class CodeCouponGenerator {
generatedKeys = null; generatedKeys = null;
PreparedStatement ps = con.prepareStatement("INSERT IGNORE INTO `nxcode` (`code`, `expiration`) VALUES (?, ?)", Statement.RETURN_GENERATED_KEYS); PreparedStatement ps = con.prepareStatement("INSERT IGNORE INTO `nxcode` (`code`, `expiration`) VALUES (?, ?)", Statement.RETURN_GENERATED_KEYS);
ps.setLong(2, currentTime + TimeUnit.HOURS.toMillis(recipe.duration)); ps.setLong(2, currentTime + HOURS.toMillis(recipe.duration));
for (int i = 0; i < recipe.quantity; i++) { for (int i = 0; i < recipe.quantity; i++) {
ps.setString(1, generateCouponCode()); ps.setString(1, generateCouponCode());