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

Stop logging with System.out.println, start using slf4j

Browse Source
This commit is contained in:
P0nk
2022-02-10 21:31:33 +01:00
parent c879e36a9c
commit 2bbfd46105
37 changed files with 227 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/server/Shop.java
View File

@@ -28,6 +28,8 @@ import client.inventory.Pet;
import client.inventory.manipulator.InventoryManipulator;
import constants.id.ItemId;
import constants.inventory.ItemConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.DatabaseConnection;
import tools.PacketCreator;
@@ -44,7 +46,9 @@ import java.util.Set;
* @author Matze
*/
public class Shop {
private static final Logger log = LoggerFactory.getLogger(Shop.class);
private static final Set<Integer> rechargeableItems = new LinkedHashSet<>();
private final int id;
private final int npcId;
private final List<ShopItem> items;
@@ -83,7 +87,7 @@ public class Shop {
ShopItem item = findBySlot(slot);
if (item != null) {
if (item.getItemId() != itemId) {
System.out.println("Wrong slot number in shop " + id);
log.warn("Wrong slot number in shop {}", id);
return;
}
} else {

6
src/main/java/server/SkillbookInformationProvider.java
View File

@@ -20,6 +20,8 @@
package server;
import client.Character;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
@@ -45,6 +47,7 @@ import java.util.regex.Pattern;
* Only used in 1 script that gives players information about where skillbooks can be found
*/
public class SkillbookInformationProvider {
private static final Logger log = LoggerFactory.getLogger(SkillbookInformationProvider.class);
private static volatile Map<Integer, SkillBookEntry> foundSkillbooks = new HashMap<>();
public enum SkillBookEntry {
@@ -242,8 +245,7 @@ public class SkillbookInformationProvider {
scriptFileSkillbooks.put(skillbookId, SkillBookEntry.SCRIPT);
}
} catch (IOException ioe) {
System.out.println("Failed to read " + file.getName() + ".");
ioe.printStackTrace();
log.error("Failed to read file:{}", file.getName(), ioe);
}
return scriptFileSkillbooks;

2
src/main/java/server/Trade.java
View File

@@ -182,7 +182,7 @@ public class Trade {
throw new RuntimeException("Trade is locked.");
}
if (meso < 0) {
System.out.println("[Hack] " + chr.getName() + " Trying to trade < 0 mesos");
log.warn("[Hack] Chr {} is trying to trade negative mesos", chr.getName());
return;
}
if (chr.getMeso() >= meso) {

15
src/main/java/server/life/LifeFactory.java
View File

@@ -21,6 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package server.life;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
@@ -35,6 +37,7 @@ import java.util.List;
import java.util.*;
public class LifeFactory {
private static final Logger log = LoggerFactory.getLogger(LifeFactory.class);
private static final DataProvider data = DataProviderFactory.getDataProvider(WZFiles.MOB);
private final static DataProvider stringDataWZ = DataProviderFactory.getDataProvider(WZFiles.STRING);
private static final Data mobStringData = stringDataWZ.getData("Mob.img");
@@ -59,7 +62,7 @@ public class LifeFactory {
} else if (type.equalsIgnoreCase("m")) {
return getMonster(id);
} else {
System.out.println("Unknown Life type: " + type);
log.warn("Unknown Life type: {}", type);
return null;
}
}
@@ -247,12 +250,9 @@ public class LifeFactory {
monsterStats.put(mid, stats);
}
Monster ret = new Monster(mid, stats);
return ret;
return new Monster(mid, stats);
} catch (NullPointerException npe) {
System.out.println("[SEVERE] MOB " + mid + " failed to load. Issue: " + npe.getMessage() + "\n\n");
npe.printStackTrace();
log.error("[SEVERE] MOB {} failed to load.", mid, npe);
return null;
}
}
@@ -271,8 +271,7 @@ public class LifeFactory {
return stats.getLevel();
}
} catch (NullPointerException npe) {
System.out.println("[SEVERE] MOB " + mid + " failed to load. Issue: " + npe.getMessage() + "\n\n");
npe.printStackTrace();
log.error("[SEVERE] MOB {} failed to load.", mid, npe);
}
return -1;

5
src/main/java/server/life/MobSkill.java
View File

@@ -28,6 +28,8 @@ import constants.id.MapId;
import constants.id.MobId;
import net.server.services.task.channel.OverallService;
import net.server.services.type.ChannelServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import server.maps.MapObject;
import server.maps.MapObjectType;
import server.maps.MapleMap;
@@ -43,6 +45,7 @@ import java.util.*;
* @author Danny (Leifde)
*/
public class MobSkill {
private static final Logger log = LoggerFactory.getLogger(MobSkill.class);
private final int skillId;
private final int skillLevel;
@@ -314,7 +317,7 @@ public class MobSkill {
}
break;
default:
System.out.println("Unhandled Mob skill: " + skillId);
log.warn("Unhandled Mob skill: {}", skillId);
break;
}
if (stats.size() > 0) {

7
src/main/java/server/life/Monster.java
View File

@@ -42,6 +42,8 @@ import net.server.services.task.channel.OverallService;
import net.server.services.type.ChannelServices;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scripting.event.EventInstanceManager;
import server.StatEffect;
import server.TimerManager;
@@ -66,6 +68,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
public class Monster extends AbstractLoadedLife {
private static final Logger log = LoggerFactory.getLogger(Monster.class);
private ChangeableStats ostats = null; //unused, v83 WZs offers no support for changeable stats.
private MonsterStats stats;
@@ -823,7 +826,7 @@ public class Monster extends AbstractLoadedLife {
}, getAnimationTime("die1"));
}
} else { // is this even necessary?
System.out.println("[CRITICAL LOSS] toSpawn is null for " + this.getName());
log.warn("[CRITICAL LOSS] toSpawn is null for {}", getName());
}
Character looter = map.getCharacterById(getHighestDamagerId());
@@ -1124,7 +1127,7 @@ public class Monster extends AbstractLoadedLife {
case WEAK:
break;
default: {
System.out.println("Unknown elemental effectiveness: " + getMonsterEffectiveness(status.getSkill().getElement()));
log.warn("Unknown elemental effectiveness: {}", getMonsterEffectiveness(status.getSkill().getElement()));
return false;
}
}

8
src/main/java/server/life/MonsterInformationProvider.java
View File

@@ -22,6 +22,8 @@ package server.life;
import config.YamlConfig;
import constants.inventory.ItemConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
@@ -39,6 +41,7 @@ import java.sql.SQLException;
import java.util.*;
public class MonsterInformationProvider {
private static final Logger log = LoggerFactory.getLogger(MonsterInformationProvider.class);
// Author : LightPepsi
private static final MonsterInformationProvider instance = new MonsterInformationProvider();
@@ -100,7 +103,7 @@ public class MonsterInformationProvider {
rs.getShort("questid")));
}
} catch (SQLException e) {
System.err.println("Error retrieving drop" + e);
log.error("Error retrieving global drops", e);
}
}
@@ -254,8 +257,7 @@ public class MonsterInformationProvider {
} catch (Exception e) { //nonexistant mob
boss = false;
e.printStackTrace();
System.err.println("Nonexistant mob id " + id);
log.warn("Non-existent mob id {}", id, e);
}
mobBossCache.put(id, boss);

5
src/main/java/server/life/PlayerNPC.java
View File

@@ -31,6 +31,8 @@ import constants.id.NpcId;
import net.server.Server;
import net.server.channel.Channel;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import server.life.positioner.PlayerNPCPodium;
import server.life.positioner.PlayerNPCPositioner;
import server.maps.AbstractMapObject;
@@ -52,6 +54,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* @author Ronan
*/
public class PlayerNPC extends AbstractMapObject {
private static final Logger log = LoggerFactory.getLogger(PlayerNPC.class);
private static final Map<Byte, List<Integer>> availablePlayerNpcScriptIds = new HashMap<>();
private static final AtomicInteger runningOverallRank = new AtomicInteger();
private static final List<AtomicInteger> runningWorldRank = new ArrayList<>();
@@ -400,7 +403,7 @@ public class PlayerNPC extends AbstractMapObject {
}
if (YamlConfig.config.server.USE_DEBUG) {
System.out.println("GOT SID " + scriptId + " POS " + pos);
log.debug("GOT SID {}, POS {}", scriptId, pos);
}
int worldId = chr.getWorld();

6
src/main/java/server/life/positioner/PlayerNPCPodium.java
View File

@@ -22,6 +22,8 @@ package server.life.positioner;
import config.YamlConfig;
import net.server.Server;
import net.server.channel.Channel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import server.life.PlayerNPC;
import server.maps.MapObject;
import server.maps.MapObjectType;
@@ -40,6 +42,8 @@ import java.util.List;
* Podium system will implement increase-by-7 to negate that behaviour.
*/
public class PlayerNPCPodium {
private static final Logger log = LoggerFactory.getLogger(PlayerNPCPodium.class);
private static int getPlatformPosX(int platform) {
return switch (platform) {
case 0 -> -50;
@@ -76,7 +80,7 @@ public class PlayerNPCPodium {
private static Point reorganizePlayerNpcs(MapleMap map, int newStep, List<MapObject> mmoList) {
if (!mmoList.isEmpty()) {
if (YamlConfig.config.server.USE_DEBUG) {
System.out.println("Reorganizing pnpc map, step " + newStep);
log.debug("Re-organizing pnpc map, step {}", newStep);
}
List<PlayerNPC> playerNpcs = new ArrayList<>(mmoList.size());

5
src/main/java/server/life/positioner/PlayerNPCPositioner.java
View File

@@ -22,6 +22,8 @@ package server.life.positioner;
import config.YamlConfig;
import net.server.Server;
import net.server.channel.Channel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import server.life.PlayerNPC;
import server.maps.MapObject;
import server.maps.MapObjectType;
@@ -38,6 +40,7 @@ import java.util.List;
* @author RonanLana
*/
public class PlayerNPCPositioner {
private static final Logger log = LoggerFactory.getLogger(PlayerNPCPositioner.class);
private static boolean isPlayerNpcNearby(List<Point> otherPos, Point searchPos, int xLimit, int yLimit) {
int xLimit2 = xLimit / 2, yLimit2 = yLimit / 2;
@@ -135,7 +138,7 @@ public class PlayerNPCPositioner {
private static Point reorganizePlayerNpcs(MapleMap map, int newStep, List<MapObject> mmoList) {
if (!mmoList.isEmpty()) {
if (YamlConfig.config.server.USE_DEBUG) {
System.out.println("Reorganizing pnpc map, step " + newStep);
log.debug("Re-organizing pnpc map, step {}", newStep);
}
List<PlayerNPC> playerNpcs = new ArrayList<>(mmoList.size());

5
src/main/java/server/quest/Quest.java
View File

@@ -25,6 +25,8 @@ import client.Character;
import client.QuestStatus;
import client.QuestStatus.Status;
import config.YamlConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
@@ -46,6 +48,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
* @author Ronan - support for medal quests
*/
public class Quest {
private static final Logger log = LoggerFactory.getLogger(Quest.class);
private static volatile Map<Integer, Quest> quests = new HashMap<>();
private static volatile Map<Integer, Integer> infoNumberQuests = new HashMap<>();
private static final Map<Short, Integer> medals = new HashMap<>();
@@ -100,7 +103,7 @@ public class Quest {
medals.put(this.id, medalid);
}
} else {
System.out.println("no data " + id);
log.warn("No quest data for id {}", id);
}
}