From 1ac0fc4a8e61e345c2e6eed715d47958c8020bca Mon Sep 17 00:00:00 2001
From: surepy <24486494+surepy@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:16:30 -0700
Subject: Add compatibility options for minecraft versions lower than 1.7.2
---
src/Config.ts | 2 ++
src/Discord.ts | 24 +++++++++++++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Config.ts b/src/Config.ts
index dff0b10..acbab21 100644
--- a/src/Config.ts
+++ b/src/Config.ts
@@ -12,6 +12,8 @@ export interface Config {
MINECRAFT_SERVER_RCON_IP: string
MINECRAFT_SERVER_RCON_PORT: number
MINECRAFT_SERVER_RCON_PASSWORD: string
+ MINECRAFT_TELLRAW_DOESNT_EXIST: boolean
+ MINECRAFT_TELLRAW_DOESNT_EXIST_SAY_TEMPLATE: string
MINECRAFT_TELLRAW_TEMPLATE: string
IS_LOCAL_FILE: boolean
diff --git a/src/Discord.ts b/src/Discord.ts
index 12ac656..93a99ff 100644
--- a/src/Discord.ts
+++ b/src/Discord.ts
@@ -114,7 +114,13 @@ class Discord {
console.log('[INFO] User attempted a slash command without a role')
}
} else {
- command = `/tellraw @a ${this.makeMinecraftTellraw(message)}`
+ if (this.config.MINECRAFT_TELLRAW_DOESNT_EXIST)
+ {
+ command = `/say ${this.makeMinecraftTellraw(message)}`
+ }
+ else {
+ command = `/tellraw @a ${this.makeMinecraftTellraw(message)}`
+ }
}
if (this.config.DEBUG) console.log(`[DEBUG] Sending command "${command}" to the server`)
@@ -123,6 +129,12 @@ class Discord {
await rcon.command(command).catch((e) => {
console.log('[ERROR] Could not send command!')
if (this.config.DEBUG) console.error(e)
+ }).then((str) => {
+ if (str === 'Unknown command. Try /help for a list of commands') {
+ console.error('[ERROR] Could not send command! (Unknown command)')
+ console.error('if this was a chat message, please look into MINECRAFT_TELLRAW_DOESNT_EXIST!')
+ console.error('command: ' + command)
+ }
})
}
rcon.close()
@@ -139,6 +151,16 @@ class Discord {
for (const v of Object.keys(variables)) {
variables[v] = JSON.stringify(variables[v]).slice(1,-1)
}
+
+ if (this.config.MINECRAFT_TELLRAW_DOESNT_EXIST)
+ {
+ return this.config.MINECRAFT_TELLRAW_DOESNT_EXIST_SAY_TEMPLATE
+ .replace(/%username%/g, variables.username)
+ .replace(/%nickname%/g, variables.nickname)
+ .replace(/%discriminator%/g, variables.discriminator)
+ .replace(/%message%/g, variables.text)
+ }
+
return this.config.MINECRAFT_TELLRAW_TEMPLATE
.replace(/%username%/g, variables.username)
--
cgit 1.4.1
>Fix email filter once more| June McEnroe |
|
|
|
I didn't even have access to all my emotions the first time I read
it...
|
|
lex(1) has weird regex precedence rules!
|
|
This fixes it expressing a 355d difference, for example, as 1y -1m
20d. Just switching to <= would make it express 365d as 12m rather
than 1y.
|
|
Also dunno why I was being coy about piercings this is my own blog
and I talk about them all the damn time everywhere else.
|
|
Did I need to spend even the small amount of time I spent on this?
No.
|
|
|
|
Best collection of short stories I've read by far. Good variety,
most are quite short, and there are no bummers. The writing is also
better than usual which is doubly surprising for erotic fiction, I
think. Anyway the stories are super fun.
|
|
|
|
|
|
|
|
:)
|
|
|
|
Linkrot.
|
|
|
|
Book make me cry like a little baby. All time favourite.
|
|
What a relief after 3 unbearably straight and awful books in a row.
A wonderful mess.
|
|
|
|
There are some nice things in here that I would really like in any
other book, but not this one.
|
|
|
|
|
|
|
|
Such link rot.
|
|
|
|
The better of the two, but largely the same. I feel like these books
are a bit too autobiographical, but I don't know if I'm allowed to
accuse an author of that.
My real problem is that I read these books as largely uncritical
of their characters. They behave in nonsense ways, are mostly
uncritical of their own behaviour, and don't really have arcs of
growth or change. I suppose this book had a bit of one, but only
in the last two chapters.
|
|
Unbearably straight. Eyerolls and sighs per page off the charts.
Shout out to Joanna, I guess.
I kinda like the lack of quotation marks though to be honest.
After half of the Ruth Ozeki novel and now this, I need to get back
to some genre fiction.
|
|
|
|
|
|
|
|
|
|
There is not that much distinct stuff here anymore.
|
|
Suffers a little bit from middle book but I really enjoyed it. Read
it faster than the first one too, despite its length.
|
|
|
|
|
|
|
|
|
|
Mixed bag like most collections of short stories. Some of them are
pretty good. The author of the worst written story also has the
worst written bio.
|
|
|
|
|
|
|
|
Absolutely indiscriminately.
|
|
|
|
|
|
|
|
For some reason I haven't been able to figure out, trying to poll
/dev/tty returns POLLNVAL (and this was using 100% CPU looping),
but using stderr instead works fine.
|
|
|