aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/kotlin/moe/nea/ledger/ChatReceived.kt3
-rw-r--r--src/main/kotlin/moe/nea/ledger/Ledger.kt8
-rw-r--r--src/main/kotlin/moe/nea/ledger/LedgerLogger.kt3
3 files changed, 10 insertions, 4 deletions
diff --git a/src/main/kotlin/moe/nea/ledger/ChatReceived.kt b/src/main/kotlin/moe/nea/ledger/ChatReceived.kt
index 5e19083..f3c4c50 100644
--- a/src/main/kotlin/moe/nea/ledger/ChatReceived.kt
+++ b/src/main/kotlin/moe/nea/ledger/ChatReceived.kt
@@ -9,7 +9,6 @@ data class ChatReceived(
val timestamp: Instant = Instant.now()
) : Event() {
constructor(event: ClientChatReceivedEvent) : this(
- event.message.unformattedText
- .replace("ยง.".toRegex(), "")
+ event.message.unformattedText.unformattedString()
)
} \ No newline at end of file
diff --git a/src/main/kotlin/moe/nea/ledger/Ledger.kt b/src/main/kotlin/moe/nea/ledger/Ledger.kt
index e9f5efc..108c238 100644
--- a/src/main/kotlin/moe/nea/ledger/Ledger.kt
+++ b/src/main/kotlin/moe/nea/ledger/Ledger.kt
@@ -4,7 +4,9 @@ import net.minecraftforge.client.event.ClientChatReceivedEvent
import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.fml.common.Mod
import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.apache.logging.log4j.LogManager
@Mod(modid = "ledger", useMetadata = true)
class Ledger {
@@ -33,9 +35,13 @@ class Ledger {
TODO: TRADING, FORGE, COOKIE_EATEN, NPC_SELL, NPC_BUY
*/
+ companion object {
+ val logger = LogManager.getLogger("MoneyLedger")
+ }
@Mod.EventHandler
fun init(event: FMLInitializationEvent) {
+ logger.info("Initializing ledger")
val ledger = LedgerLogger()
val ids = ItemIdProvider()
listOf(
@@ -48,7 +54,7 @@ class Ledger {
).forEach(MinecraftForge.EVENT_BUS::register)
}
- @SubscribeEvent
+ @SubscribeEvent(receiveCanceled = true, priority = EventPriority.HIGHEST)
fun onChat(event: ClientChatReceivedEvent) {
if (event.type != 2.toByte())
MinecraftForge.EVENT_BUS.post(ChatReceived(event))
diff --git a/src/main/kotlin/moe/nea/ledger/LedgerLogger.kt b/src/main/kotlin/moe/nea/ledger/LedgerLogger.kt
index 548b09d..7690d25 100644
--- a/src/main/kotlin/moe/nea/ledger/LedgerLogger.kt
+++ b/src/main/kotlin/moe/nea/ledger/LedgerLogger.kt
@@ -33,6 +33,7 @@ class LedgerLogger {
val entries = JsonArray()
fun logEntry(entry: LedgerEntry) {
+ Ledger.logger.info("Logging entry of type ${entry.transactionType}")
entries.add(entry.intoJson())
commit()
}
@@ -41,7 +42,7 @@ class LedgerLogger {
try {
file.writeText(gson.toJson(entries))
} catch (ex: Exception) {
- ex.printStackTrace()
+ Ledger.logger.error("Could not save file", ex)
}
}