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

Reformat and clean up "client" package

Browse Source
This commit is contained in:
P0nk
2021-09-09 23:21:39 +02:00
parent 07f55fa53c
commit 9bf1b68924
108 changed files with 1770 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/client/MonsterBook.java
View File

@@ -37,12 +37,12 @@ import java.util.concurrent.locks.Lock;
public final class MonsterBook {
private static final Semaphore semaphore = new Semaphore(10);
private int specialCard = 0;
private int normalCard = 0;
private int bookLevel = 1;
private Map<Integer, Integer> cards = new LinkedHashMap<>();
private Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.BOOK);
private final Map<Integer, Integer> cards = new LinkedHashMap<>();
private final Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.BOOK);
public Set<Entry<Integer, Integer>> getCardSet() {
lock.lock();
@@ -52,23 +52,23 @@ public final class MonsterBook {
lock.unlock();
}
}
public void addCard(final Client c, final int cardid) {
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignCardEffect(c.getPlayer().getId()), false);
Integer qty;
lock.lock();
try {
qty = cards.get(cardid);
if(qty != null) {
if(qty < 5) {
if (qty != null) {
if (qty < 5) {
cards.put(cardid, qty + 1);
}
} else {
cards.put(cardid, 1);
qty = 0;
if (cardid / 1000 >= 2388) {
specialCard++;
} else {
@@ -78,12 +78,12 @@ public final class MonsterBook {
} finally {
lock.unlock();
}
if(qty < 5) {
if (qty < 5) {
if (qty == 0) { // leveling system only accounts unique cards
calculateLevel();
}
c.sendPacket(PacketCreator.addCard(false, cardid, qty + 1));
c.sendPacket(PacketCreator.showGainCard());
} else {
@@ -95,13 +95,13 @@ public final class MonsterBook {
lock.lock();
try {
int collectionExp = (normalCard + specialCard);
int level = 0, expToNextlevel = 1;
do {
level++;
expToNextlevel += level * 10;
} while (collectionExp >= expToNextlevel);
bookLevel = level; // thanks IxianMace for noticing book level differing between book UI and character info UI
} finally {
lock.unlock();
@@ -183,16 +183,16 @@ public final class MonsterBook {
private static int saveStringConcat(char[] data, int pos, Integer i) {
return saveStringConcat(data, pos, i.toString());
}
private static int saveStringConcat(char[] data, int pos, String s) {
int len = s.length();
for(int j = 0; j < len; j++) {
for (int j = 0; j < len; j++) {
data[pos + j] = s.charAt(j);
}
return pos + len;
}
private static String getSaveString(Integer charid, Set<Entry<Integer, Integer>> cardSet) {
semaphore.acquireUninterruptibly();
try {
@@ -210,13 +210,13 @@ public final class MonsterBook {
i = saveStringConcat(save, i, all.getValue()); //1 char due to being 0 ~ 5
i = saveStringConcat(save, i, "),");
}
return new String(save, 0, i - 1);
} finally {
semaphore.release();
}
}
public void saveCards(final int charid) {
Set<Entry<Integer, Integer>> cardSet = getCardSet();
@@ -237,7 +237,7 @@ public final class MonsterBook {
e.printStackTrace();
}
}
public static int[] getCardTierSize() {
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM monstercarddata GROUP BY floor(cardid / 1000);", ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);