From a2c2094aeca693eb7d32b5679f15ad8a8415dbd6 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris.kearney@urbanairship.com>
Date: Sun, 7 Dec 2014 11:39:43 -0800
Subject: [PATCH] cleanup and the start of some logging
---
pom.xml | 5 +++++
.../java/com/comandante/creeper/Main.java | 19 +++++++++++--------
.../creeper/fight/FightManager.java | 2 +-
.../creeper/server/MultiLineInputManager.java | 2 +-
.../com/comandante/creeper/stat/Stats.java | 16 ++++++++--------
.../comandante/creeper/stat/StatsTester.java | 2 +-
6 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index a7021fba..dd19dc4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,11 @@
<artifactId>concurrentlinkedhashmap-lru</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
</dependencies>
diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index 8bf59116..e8990253 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -7,17 +7,10 @@ import com.comandante.creeper.managers.SessionManager;
import com.comandante.creeper.npc.StreetHustler;
import com.comandante.creeper.player.PlayerManager;
import com.comandante.creeper.player.PlayerMetadata;
-import com.comandante.creeper.server.command.FightKillCommand;
-import com.comandante.creeper.server.command.admin.BuildCommand;
-import com.comandante.creeper.spawner.ItemSpawner;
-import com.comandante.creeper.world.Area;
-import com.comandante.creeper.world.MapsManager;
-import com.comandante.creeper.world.Room;
-import com.comandante.creeper.world.RoomManager;
-import com.comandante.creeper.world.WorldExporter;
import com.comandante.creeper.server.CreeperCommandRegistry;
import com.comandante.creeper.server.CreeperServer;
import com.comandante.creeper.server.command.DropCommand;
+import com.comandante.creeper.server.command.FightKillCommand;
import com.comandante.creeper.server.command.GossipCommand;
import com.comandante.creeper.server.command.InventoryCommand;
import com.comandante.creeper.server.command.LookCommand;
@@ -29,17 +22,25 @@ import com.comandante.creeper.server.command.UnknownCommand;
import com.comandante.creeper.server.command.UseCommand;
import com.comandante.creeper.server.command.WhoCommand;
import com.comandante.creeper.server.command.WhoamiCommand;
+import com.comandante.creeper.server.command.admin.BuildCommand;
import com.comandante.creeper.server.command.admin.DescriptionCommand;
import com.comandante.creeper.server.command.admin.SaveWorldCommand;
import com.comandante.creeper.server.command.admin.TagRoomCommand;
import com.comandante.creeper.server.command.admin.TitleCommand;
+import com.comandante.creeper.spawner.ItemSpawner;
import com.comandante.creeper.spawner.NpcSpawner;
import com.comandante.creeper.spawner.SpawnRule;
import com.comandante.creeper.stat.Stats;
import com.comandante.creeper.stat.StatsBuilder;
+import com.comandante.creeper.world.Area;
+import com.comandante.creeper.world.MapsManager;
+import com.comandante.creeper.world.Room;
+import com.comandante.creeper.world.RoomManager;
+import com.comandante.creeper.world.WorldExporter;
import com.google.common.collect.Sets;
import com.google.common.io.Files;
import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
import org.mapdb.DB;
import org.mapdb.DBMaker;
@@ -51,6 +52,7 @@ import java.util.Map;
public class Main {
public static CreeperCommandRegistry creeperCommandRegistry;
+ private static final Logger log = Logger.getLogger(Main.class);
public static void main(String[] args) throws Exception {
@@ -118,6 +120,7 @@ public class Main {
private static void startUpMessage(String message) {
System.out.println("[STARTUP] " + message);
+ log.info(message);
}
private static void checkAndCreateWorld() throws IOException {
diff --git a/src/main/java/com/comandante/creeper/fight/FightManager.java b/src/main/java/com/comandante/creeper/fight/FightManager.java
index b188db0f..b5b106cd 100644
--- a/src/main/java/com/comandante/creeper/fight/FightManager.java
+++ b/src/main/java/com/comandante/creeper/fight/FightManager.java
@@ -94,7 +94,7 @@ public class FightManager {
private static int getAttack(Stats challenger, Stats victim) {
int rolls = 0;
int totDamage = 0;
- while (rolls <= challenger.getNumberweaponOfRolls()) {
+ while (rolls <= challenger.getNumberOfWeaponRolls()) {
rolls++;
totDamage = totDamage + randInt(challenger.getWeaponRatingMin(), challenger.getWeaponRatingMax());
}
diff --git a/src/main/java/com/comandante/creeper/server/MultiLineInputManager.java b/src/main/java/com/comandante/creeper/server/MultiLineInputManager.java
index 139e2b61..232ba3e1 100644
--- a/src/main/java/com/comandante/creeper/server/MultiLineInputManager.java
+++ b/src/main/java/com/comandante/creeper/server/MultiLineInputManager.java
@@ -16,7 +16,7 @@ public class MultiLineInputManager {
}
public String retrieveMultiLineInput(UUID uuid) {
- return removeTrailingBlankLines(multiLineInputs.remove(uuid).toString());
+ return removeTrailingBlankLines(multiLineInputs.remove(uuid).toString());
}
public UUID createNewMultiLineInput() {
diff --git a/src/main/java/com/comandante/creeper/stat/Stats.java b/src/main/java/com/comandante/creeper/stat/Stats.java
index a9fcbcc5..fe18b002 100644
--- a/src/main/java/com/comandante/creeper/stat/Stats.java
+++ b/src/main/java/com/comandante/creeper/stat/Stats.java
@@ -13,7 +13,7 @@ public class Stats implements Serializable {
private int maxHealth;
private int weaponRatingMax;
private int weaponRatingMin;
- private int numberweaponOfRolls;
+ private int numberOfWeaponRolls;
private int experience;
public int getExperience() {
@@ -104,12 +104,12 @@ public class Stats implements Serializable {
this.weaponRatingMin = weaponRatingMin;
}
- public int getNumberweaponOfRolls() {
- return numberweaponOfRolls;
+ public int getNumberOfWeaponRolls() {
+ return numberOfWeaponRolls;
}
- public void setNumberweaponOfRolls(int numberweaponOfRolls) {
- this.numberweaponOfRolls = numberweaponOfRolls;
+ public void setNumberOfWeaponRolls(int numberOfWeaponRolls) {
+ this.numberOfWeaponRolls = numberOfWeaponRolls;
}
public Stats(int strength,
@@ -122,7 +122,7 @@ public class Stats implements Serializable {
int maxHealth,
int weaponRatingMax,
int weaponRatingMin,
- int numberweaponOfRolls,
+ int numberOfWeaponRolls,
int experience) {
this.strength = strength;
this.willpower = willpower;
@@ -134,7 +134,7 @@ public class Stats implements Serializable {
this.maxHealth = maxHealth;
this.weaponRatingMax = weaponRatingMax;
this.weaponRatingMin = weaponRatingMin;
- this.numberweaponOfRolls = numberweaponOfRolls;
+ this.numberOfWeaponRolls = numberOfWeaponRolls;
this.experience = experience;
}
@@ -151,7 +151,7 @@ public class Stats implements Serializable {
", maxHealth=" + maxHealth +
", weaponRatingMax=" + weaponRatingMax +
", weaponRatingMin=" + weaponRatingMin +
- ", numberweaponOfRolls=" + numberweaponOfRolls +
+ ", numberOfWeaponRolls=" + numberOfWeaponRolls +
'}';
}
}
diff --git a/src/main/java/com/comandante/creeper/stat/StatsTester.java b/src/main/java/com/comandante/creeper/stat/StatsTester.java
index 1a23eeac..f5e30e33 100644
--- a/src/main/java/com/comandante/creeper/stat/StatsTester.java
+++ b/src/main/java/com/comandante/creeper/stat/StatsTester.java
@@ -90,7 +90,7 @@ public class StatsTester {
private static int getAttack(Stats challenger, Stats victim) {
int rolls = 0;
int totDamage = 0;
- while (rolls <= challenger.getNumberweaponOfRolls()) {
+ while (rolls <= challenger.getNumberOfWeaponRolls()) {
rolls++;
totDamage = totDamage + randInt(challenger.getWeaponRatingMin(), challenger.getWeaponRatingMax());
}
--
GitLab