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

Merge pull request #5 from truongdatnhan/eclipse

Browse Source 
Clean up code & Upgrading syntax
This commit is contained in:
truongdatnhan
2022-08-07 01:41:11 +07:00
committed by GitHub
parent 5bec5d79e9 a7ba214af3
commit 93e4f14b7b
22 changed files with 58 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/client/Ring.java
View File

@@ -174,8 +174,8 @@ public class Ring implements Comparable<Ring> {
@Override
public boolean equals(Object o) {
if (o instanceof Ring) {
return ((Ring) o).getRingId() == getRingId();
if (o instanceof Ring ring) {
return ring.getRingId() == getRingId();
}
return false;
}

16
src/main/java/client/command/commands/gm2/IdCommand.java
View File

@@ -8,8 +8,9 @@ import server.ThreadManager;
import tools.exceptions.IdTypeNotSupportedException;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -75,12 +76,13 @@ public class IdCommand extends Command {
throw new IdTypeNotSupportedException();
}
itemMap.put(type, new HashMap<>());
BufferedReader reader = new BufferedReader(new FileReader(handbookDirectory.get(type)));
String line;
while ((line = reader.readLine()) != null) {
String[] row = line.split(" - ", 2);
if (row.length == 2) {
itemMap.get(type).put(row[1].toLowerCase(), row[0]);
try (BufferedReader reader = Files.newBufferedReader(Paths.get(handbookDirectory.get(type)))) {
String line;
while ((line = reader.readLine()) != null) {
String[] row = line.split(" - ", 2);
if (row.length == 2) {
itemMap.get(type).put(row[1].toLowerCase(), row[0]);
}
}
}
}

12
src/main/java/client/command/commands/gm2/WhereaMiCommand.java
View File

@@ -48,19 +48,15 @@ public class WhereaMiCommand extends Command {
HashSet<Monster> mobs = new HashSet<>();
for (MapObject mmo : player.getMap().getMapObjects()) {
if (mmo instanceof NPC) {
NPC npc = (NPC) mmo;
if (mmo instanceof NPC npc) {
npcs.add(npc);
} else if (mmo instanceof Character) {
Character mc = (Character) mmo;
} else if (mmo instanceof Character mc) {
chars.add(mc);
} else if (mmo instanceof Monster) {
Monster mob = (Monster) mmo;
} else if (mmo instanceof Monster mob) {
if (mob.isAlive()) {
mobs.add(mob);
}
} else if (mmo instanceof PlayerNPC) {
PlayerNPC npc = (PlayerNPC) mmo;
} else if (mmo instanceof PlayerNPC npc) {
playernpcs.add(npc);
}
}

11
src/main/java/client/command/commands/gm3/PeCommand.java
View File

@@ -35,9 +35,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.HexTool;
import java.io.FileReader;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Properties;
public class PeCommand extends Command {
@@ -51,11 +52,9 @@ public class PeCommand extends Command {
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
String packet = "";
try {
InputStreamReader is = new FileReader("pe.txt");
try (BufferedReader br = Files.newBufferedReader(Paths.get("pe.txt"))) {
Properties packetProps = new Properties();
packetProps.load(is);
is.close();
packetProps.load(br);
packet = packetProps.getProperty("pe");
} catch (IOException ex) {
ex.printStackTrace();

5
src/main/java/config/YamlConfig.java
View File

@@ -4,8 +4,9 @@ import com.esotericsoftware.yamlbeans.YamlReader;
import constants.string.CharsetConstants;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;
@@ -18,7 +19,7 @@ public class YamlConfig {
private static YamlConfig loadConfig() {
try {
YamlReader reader = new YamlReader(new FileReader(CONFIG_FILE_NAME, CharsetConstants.CHARSET));
YamlReader reader = new YamlReader(Files.newBufferedReader(Paths.get(CONFIG_FILE_NAME), CharsetConstants.CHARSET));
YamlConfig config = reader.read(YamlConfig.class);
reader.close();
return config;

5
src/main/java/constants/string/CharsetConstants.java
View File

@@ -19,10 +19,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Optional;
@@ -61,7 +62,7 @@ public class CharsetConstants {
private static String loadCharsetFromConfig() {
try {
YamlReader reader = new YamlReader(new FileReader(YamlConfig.CONFIG_FILE_NAME, StandardCharsets.US_ASCII));
YamlReader reader = new YamlReader(Files.newBufferedReader(Paths.get(YamlConfig.CONFIG_FILE_NAME), StandardCharsets.US_ASCII));
reader.getConfig().readConfig.setIgnoreUnknownProperties(true);
StrippedYamlConfig charsetConfig = reader.read(StrippedYamlConfig.class);
reader.close();

9
src/main/java/net/server/channel/handlers/CashOperationHandler.java
View File

@@ -269,8 +269,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
cs.removeFromInventory(item);
c.sendPacket(PacketCreator.takeFromCashInventory(item));
if (item instanceof Equip) {
Equip equip = (Equip) item;
if (item instanceof Equip equip) {
if (equip.getRingId() >= 0) {
Ring ring = Ring.loadFromDb(equip.getRingId());
chr.addPlayerRing(ring);
@@ -323,8 +322,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
return;
}*/ //Gotta let them faggots marry too, hence why this is commented out <3
if (itemRing.toItem() instanceof Equip) {
Equip eqp = (Equip) itemRing.toItem();
if (itemRing.toItem() instanceof Equip eqp) {
Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft());
cs.addToInventory(eqp);
@@ -387,8 +385,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showCashShopMessage((byte) 0xBE));
} else {
// Need to check to make sure its actually an equip and the right SN...
if (itemRing.toItem() instanceof Equip) {
Equip eqp = (Equip) itemRing.toItem();
if (itemRing.toItem() instanceof Equip eqp) {
Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft());
cs.addToInventory(eqp);

3
src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java
View File

@@ -36,8 +36,7 @@ public final class CharInfoRequestHandler extends AbstractPacketHandler {
int cid = p.readInt();
MapObject target = c.getPlayer().getMap().getMapObject(cid);
if (target != null) {
if (target instanceof Character) {
Character player = (Character) target;
if (target instanceof Character player) {
if (c.getPlayer().getId() != player.getId()) {
player.exportExcludedItems(c);

3
src/main/java/net/server/channel/handlers/DoorHandler.java
View File

@@ -45,8 +45,7 @@ public final class DoorHandler extends AbstractPacketHandler {
}
for (MapObject obj : chr.getMap().getMapObjects()) {
if (obj instanceof DoorObject) {
DoorObject door = (DoorObject) obj;
if (obj instanceof DoorObject door) {
if (door.getOwnerId() == ownerid) {
door.warp(chr);
return;

3
src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
View File

@@ -47,8 +47,7 @@ public final class HiredMerchantRequest extends AbstractPacketHandler {
try {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) {
if (mmo instanceof Character) {
Character mc = (Character) mmo;
if (mmo instanceof Character mc) {
PlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) {

3
src/main/java/net/server/channel/handlers/NPCTalkHandler.java
View File

@@ -87,8 +87,7 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
}
}
}
} else if (obj instanceof PlayerNPC) {
PlayerNPC pnpc = (PlayerNPC) obj;
} else if (obj instanceof PlayerNPC pnpc) {
NPCScriptManager nsm = NPCScriptManager.getInstance();
if (pnpc.getScriptId() < NpcId.CUSTOM_DEV && !nsm.isNpcScriptAvailable(c, "" + pnpc.getScriptId())) {

6
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -291,11 +291,10 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
MapObject ob = chr.getMap().getMapObject(oid);
if (ob instanceof PlayerShop shop) {
shop.visitShop(chr);
} else if (ob instanceof MiniGame) {
} else if (ob instanceof MiniGame game) {
p.skip(1);
String pw = p.available() > 1 ? p.readString() : "";
MiniGame game = (MiniGame) ob;
if (game.checkPassword(pw)) {
if (game.hasFreeSlot() && !game.isVisitor(chr)) {
game.addVisitor(chr);
@@ -849,8 +848,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
private static boolean canPlaceStore(Character chr) {
try {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) {
if (mmo instanceof Character) {
Character mc = (Character) mmo;
if (mmo instanceof Character mc) {
if (mc.getId() == chr.getId()) {
continue;
}

7
src/main/java/net/server/guild/Guild.java
View File

@@ -604,11 +604,10 @@ public class Guild {
@Override
public boolean equals(Object other) {
if (!(other instanceof GuildCharacter)) {
return false;
if (other instanceof GuildCharacter o) {
return (o.getId() == id && o.getName().equals(name));
}
GuildCharacter o = (GuildCharacter) other;
return (o.getId() == id && o.getName().equals(name));
return false;
}
@Override

7
src/main/java/net/server/guild/GuildCharacter.java
View File

@@ -150,11 +150,10 @@ public class GuildCharacter {
@Override
public boolean equals(Object other) {
if (!(other instanceof GuildCharacter)) {
return false;
if (other instanceof GuildCharacter o) {
return (o.getId() == id && o.getName().equals(name));
}
GuildCharacter o = (GuildCharacter) other;
return (o.getId() == id && o.getName().equals(name));
return false;
}
@Override

1
src/main/java/provider/DataProviderFactory.java
View File

@@ -24,7 +24,6 @@ package provider;
import provider.wz.WZFiles;
import provider.wz.XMLWZFile;
import java.io.File;
import java.nio.file.Path;
public class DataProviderFactory {

4
src/main/java/provider/wz/WZFiles.java
View File

@@ -1,6 +1,6 @@
package provider.wz;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -38,7 +38,7 @@ public enum WZFiles {
private static String getWzDirectory() {
// Either provide a custom directory path through the "wz-path" property when launching the .jar, or don't provide one to use the default "wz" directory
String propertyPath = System.getProperty("wz-path");
if (propertyPath != null && new File(propertyPath).isDirectory()) {
if (propertyPath != null && Files.isDirectory(Paths.get(propertyPath))) {
return propertyPath;
}

1
src/main/java/provider/wz/XMLDomMapleData.java
View File

@@ -34,7 +34,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.awt.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;

16
src/main/java/scripting/AbstractScriptManager.java
View File

@@ -28,9 +28,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.script.*;
import java.io.File;
import java.io.FileReader;
import java.io.BufferedReader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
/**
* @author Matze
@@ -44,9 +47,8 @@ public abstract class AbstractScriptManager {
}
protected ScriptEngine getInvocableScriptEngine(String path) {
path = "scripts/" + path;
File scriptFile = new File(path);
if (!scriptFile.exists()) {
Path scriptFile = Paths.get("scripts").resolve(path);
if (!Files.exists(scriptFile)) {
return null;
}
@@ -57,8 +59,8 @@ public abstract class AbstractScriptManager {
enableScriptHostAccess(graalScriptEngine);
try (FileReader fr = new FileReader(scriptFile, CharsetConstants.CHARSET)) {
engine.eval(fr);
try (BufferedReader br = Files.newBufferedReader(scriptFile, CharsetConstants.CHARSET)) {
engine.eval(br);
} catch (final ScriptException | IOException t) {
log.warn("Exception during script eval for file: {}", path, t);
return null;

3
src/main/java/server/ItemInformationProvider.java
View File

@@ -1033,8 +1033,7 @@ public class ItemInformationProvider {
public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) {
boolean assertGM = (isGM && YamlConfig.config.server.USE_PERFECT_GM_SCROLL);
if (equip instanceof Equip) {
Equip nEquip = (Equip) equip;
if (equip instanceof Equip nEquip) {
Map<String, Integer> stats = this.getEquipStats(scrollId);
if (((nEquip.getUpgradeSlots() > 0 || ItemConstants.isCleanSlate(scrollId))) || assertGM) {

3
src/main/java/server/maps/MapFactory.java
View File

@@ -112,8 +112,7 @@ public class MapFactory {
private static void loadLifeRaw(MapleMap map, int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide, int mobTime, int team) {
AbstractLoadedLife myLife = loadLife(id, type, cy, f, fh, rx0, rx1, x, y, hide);
if (myLife instanceof Monster) {
Monster monster = (Monster) myLife;
if (myLife instanceof Monster monster) {
if (mobTime == -1) { //does not respawn, force spawn once
map.spawnMonster(monster);

3
src/main/java/server/maps/MapleMap.java
View File

@@ -1650,8 +1650,7 @@ public class MapleMap {
objectRLock.lock();
try {
for (Object ob : list) {
if (ob instanceof MapObject) {
MapObject mmo = (MapObject) ob;
if (ob instanceof MapObject mmo) {
if (mapobjects.containsValue(mmo) && mmo.getType() == MapObjectType.REACTOR) {
listObjects.add(mmo);

7
src/main/java/tools/ArrayMap.java
View File

@@ -53,11 +53,10 @@ public class ArrayMap<K, V> extends AbstractMap<K, V> {
@Override
public boolean equals(Object o) {
if (!(o instanceof Map.Entry<?, ?>)) {
return false;
if (o instanceof Map.Entry<?, ?> e) {
return (key == null ? e.getKey() == null : key.equals(e.getKey())) && (value == null ? e.getValue() == null : value.equals(e.getValue()));
}
Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
return (key == null ? e.getKey() == null : key.equals(e.getKey())) && (value == null ? e.getValue() == null : value.equals(e.getValue()));
return false;
}
@Override