From 2b2edf2bb2beed40a56b991b14009ab41f296814 Mon Sep 17 00:00:00 2001 From: CPU Date: Tue, 12 Jan 2021 17:23:32 +0000 Subject: [PATCH] Upload files to '' --- .env.example | 3 +++ .gitignore | 40 ++++++++++++++++++++-------- config.json | 64 +++++++++++++++++++++++++++++++++++++++++++++ config.json.example | 60 ++++++++++++++++++++++++++++++++++++++++++ ecosystem.config.js | 7 +++++ 5 files changed, 163 insertions(+), 11 deletions(-) create mode 100644 .env.example create mode 100644 config.json create mode 100644 config.json.example create mode 100644 ecosystem.config.js diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..882254f --- /dev/null +++ b/.env.example @@ -0,0 +1,3 @@ +BOT_TOKEN=your bot token +CONFIG_EDITING_USERS=["502575111346323456", "229380062909038594", "119922034812780547", "267678060914933770", "170429173003714560", "245958554899578880"] +CONFIG_EDITING_GROUPS=["737810664034271302"] \ No newline at end of file diff --git a/.gitignore b/.gitignore index 6f92a01..65da5c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ -# ---> Node + +# Created by https://www.toptal.com/developers/gitignore/api/node,visualstudiocode +# Edit at https://www.toptal.com/developers/gitignore?templates=node,visualstudiocode + +### Node ### # Logs logs *.log @@ -42,8 +46,8 @@ build/Release node_modules/ jspm_packages/ -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ +# TypeScript v1 declaration files +typings/ # TypeScript cache *.tsbuildinfo @@ -75,11 +79,9 @@ web_modules/ # parcel-bundler cache (https://parceljs.org/) .cache -.parcel-cache # Next.js build output .next -out # Nuxt.js build / generate output .nuxt @@ -109,10 +111,26 @@ dist # Stores VSCode versions used for testing VSCode extensions .vscode-test -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace +### VisualStudioCode Patch ### +# Ignore all local history of files +.history + +# End of https://www.toptal.com/developers/gitignore/api/node,visualstudiocode + +config.json + +# Ignore the profanity list as its from the bedrock client files +profanity_filter.wlist +.env +.env +.env.example +.env +.env diff --git a/config.json b/config.json new file mode 100644 index 0000000..228f2c8 --- /dev/null +++ b/config.json @@ -0,0 +1,64 @@ +{ + "problematicPlugins": [ + { + "name": "ProtocolSupport", + "message": "- You have ProtocolSupport installed, which is known to have problems with Geyser! Try replacing it with [ViaVersion](https://www.spigotmc.org/resources/viaversion.19254/) and [ViaBackwards](https://www.spigotmc.org/resources/viabackwards.27448/) it if you have problems." + }, + { + "name": "Geyser-Bukkit", + "message": "- You have Geyser-Bukkit which is an old version of Geyser. This may and probably will interfere with normal version of Geyser, so please delete it." + } + ], + "discordUpdateChannels": ["745328887331946593"], + "logChannel": "745328887331946593", + "convertExtensions": [".txt", ".log", ".yml", ".json", ".m4a"], + "exceptionExtensions": [".txt", ".log"], + "exceptionChecks": [ + { + "regex": "hastebin\\.com\\/([0-9a-zA-Z]+)", + "rawUrl": "https://hastebin.com/raw/%s" + }, + { + "regex": "hasteb\\.in\\/([0-9a-zA-Z]+)", + "rawUrl": "https://hasteb.in/raw/%s" + }, + { + "regex": "mclo\\.gs\\/([0-9a-zA-Z]+)", + "rawUrl": "https://api.mclo.gs/1/raw/%s" + }, + { + "regex": "pastebin\\.com\\/([0-9a-zA-Z]+)", + "rawUrl": "https://pastebin.com/raw/%s" + }, + { + "regex": "mcpaste\\.io\\/([0-9a-zA-Z]+)", + "rawUrl": "https://mcpaste.io/%s" + }, + { + "regex": "gist\\.github\\.com\\/([0-9a-zA-Z]+\\/)([0-9a-zA-Z]+)", + "rawUrl": "https://gist.githubusercontent.com/%1$s/%2$s/raw/" + } + ], + "exceptionFixes" : [ + { + "error": "java.net.BindException: Address already in use", + "message": "TThe Port you specified is already in use!" + }, + { + "error": "java.net.BindException: Cannot assign requested address", + "message": "This means the IP your server is trying to use is unavailable or disallowed by the system or firewall." + }, + { + "error": "java.lang.AssertionError: Expected AES to be available", + "message": "Update your Java at [AdoptOpenJDK.net](https://adoptopenjdk.net/)." + }, + { + "error": "java.lang.IllegalArgumentException: Duplicate handler name: floodgate-init", + "message": "Please don't reload your server, restart it to fix this issue." + }, + { + "error": "java.lang.OutOfMemoryError", + "message": "Your server ran out of memory." + } + ] +} \ No newline at end of file diff --git a/config.json.example b/config.json.example new file mode 100644 index 0000000..568b94b --- /dev/null +++ b/config.json.example @@ -0,0 +1,60 @@ +{ + "problematicPlugins": [ + { + "name": "ProtocolSupport", + "message": "- You have ProtocolSupport installed, which is known to have problems with Geyser! Try replacing it with [ViaVersion](https://www.spigotmc.org/resources/viaversion.19254/) and [ViaBackwards](https://www.spigotmc.org/resources/viabackwards.27448/) it if you have problems." + }, + { + "name": "Geyser-Bukkit", + "message": "- You have Geyser-Bukkit which is an old version of Geyser. This may and probably will interfere with normal version of Geyser, so please delete it." + } + ], + "discordUpdateChannels": ["349264069007638530"], + "logChannel": "614877230811709474", + "convertExtensions": [".txt", ".log", ".yml"], + "exceptionExtensions": [".txt", ".log"], + "exceptionChecks": [ + { + "regex": "hastebin\\.com\\/([0-9a-zA-Z]+)", + "rawUrl": "https://hastebin.com/raw/%s" + }, + { + "regex": "hasteb\\.in\\/([0-9a-zA-Z]+)", + "rawUrl": "https://hasteb.in/raw/%s" + }, + { + "regex": "mclo\\.gs\\/([0-9a-zA-Z]+)", + "rawUrl": "https://api.mclo.gs/1/raw/%s" + }, + { + "regex": "pastebin\\.com\\/([0-9a-zA-Z]+)", + "rawUrl": "https://pastebin.com/raw/%s" + }, + { + "regex": "gist\\.github\\.com\\/([0-9a-zA-Z]+\\/)([0-9a-zA-Z]+)", + "rawUrl": "https://gist.githubusercontent.com/%1$s/%2$s/raw/" + } + ], + "exceptionFixes" : [ + { + "error": "java.net.BindException: Address already in use", + "message": "This means something (likely another instance of Geyser) is running on the port you have specified in the config. Please make sure you close all applications running on this port. If you don't recall opening anything, usually restarting your computer fixes this." + }, + { + "error": "java.net.BindException: Cannot assign requested address", + "message": "This means the IP your server is trying to use is unavailable or disallowed by the system or firewall." + }, + { + "error": "java.lang.AssertionError: Expected AES to be available", + "message": "Update your Java at [AdoptOpenJDK.net](https://adoptopenjdk.net/)." + }, + { + "error": "java.lang.IllegalArgumentException: Duplicate handler name: floodgate-init", + "message": "Please don't reload your server, do `!tag reload` for more info. Restart it to fix this issue." + }, + { + "error": "AnnotatedConnectException: Connection timed out", + "message": "The Geyser instance cannot connect to your Java server." + } + ] +} diff --git a/ecosystem.config.js b/ecosystem.config.js new file mode 100644 index 0000000..7efab1c --- /dev/null +++ b/ecosystem.config.js @@ -0,0 +1,7 @@ +module.exports = { + apps: [{ + name: 'discord-bot', + script: 'npm', + args: 'start' + }] +}