Fix Core loading in test... somehow

I just tried stuff until it started working

.editorconfig

@@ -4,6 +4,7 @@ end_of_line = lf
 insert_final_newline = false
 indent_style = space
 indent_size = 4
+ij_any_field_annotation_wrap = off
 
 [*.json]
 indent_style = space
@@ -12,6 +13,8 @@ indent_size = 2
 [*.java]
 indent_style = tab
 tab_width = 4
+ij_java_do_not_wrap_after_single_annotation = true
+ij_java_field_annotation_wrap = off
 
 [{*.yml, *.yaml}]
 indent_style = space

.gitignore

@@ -1,225 +1,226 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.metadata/
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-target/
-.project
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-*.pubxml
-*.publishproj
-
-# NuGet Packages Directory
-## TO!DO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-#############
-## Windows detritus
-#############
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
-
-
-#############
-## Python
-#############
-
-*.py[cod]
-
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-.metadata/*
-TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar
-*.iml
-*.name
-.idea/compiler.xml
-*.xml
-
-Token.txt
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.metadata/
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+target/
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TO!DO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+.metadata/*
+TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar
+*.iml
+*.name
+.idea/compiler.xml
+*.xml
+
+Token.txt
+.bsp

.travis.yml

@@ -2,25 +2,24 @@ cache:
   directories:
   - $HOME/.m2/repository/org/
 before_install: | # Wget BuildTools and run if cached folder not found
+  export JAVA_HOME=$HOME/oraclejdk8
+  ~/bin/install-jdk.sh --install oraclejdk8 --target $JAVA_HOME
   if [ ! -d "$HOME/.m2/repository/org/spigotmc/spigot/1.12.2-R0.1-SNAPSHOT" ]; then
   wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
   # grep so that download counts don't appear in log files
   java -jar BuildTools.jar --rev 1.12.2 | grep -vE "[^/ ]*/[^/ ]*\s*KB\s*$" | grep -v "^\s*$"
   fi
+  export JAVA_HOME=$HOME/oraclejdk11
+  ~/bin/install-jdk.sh --install oraclejdk11 --target $JAVA_HOME
 language: java
 jdk:
   - oraclejdk11
 sudo: true
 deploy:
-  # deploy develop to the staging environment
-  - provider: script
-    script: chmod +x deploy.sh && sh deploy.sh staging
+  - provider: releases
+    api_key:
+      secure: "AnGhHbIFAdfFEtxuAv3Bue5n80JJi9FMyXc2rstg1zzBbuvaYqCUWcL7lB34Ffs9E6Mo5wfANnBRyXtdSfXWLLsb0k78vvlAwJyLP2s0V7r9LTvQWJEflslSDX6ySF0YIc3LR+XMYv+qj+e5XnWr6Kj6gRkaQPDzSIYRgvfKZv9fbo4lSqnp2OcOrn4sYyeV6+sLhARLaNTvbDOdLiMRP3JZUrKB4OCt8+XhrVMlwKhglJY8JVKx1uAFxeljfZ3WJ1WnJ6L8coyVR18HAl1/VHwn+a/jeGp9AygTPF2yJL3+TJs37afqG9jjbL0pneSUoyNenKkjD19pM2RgjGmW25kPEvnmGMaWn8UN8bbilB5k8sh27z+/6qNnvYbhJxJi9RJNASpd6JQ1cGZoBziKsvhkLXErRNCJ92wlgGOqE78UWf6dvzmVkQD/vaqXhHlmcVhpoUZUqsXGWw5gOw/Kxh90IUwsV6A2JXf1Q3YRPIfDin/tVpud6eB0hiRW2uLnAqDMUUsH6n8cqd2rzg/02uKD5rF5+amxfdUSf3m/Fh6lqklNlO1188rFULUPpyFRas59UpEIRqT2Ae9OJPg+1QrVln2Gd3l059MHumX2tidQl00GzXx4nB1NkxpKLl9JLf/n6A4MQodY5CkRELUTB8K3zHGhJdj1Dtmis5YwhXk="
+    file: 'target/Chroma-Discord.jar'
     on:
-      branch: dev
-    skip_cleanup: true
-  # deploy master to production
-  - provider: script
-    script: chmod +x deploy.sh && sh deploy.sh production
-    on:
-      branch: master
+      tags: true
     skip_cleanup: true

README.md

@@ -1,11 +1,10 @@
-# DiscordPlugin
-A plugin that controls the ChromaBot Discord bot and provides Minecraft chat functionality and other features. 
+# Chroma-Discord
+A plugin that provides Minecraft chat functionality and other features.
 
-## Features
-### Announce new posts from /r/ChromaGamers
-If it's a (distinguished) moderator post, it'll be posted to the \#announcements channel, otherwise it'll be posted and pinned to \#general.
+## Setup
+This plugin needs Chroma-Core to work. If you have that and this plugin, start the server, and follow the instructions.
+You'll need a Discord application made, and a bot account created for it.
+You can restart the plugin using /discord restart without having to restart the whole server.
 
-### Announce server restarts
-It announces server starts/stops and restarts, as well as if the server shut down unexpectedly.
-
-**For more, see:** http://chromapedia.wikia.com/wiki/ChromaBot
+## Building
+Maven is used to build this project with all of its dependencies. You will need Spigot 1.12.2 and 1.14.4 built using BuildTools.

build.sbt

@@ -0,0 +1,67 @@
+name := "Chroma-Discord"
+
+version := "1.1"
+
+scalaVersion := "2.13.11"
+
+resolvers += "jitpack.io" at "https://jitpack.io"
+resolvers += "paper-repo" at "https://papermc.io/repo/repository/maven-public/"
+resolvers += Resolver.mavenLocal
+
+// assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeScala = false)
+
+libraryDependencies ++= Seq(
+    "io.papermc.paper" % "paper-api" % "1.19-R0.1-SNAPSHOT" % Provided,
+
+    "com.discord4j" % "discord4j-core" % "3.2.3",
+    "com.vdurmont" % "emoji-java" % "5.1.1",
+    "io.projectreactor" % "reactor-scala-extensions_2.13" % "0.8.0",
+
+    "com.github.TBMCPlugins.ChromaCore" % "Chroma-Core" % "v2.0.0-SNAPSHOT" % Provided,
+    "net.ess3" % "EssentialsX" % "2.17.1" % Provided,
+    // https://mvnrepository.com/artifact/com.mojang/brigadier
+    "com.mojang" % "brigadier" % "1.0.500" % "provided",
+    // https://mvnrepository.com/artifact/net.kyori/examination-api
+    "net.kyori" % "examination-api" % "1.3.0" % "provided",
+    // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
+    //"org.jetbrains.kotlin" % "kotlin-stdlib" % "1.8.20" % "provided",
+    // https://mvnrepository.com/artifact/org.scalatest/scalatest
+    "org.scalatest" %% "scalatest" % "3.2.16" % Test,
+    // https://mvnrepository.com/artifact/com.github.seeseemelk/MockBukkit-v1.19
+    "com.github.seeseemelk" % "MockBukkit-v1.19" % "2.29.0" % Test,
+    "com.github.milkbowl" % "vault" % "master-SNAPSHOT" % Test
+)
+
+assembly / assemblyJarName := "Chroma-Discord.jar"
+assembly / assemblyShadeRules := Seq(
+    "io.netty", "com.fasterxml", "org.slf4j"
+).map { p =>
+    ShadeRule.rename(s"$p.**" -> "btndvtm.dp.@0").inAll
+}
+
+assembly / assemblyMergeStrategy := {
+    case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.concat
+    // https://stackoverflow.com/a/55557287/457612
+    case "module-info.class" => MergeStrategy.discard
+    case "META-INF/versions/9/module-info.class" => MergeStrategy.discard
+    case x => (assembly / assemblyMergeStrategy).value(x)
+}
+
+val saveConfigComments = TaskKey[Seq[File]]("saveConfigComments")
+saveConfigComments := {
+    Commenter.saveConfigComments((Compile / sources).value)
+}
+
+Compile / resourceGenerators += saveConfigComments
+//scalacOptions ++= Seq("-release", "17", "--verbose")
+scalacOptions ++= Seq("-release", "17")
+//Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
+Test / fork := true // This changes the tests ran through sbt to work like IntelliJ tests, fixes mocking issues
+/*excludeDependencies ++= Seq(
+    ExclusionRule("org.bukkit"),
+    ExclusionRule("io.papermc.paper"),
+    ExclusionRule("com.destroystokyo")
+)*/
+excludeDependencies ++= Seq(
+    ExclusionRule("net.milkbowl.vault", "VaultAPI")
+)

lombok.config

@@ -1 +0,0 @@
-lombok.var.flagUsage = ALLOW

pom.xml

@@ -1,271 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.github.TBMCPlugins.ButtonCore</groupId>
-        <artifactId>CorePOM</artifactId>
-        <version>master-SNAPSHOT</version>
-    </parent>
-
-    <groupId>com.github.TBMCPlugins</groupId>
-    <artifactId>DiscordPlugin</artifactId>
-    <version>master-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>DiscordPlugin</name>
-    <url>http://maven.apache.org</url>
-
-    <build>
-        <!-- <sourceDirectory>target/generated-sources/delombok</sourceDirectory>
-            <testSourceDirectory>target/generated-test-sources/delombok</testSourceDirectory> -->
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>src</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>*.properties</include>
-                    <include>*.yml</include>
-                    <include>*.csv</include>
-                    <include>*.txt</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <finalName>DiscordPlugin</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.spigotmc:spigot-api</exclude>
-                                    <exclude>com.github.TBMCPlugins.ButtonCore:ButtonCore</exclude>
-                                    <exclude>net.ess3:Essentials</exclude>
-                                </excludes> <!-- http://stackoverflow.com/questions/28458058/maven-shade-plugin-exclude-a-dependency-and-all-its-transitive-dependencies -->
-                            </artifactSet>
-                            <minimizeJar>true</minimizeJar>
-                            <relocations>
-                                <relocation>
-                                    <pattern>io.netty</pattern>
-                                    <shadedPattern>btndvtm.dp.io.netty</shadedPattern>
-                                    <excludes>
-                                    </excludes>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- <plugin> <groupId>org.projectlombok</groupId> <artifactId>lombok-maven-plugin</artifactId>
-                <version>1.16.16.0</version> <executions> <execution> <id>delombok</id> <phase>generate-sources</phase>
-                <goals> <goal>delombok</goal> </goals> <configuration> <addOutputDirectory>false</addOutputDirectory>
-                <sourceDirectory>src/main/java</sourceDirectory> <verbose>true</verbose>
-                </configuration> </execution> <execution> <id>test-delombok</id> <phase>generate-test-sources</phase>
-                <goals> <goal>testDelombok</goal> </goals> <configuration> <addOutputDirectory>false</addOutputDirectory>
-                <sourceDirectory>src/test/java</sourceDirectory> </configuration> </execution>
-                </executions> </plugin> -->
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
-                <configuration>
-                    <useSystemClassLoader>false
-                    </useSystemClassLoader> <!-- https://stackoverflow.com/a/53012553/2703239 -->
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <branch>
-            master
-        </branch> <!-- Should be master if building ButtonCore locally - the CI will overwrite it (see below) -->
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository> <!-- This repo fixes issues with transitive dependencies -->
-            <id>jcenter</id>
-            <url>http://jcenter.bintray.com</url>
-        </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-        <!-- <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
-        </repository> -->
-        <repository>
-            <id>Essentials</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
-        </repository>
-        <repository>
-            <id>projectlombok.org</id>
-            <url>http://projectlombok.org/mavenrepo</url>
-        </repository>
-        <!-- <repository>
-            <id>pex-repo</id>
-            <url>http://pex-repo.aoeu.xyz</url>
-        </repository> -->
-        <!-- <repository>
-            <id>Reactor-Tools</id>
-            <url>https://repo.spring.io/milestone</url>
-        </repository> -->
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.spigotmc.</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.discord4j/Discord4J -->
-        <dependency>
-            <groupId>com.discord4j</groupId>
-            <artifactId>discord4j-core</artifactId>
-            <version>3.0.12</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.21</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.TBMCPlugins.ButtonCore</groupId>
-            <artifactId>ButtonCore</artifactId>
-            <version>${branch}-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.milkbowl</groupId> <!-- net.milkbowl.vault -->
-            <artifactId>VaultAPI</artifactId>
-            <version>master-SNAPSHOT</version> <!-- 1.6 -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>Essentials</artifactId>
-            <version>2.13.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- <dependency>
-            <groupId>ru.tehkode</groupId>
-            <artifactId>PermissionsEx</artifactId>
-            <version>1.23.1</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency> -->
-        <!-- https://mvnrepository.com/artifact/org.objenesis/objenesis -->
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <version>2.6</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>emoji-java</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/io.projectreactor.tools/blockhound -->
-        <!-- <dependency>
-            <groupId>io.projectreactor.tools</groupId>
-            <artifactId>blockhound</artifactId>
-            <version>1.0.0.M3</version>
-        </dependency> -->
-        <dependency>
-            <groupId>com.github.lucko</groupId>
-            <artifactId>LuckPerms</artifactId>
-            <version>v4.4</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>ci</id>
-            <activation>
-                <property>
-                    <name>env.TRAVIS_BRANCH</name>
-                </property>
-            </activation>
-            <properties>
-                <!-- Override only if necessary -->
-                <branch>${env.TRAVIS_BRANCH}</branch>
-            </properties>
-        </profile>
-    </profiles>
-</project>

project/Commenter.scala

@@ -0,0 +1,96 @@
+import java.util.regex.Pattern
+import sbt.*
+import org.bukkit.configuration.file.YamlConfiguration
+import scala.io.Source
+import scala.util.Using
+
+object Commenter {
+    def saveConfigComments(sv: Seq[File]): Seq[File] = {
+        val cdataRegex = Pattern.compile("(?:def|val|var) (\\w+)(?::[^=]+)? = (?:getI?Config|DPUtils.\\w+Data)") //Hack: DPUtils
+        val clRegex = Pattern.compile("class (\\w+).* extends ((?:\\w|\\d)+)")
+        val objRegex = Pattern.compile("object (\\w+)")
+        val subRegex = Pattern.compile("def `?(\\w+)`?")
+        val subParamRegex = Pattern.compile("((?:\\w|\\d)+): ((?:\\w|\\d)+)")
+        val configConfig = new YamlConfiguration()
+        val commandConfig = new YamlConfiguration()
+
+        def getConfigComments(line: String, clKey: String, comment: String, justCommented: Boolean): (String, String, Boolean) = {
+            val clMatcher = clRegex.matcher(line)
+            if (clKey == null && clMatcher.find()) { //First occurrence
+                (if (clMatcher.group(2).contains("Component"))
+                    "components." + clMatcher.group(1)
+                else "global", comment, justCommented)
+            } else if (line.contains("/**")) {
+                (clKey, "", false)
+            } else if (line.contains("*/") && comment != null)
+                (clKey, comment, true)
+            else if (comment != null) {
+                if (justCommented) {
+                    if (clKey != null) {
+                        val matcher = cdataRegex.matcher(line)
+                        if (matcher.find())
+                            configConfig.set(s"$clKey.${matcher.group(1)}", comment.trim)
+                    }
+                    else {
+                        val matcher = objRegex.matcher(line)
+                        if (matcher.find()) {
+                            val clName = matcher.group(1)
+                            val compKey = if (clName.contains("Module")) s"component.$clName"
+                            else if (clName.contains("Plugin")) "global"
+                            else null
+                            if (compKey != null)
+                                configConfig.set(s"$compKey.generalDescriptionInsteadOfAConfig", comment.trim)
+                        }
+                    }
+                    (clKey, null, false)
+                }
+                else (clKey, comment + line.replaceFirst("^\\s*\\*\\s+", "") + "\n", justCommented)
+            }
+            else (clKey, comment, justCommented)
+        }
+
+        for (file <- sv) {
+            Using(Source.fromFile(file)) { src =>
+                var clKey: String = null
+                var comment: String = null
+                var justCommented: Boolean = false
+
+                var subCommand = false
+                var pkg: String = null
+                var clName: String = null
+                for (line <- src.getLines) {
+                    val (clk, c, jc) = getConfigComments(line, clKey, comment, justCommented)
+                    clKey = clk; comment = c; justCommented = jc
+
+                    val objMatcher = objRegex.matcher(line)
+                    val clMatcher = clRegex.matcher(line)
+                    if (pkg == null && line.startsWith("package "))
+                        pkg = line.substring("package ".length)
+                    else if (clName == null && objMatcher.find())
+                        clName = objMatcher.group(1)
+                    else if (clName == null && clMatcher.find())
+                        clName = clMatcher.group(1)
+                    val subMatcher = subRegex.matcher(line)
+                    val subParamMatcher = subParamRegex.matcher(line)
+                    val sub = line.contains("@Subcommand") || line.contains("@Command2.Subcommand")
+                    if (sub) subCommand = true
+                    else if (line.contains("}")) subCommand = false
+                    if (subCommand && subMatcher.find()) {
+                        /*val groups = (2 to subMatcher.groupCount()).map(subMatcher.group)
+                        val pairs = for (i <- groups.indices by 2) yield (groups(i), groups(i + 1))*/
+                        val mname = subMatcher.group(1)
+                        val params = Iterator.continually(()).takeWhile(_ => subParamMatcher.find())
+                            .map(_ => subParamMatcher.group(1)).drop(1)
+                        val section = commandConfig.createSection(s"$pkg.$clName.$mname")
+                        section.set("method", s"$mname()")
+                        section.set("params", params.mkString(" "))
+                        subCommand = false
+                    }
+                }
+                configConfig.save("target/configHelp.yml")
+                commandConfig.save("target/commands.yml")
+            }.recover[Unit]({ case t => t.printStackTrace() })
+        }
+        Seq(file("target/configHelp.yml"), file("target/commands.yml"))
+    }
+}

project/build.properties

@@ -0,0 +1,2 @@
+sbt.version=1.8.2
+scala.version=2.13.11

project/build.sbt

@@ -0,0 +1,7 @@
+//lazy val commenter = RootProject(file("../commenter"))
+//lazy val root = (project in file(".")).dependsOn(commenter)
+
+resolvers += Resolver.mavenLocal
+resolvers += "paper-repo" at "https://papermc.io/repo/repository/maven-public/"
+
+libraryDependencies += "io.papermc.paper" % "paper-api" % "1.19.4-R0.1-SNAPSHOT" % Compile

project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")

src/main/java/buttondevteam/discordplugin/ChannelconBroadcast.java

@@ -1,15 +0,0 @@
-package buttondevteam.discordplugin;
-
-public enum ChannelconBroadcast {
-	JOINLEAVE,
-	AFK,
-	RESTART,
-	DEATH,
-	BROADCAST;
-
-	public final int flag;
-
-	ChannelconBroadcast() {
-		this.flag = 1 << this.ordinal();
-	}
-}

src/main/java/buttondevteam/discordplugin/ChromaBot.java

@@ -1,58 +0,0 @@
-package buttondevteam.discordplugin;
-
-import buttondevteam.discordplugin.mcchat.MCChatUtils;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.MessageChannel;
-import lombok.Getter;
-import org.bukkit.scheduler.BukkitScheduler;
-import reactor.core.publisher.Mono;
-
-import javax.annotation.Nullable;
-import java.util.function.Function;
-
-public class ChromaBot {
-	/**
-	 * May be null if it's not initialized. Initialization happens after the server is done loading (using {@link BukkitScheduler#runTaskAsynchronously(org.bukkit.plugin.Plugin, Runnable)})
-	 */
-	private static @Getter ChromaBot instance;
-	private DiscordPlugin dp;
-
-	/**
-	 * This will set the instance field.
-	 * 
-	 * @param dp
-	 *            The Discord plugin
-	 */
-	ChromaBot(DiscordPlugin dp) {
-		instance = this;
-		this.dp = dp;
-	}
-
-	static void delete() {
-		instance = null;
-	}
-
-	/**
-	 * Send a message to the chat channels and private chats.
-     *
-	 * @param message
-	 *            The message to send, duh (use {@link MessageChannel#createMessage(String)})
-	 */
-	public void sendMessage(Function<Mono<MessageChannel>, Mono<Message>> message) {
-		MCChatUtils.forAllMCChat(ch -> message.apply(ch).subscribe());
-	}
-
-    /**
-     * Send a message to the chat channels, private chats and custom chats.
-     *
-     * @param message The message to send, duh
-     * @param toggle The toggle type for channelcon
-     */
-	public void sendMessageCustomAsWell(Function<Mono<MessageChannel>, Mono<Message>> message, @Nullable ChannelconBroadcast toggle) {
-		MCChatUtils.forCustomAndAllMCChat(ch -> message.apply(ch).subscribe(), toggle, false);
-    }
-
-	public void updatePlayerList() {
-		MCChatUtils.updatePlayerList();
-	}
-}

src/main/java/buttondevteam/discordplugin/DPUtils.java

@@ -1,219 +0,0 @@
-package buttondevteam.discordplugin;
-
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.IHaveConfig;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import discord4j.core.object.entity.Guild;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.Role;
-import discord4j.core.object.util.Snowflake;
-import discord4j.core.spec.EmbedCreateSpec;
-import lombok.val;
-import reactor.core.publisher.Mono;
-
-import javax.annotation.Nullable;
-import java.util.Comparator;
-import java.util.Optional;
-import java.util.TreeSet;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-
-public final class DPUtils {
-
-	public static final Pattern URL_PATTERN = Pattern.compile("https?://\\S*");
-	public static final Pattern FORMAT_PATTERN = Pattern.compile("[*_~]");
-
-	public static EmbedCreateSpec embedWithHead(EmbedCreateSpec ecs, String displayname, String playername, String profileUrl) {
-		return ecs.setAuthor(displayname, profileUrl, "https://minotar.net/avatar/" + playername + "/32.png");
-	}
-
-	/**
-	 * Removes §[char] colour codes from strings & escapes them for Discord <br>
-	 * Ensure that this method only gets called once (escaping)
-	 */
-	public static String sanitizeString(String string) {
-		return escape(sanitizeStringNoEscape(string));
-	}
-
-	/**
-	 * Removes §[char] colour codes from strings
-	 */
-	public static String sanitizeStringNoEscape(String string) {
-		StringBuilder sanitizedString = new StringBuilder();
-		boolean random = false;
-		for (int i = 0; i < string.length(); i++) {
-			if (string.charAt(i) == '§') {
-				i++;// Skips the data value, the 4 in "§4Alisolarflare"
-				random = string.charAt(i) == 'k';
-			} else {
-				if (!random) // Skip random/obfuscated characters
-					sanitizedString.append(string.charAt(i));
-			}
-		}
-		return sanitizedString.toString();
-	}
-
-	private static String escape(String message) {
-		//var ts = new TreeSet<>();
-		var ts = new TreeSet<int[]>(Comparator.comparingInt(a -> a[0])); //Compare the start, then check the end
-		var matcher = URL_PATTERN.matcher(message);
-		while (matcher.find())
-			ts.add(new int[]{matcher.start(), matcher.end()});
-		matcher = FORMAT_PATTERN.matcher(message);
-		/*Function<MatchResult, String> aFunctionalInterface = result ->
-			Optional.ofNullable(ts.floor(new int[]{result.start(), 0})).map(a -> a[1]).orElse(0) < result.start()
-				? "\\\\" + result.group() : result.group();
-		return matcher.replaceAll(aFunctionalInterface); //Find nearest URL match and if it's not reaching to the char then escape*/
-		StringBuffer sb = new StringBuffer();
-		while (matcher.find()) {
-			matcher.appendReplacement(sb, Optional.ofNullable(ts.floor(new int[]{matcher.start(), 0})) //Find a URL start <= our start
-				.map(a -> a[1]).orElse(-1) < matcher.start() //Check if URL end < our start
-				? "\\\\" + matcher.group() : matcher.group());
-		}
-		matcher.appendTail(sb);
-		return sb.toString();
-	}
-
-	public static Logger getLogger() {
-		if (DiscordPlugin.plugin == null || DiscordPlugin.plugin.getLogger() == null)
-			return Logger.getLogger("DiscordPlugin");
-		return DiscordPlugin.plugin.getLogger();
-	}
-
-	public static ReadOnlyConfigData<Mono<MessageChannel>> channelData(IHaveConfig config, String key) {
-		return config.getReadOnlyDataPrimDef(key, 0L, id -> getMessageChannel(key, Snowflake.of((Long) id)), ch -> 0L); //We can afford to search for the channel in the cache once (instead of using mainServer)
-	}
-
-	public static ReadOnlyConfigData<Mono<Role>> roleData(IHaveConfig config, String key, String defName) {
-		return roleData(config, key, defName, Mono.just(DiscordPlugin.mainServer));
-	}
-
-	/**
-	 * Needs to be a {@link ConfigData} for checking if it's set
-	 */
-	public static ReadOnlyConfigData<Mono<Role>> roleData(IHaveConfig config, String key, String defName, Mono<Guild> guild) {
-		return config.getReadOnlyDataPrimDef(key, defName, name -> {
-			if (!(name instanceof String) || ((String) name).length() == 0) return Mono.empty();
-			return guild.flatMapMany(Guild::getRoles).filter(r -> r.getName().equals(name)).onErrorResume(e -> {
-				getLogger().warning("Failed to get role data for " + key + "=" + name + " - " + e.getMessage());
-				return Mono.empty();
-			}).next();
-		}, r -> defName);
-	}
-
-	public static ReadOnlyConfigData<Snowflake> snowflakeData(IHaveConfig config, String key, long defID) {
-		return config.getReadOnlyDataPrimDef(key, defID, id -> Snowflake.of((long) id), Snowflake::asLong);
-	}
-
-	/**
-	 * Mentions the <b>bot channel</b>. Useful for help texts.
-	 *
-	 * @return The string for mentioning the channel
-	 */
-	public static String botmention() {
-		if (DiscordPlugin.plugin == null) return "#bot";
-		return channelMention(DiscordPlugin.plugin.commandChannel().get());
-	}
-
-	/**
-	 * Disables the component if one of the given configs return null. Useful for channel/role configs.
-	 *
-	 * @param component The component to disable if needed
-	 * @param configs   The configs to check for null
-	 * @return Whether the component got disabled and a warning logged
-	 */
-	public static boolean disableIfConfigError(@Nullable Component<DiscordPlugin> component, ConfigData<?>... configs) {
-		for (val config : configs) {
-			Object v = config.get();
-			if (disableIfConfigErrorRes(component, config, v))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Disables the component if one of the given configs return null. Useful for channel/role configs.
-	 *
-	 * @param component The component to disable if needed
-	 * @param config    The (snowflake) config to check for null
-	 * @param result    The result of getting the value
-	 * @return Whether the component got disabled and a warning logged
-	 */
-	public static boolean disableIfConfigErrorRes(@Nullable Component<DiscordPlugin> component, ConfigData<?> config, Object result) {
-		//noinspection ConstantConditions
-		if (result == null || (result instanceof Mono<?> && !((Mono<?>) result).hasElement().block())) {
-			String path = null;
-			try {
-				if (component != null)
-					Component.setComponentEnabled(component, false);
-				path = config.getPath();
-			} catch (Exception e) {
-				TBMCCoreAPI.SendException("Failed to disable component after config error!", e);
-			}
-			getLogger().warning("The config value " + path + " isn't set correctly " + (component == null ? "in global settings!" : "for component " + component.getClass().getSimpleName() + "!"));
-			getLogger().warning("Set the correct ID in the config" + (component == null ? "" : " or disable this component") + " to remove this message.");
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Send a response in the form of "@User, message". Use Mono.empty() if you don't have a channel object.
-	 *
-	 * @param original The original message to reply to
-	 * @param channel  The channel to send the message in, defaults to the original
-	 * @param message  The message to send
-	 * @return A mono to send the message
-	 */
-	public static Mono<Message> reply(Message original, @Nullable MessageChannel channel, String message) {
-		Mono<MessageChannel> ch;
-		if (channel == null)
-			ch = original.getChannel();
-		else
-			ch = Mono.just(channel);
-		return reply(original, ch, message);
-	}
-
-	/**
-	 * @see #reply(Message, MessageChannel, String)
-	 */
-	public static Mono<Message> reply(Message original, Mono<MessageChannel> ch, String message) {
-		return ch.flatMap(chan -> chan.createMessage((original.getAuthor().isPresent()
-			? original.getAuthor().get().getMention() + ", " : "") + message));
-	}
-
-	public static String nickMention(Snowflake userId) {
-		return "<@!" + userId.asString() + ">";
-	}
-
-	public static String channelMention(Snowflake channelId) {
-		return "<#" + channelId.asString() + ">";
-	}
-
-	/**
-	 * Gets a message channel for a config. Returns empty for ID 0.
-	 *
-	 * @param key The config key
-	 * @param id  The channel ID
-	 * @return A message channel
-	 */
-	public static Mono<MessageChannel> getMessageChannel(String key, Snowflake id) {
-		if (id.asLong() == 0L) return Mono.empty();
-		return DiscordPlugin.dc.getChannelById(id).onErrorResume(e -> {
-			getLogger().warning("Failed to get channel data for " + key + "=" + id + " - " + e.getMessage());
-			return Mono.empty();
-		}).filter(ch -> ch instanceof MessageChannel).cast(MessageChannel.class);
-	}
-
-	public static Mono<MessageChannel> getMessageChannel(ConfigData<Snowflake> config) {
-		return getMessageChannel(config.getPath(), config.get());
-	}
-
-	public static <T> Mono<T> ignoreError(Mono<T> mono) {
-		return mono.onErrorResume(t -> Mono.empty());
-	}
-
-}

src/main/java/buttondevteam/discordplugin/DiscordConnectedPlayer.java

@@ -1,258 +0,0 @@
-package buttondevteam.discordplugin;
-
-import buttondevteam.discordplugin.mcchat.MinecraftChatModule;
-import buttondevteam.discordplugin.playerfaker.DiscordInventory;
-import buttondevteam.discordplugin.playerfaker.VCMDWrapper;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.User;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Delegate;
-import org.bukkit.*;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.attribute.AttributeInstance;
-import org.bukkit.attribute.AttributeModifier;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.permissions.PermissibleBase;
-import org.bukkit.permissions.ServerOperator;
-import org.mockito.MockSettings;
-import org.mockito.Mockito;
-
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.UUID;
-
-import static org.mockito.Answers.RETURNS_DEFAULTS;
-
-public abstract class DiscordConnectedPlayer extends DiscordSenderBase implements IMCPlayer<DiscordConnectedPlayer> {
-	private @Getter VCMDWrapper vanillaCmdListener;
-	@Getter
-	@Setter
-	private boolean loggedIn = false;
-
-	@Delegate(excludes = ServerOperator.class)
-	private PermissibleBase origPerm;
-
-	private @Getter String name;
-
-	private @Getter OfflinePlayer basePlayer;
-
-	@Getter
-	@Setter
-	private PermissibleBase perm;
-
-	private Location location;
-
-	private final MinecraftChatModule module;
-
-	@Getter
-	private final UUID uniqueId;
-
-	/**
-	 * The parameters must match with {@link #create(User, MessageChannel, UUID, String, MinecraftChatModule)}
-	 */
-	protected DiscordConnectedPlayer(User user, MessageChannel channel, UUID uuid, String mcname,
-	                                 MinecraftChatModule module) {
-		super(user, channel);
-		location = Bukkit.getWorlds().get(0).getSpawnLocation();
-		origPerm = perm = new PermissibleBase(basePlayer = Bukkit.getOfflinePlayer(uuid));
-		name = mcname;
-		this.module = module;
-		uniqueId = uuid;
-		displayName = mcname;
-		try {
-			vanillaCmdListener = new VCMDWrapper(VCMDWrapper.createListener(this));
-			if (vanillaCmdListener.getListener() == null)
-				DPUtils.getLogger().warning("Vanilla commands won't be available from Discord due to a compatibility error.");
-		} catch (NoClassDefFoundError e) {
-			DPUtils.getLogger().warning("Vanilla commands won't be available from Discord due to a compatibility error.");
-		}
-	}
-
-	/**
-	 * For testing
-	 */
-	protected DiscordConnectedPlayer(User user, MessageChannel channel) {
-		super(user, channel);
-		module = null;
-		uniqueId = UUID.randomUUID();
-	}
-
-	public void setOp(boolean value) { //CraftPlayer-compatible implementation
-		this.origPerm.setOp(value);
-		this.perm.recalculatePermissions();
-	}
-
-	public boolean isOp() { return this.origPerm.isOp(); }
-
-	@Override
-	public boolean teleport(Location location) {
-		if (module.allowFakePlayerTeleports().get())
-			this.location = location;
-		return true;
-	}
-
-	@Override
-	public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cause) {
-		if (module.allowFakePlayerTeleports().get())
-			this.location = location;
-		return true;
-	}
-
-	@Override
-	public boolean teleport(Entity destination) {
-		if (module.allowFakePlayerTeleports().get())
-			this.location = destination.getLocation();
-		return true;
-	}
-
-	@Override
-	public boolean teleport(Entity destination, PlayerTeleportEvent.TeleportCause cause) {
-		if (module.allowFakePlayerTeleports().get())
-			this.location = destination.getLocation();
-		return true;
-	}
-
-	@Override
-	public Location getLocation(Location loc) {
-		if (loc != null) {
-			loc.setWorld(getWorld());
-			loc.setX(location.getX());
-			loc.setY(location.getY());
-			loc.setZ(location.getZ());
-			loc.setYaw(location.getYaw());
-			loc.setPitch(location.getPitch());
-		}
-
-		return loc;
-	}
-
-	@Override
-	public Server getServer() {
-		return Bukkit.getServer();
-	}
-
-	@Override
-	public void sendRawMessage(String message) {
-		sendMessage(message);
-	}
-
-	@Override
-	public void chat(String msg) {
-		Bukkit.getPluginManager()
-			.callEvent(new AsyncPlayerChatEvent(true, this, msg, new HashSet<>(Bukkit.getOnlinePlayers())));
-	}
-
-	@Override
-	public World getWorld() {
-		return Bukkit.getWorlds().get(0);
-	}
-
-	@Override
-	public boolean isOnline() {
-		return true;
-	}
-
-	@Override
-	public Location getLocation() {
-		return new Location(getWorld(), location.getX(), location.getY(), location.getZ(),
-			location.getYaw(), location.getPitch());
-	}
-
-	@Override
-	public double getMaxHealth() {
-		return 20;
-	}
-
-	@Override
-	public Player getPlayer() {
-		return this;
-	}
-
-	@Getter
-	@Setter
-	private String displayName;
-
-	@Override
-	public AttributeInstance getAttribute(Attribute attribute) {
-		return new AttributeInstance() {
-			@Override
-			public Attribute getAttribute() {
-				return attribute;
-			}
-
-			@Override
-			public double getBaseValue() {
-				return getDefaultValue();
-			}
-
-			@Override
-			public void setBaseValue(double value) {
-			}
-
-			@Override
-			public Collection<AttributeModifier> getModifiers() {
-				return Collections.emptyList();
-			}
-
-			@Override
-			public void addModifier(AttributeModifier modifier) {
-			}
-
-			@Override
-			public void removeModifier(AttributeModifier modifier) {
-			}
-
-			@Override
-			public double getValue() {
-				return getDefaultValue();
-			}
-
-			@Override
-			public double getDefaultValue() {
-				return 20; //Works for max health, should be okay for the rest
-			}
-		};
-	}
-
-	@Override
-	public GameMode getGameMode() {
-		return GameMode.SPECTATOR;
-	}
-
-	public static DiscordConnectedPlayer create(User user, MessageChannel channel, UUID uuid, String mcname,
-	                                            MinecraftChatModule module) {
-		return Mockito.mock(DiscordConnectedPlayer.class,
-			getSettings().useConstructor(user, channel, uuid, mcname, module));
-	}
-
-	public static DiscordConnectedPlayer createTest() {
-		return Mockito.mock(DiscordConnectedPlayer.class, getSettings().useConstructor(null, null));
-	}
-
-	private static MockSettings getSettings() {
-		return Mockito.withSettings()
-			.defaultAnswer(invocation -> {
-				try {
-					if (!Modifier.isAbstract(invocation.getMethod().getModifiers()))
-						return invocation.callRealMethod();
-					if (PlayerInventory.class.isAssignableFrom(invocation.getMethod().getReturnType()))
-						return Mockito.mock(DiscordInventory.class, Mockito.withSettings().extraInterfaces(PlayerInventory.class));
-					if (Inventory.class.isAssignableFrom(invocation.getMethod().getReturnType()))
-						return new DiscordInventory();
-					return RETURNS_DEFAULTS.answer(invocation);
-				} catch (Exception e) {
-					System.err.println("Error in mocked player!");
-					e.printStackTrace();
-					return RETURNS_DEFAULTS.answer(invocation);
-				}
-			});
-	}
-}

src/main/java/buttondevteam/discordplugin/DiscordPlayer.java

@@ -1,28 +0,0 @@
-package buttondevteam.discordplugin;
-
-import buttondevteam.discordplugin.mcchat.MCChatPrivate;
-import buttondevteam.lib.player.ChromaGamerBase;
-import buttondevteam.lib.player.UserClass;
-
-@UserClass(foldername = "discord")
-public class DiscordPlayer extends ChromaGamerBase {
-	private String did;
-	// private @Getter @Setter boolean minecraftChatEnabled;
-
-	public DiscordPlayer() {
-	}
-
-	public String getDiscordID() {
-		if (did == null)
-			did = plugindata.getString(getFolder() + "_id");
-		return did;
-	}
-
-	/**
-	 * Returns true if player has the private Minecraft chat enabled. For setting the value, see
-	 * {@link MCChatPrivate#privateMCChat(sx.blah.discord.handle.obj.MessageChannel, boolean, sx.blah.discord.handle.obj.User, DiscordPlayer)}
-	 */
-	public boolean isMinecraftChatEnabled() {
-		return MCChatPrivate.isMinecraftChatEnabled(this);
-	}
-}

src/main/java/buttondevteam/discordplugin/DiscordPlugin.java

@@ -1,303 +0,0 @@
-package buttondevteam.discordplugin;
-
-import buttondevteam.discordplugin.announcer.AnnouncerModule;
-import buttondevteam.discordplugin.broadcaster.GeneralEventBroadcasterModule;
-import buttondevteam.discordplugin.commands.*;
-import buttondevteam.discordplugin.exceptions.ExceptionListenerModule;
-import buttondevteam.discordplugin.fun.FunModule;
-import buttondevteam.discordplugin.listeners.CommonListeners;
-import buttondevteam.discordplugin.listeners.MCListener;
-import buttondevteam.discordplugin.mcchat.MCChatPrivate;
-import buttondevteam.discordplugin.mcchat.MCChatUtils;
-import buttondevteam.discordplugin.mcchat.MinecraftChatModule;
-import buttondevteam.discordplugin.mccommands.DiscordMCCommand;
-import buttondevteam.discordplugin.role.GameRoleModule;
-import buttondevteam.discordplugin.util.Timings;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.ButtonPlugin;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.IHaveConfig;
-import buttondevteam.lib.player.ChromaGamerBase;
-import com.google.common.io.Files;
-import discord4j.core.DiscordClient;
-import discord4j.core.DiscordClientBuilder;
-import discord4j.core.event.domain.guild.GuildCreateEvent;
-import discord4j.core.event.domain.lifecycle.ReadyEvent;
-import discord4j.core.object.entity.Guild;
-import discord4j.core.object.entity.Role;
-import discord4j.core.object.presence.Activity;
-import discord4j.core.object.presence.Presence;
-import discord4j.core.object.reaction.ReactionEmoji;
-import discord4j.core.object.util.Snowflake;
-import discord4j.store.jdk.JdkStoreService;
-import lombok.Getter;
-import lombok.val;
-import net.milkbowl.vault.permission.Permission;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import reactor.core.publisher.Mono;
-
-import java.awt.*;
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@ButtonPlugin.ConfigOpts(disableConfigGen = true)
-public class DiscordPlugin extends ButtonPlugin {
-	public static DiscordClient dc;
-	public static DiscordPlugin plugin;
-	public static boolean SafeMode = true;
-	@Getter
-	private Command2DC manager;
-
-	/**
-	 * The prefix to use with Discord commands like /role. It only works in the bot channel.
-	 */
-	private ConfigData<Character> prefix() {
-		return getIConfig().getData("prefix", '/', str -> ((String) str).charAt(0), Object::toString);
-	}
-
-	public static char getPrefix() {
-		if (plugin == null) return '/';
-		return plugin.prefix().get();
-	}
-
-	/**
-	 * The main server where the roles and other information is pulled from. It's automatically set to the first server the bot's invited to.
-	 */
-	private ConfigData<Optional<Guild>> mainServer() {
-		return getIConfig().getDataPrimDef("mainServer", 0L,
-			id -> {
-				//It attempts to get the default as well
-				if ((long) id == 0L)
-					return Optional.empty(); //Hack?
-				return dc.getGuildById(Snowflake.of((long) id))
-					.onErrorResume(t -> Mono.fromRunnable(() -> getLogger().warning("Failed to get guild: " + t.getMessage()))).blockOptional();
-			},
-			g -> g.map(gg -> gg.getId().asLong()).orElse(0L));
-	}
-
-	/**
-	 * The (bot) channel to use for Discord commands like /role.
-	 */
-	public ConfigData<Snowflake> commandChannel() {
-		return DPUtils.snowflakeData(getIConfig(), "commandChannel", 0L);
-	}
-
-	/**
-	 * The role that allows using mod-only Discord commands.
-	 * If empty (''), then it will only allow for the owner.
-	 */
-	public ConfigData<Mono<Role>> modRole() {
-		return DPUtils.roleData(getIConfig(), "modRole", "Moderator");
-	}
-
-	/**
-	 * The invite link to show by /discord invite. If empty, it defaults to the first invite if the bot has access.
-	 */
-	public ConfigData<String> inviteLink() {
-		return getIConfig().getData("inviteLink", "");
-	}
-
-	@Override
-	public void pluginEnable() {
-		try {
-			getLogger().info("Initializing...");
-			plugin = this;
-			manager = new Command2DC();
-			getCommand2MC().registerCommand(new DiscordMCCommand()); //Register so that the reset command works
-			String token;
-			File tokenFile = new File("TBMC", "Token.txt");
-			if (tokenFile.exists()) //Legacy support
-				//noinspection UnstableApiUsage
-				token = Files.readFirstLine(tokenFile, StandardCharsets.UTF_8);
-			else {
-				File privateFile = new File(getDataFolder(), "private.yml");
-				val conf = YamlConfiguration.loadConfiguration(privateFile);
-				token = conf.getString("token");
-				if (token == null || token.equalsIgnoreCase("Token goes here")) {
-					conf.set("token", "Token goes here");
-					conf.save(privateFile);
-
-					getLogger().severe("Token not found! Please set it in private.yml then do /discord reset");
-					getLogger().severe("You need to have a bot account to use with your server.");
-					getLogger().severe("If you don't have one, go to https://discordapp.com/developers/applications/ and create an application, then create a bot for it and copy the bot token.");
-					return;
-				}
-			}
-			val cb = new DiscordClientBuilder(token);
-			cb.setInitialPresence(Presence.doNotDisturb(Activity.playing("booting")));
-			cb.setStoreService(new JdkStoreService()); //The default doesn't work for some reason - it's waaay faster now
-			dc = cb.build();
-			dc.getEventDispatcher().on(ReadyEvent.class) // Listen for ReadyEvent(s)
-				.map(event -> event.getGuilds().size()) // Get how many guilds the bot is in
-				.flatMap(size -> dc.getEventDispatcher()
-					.on(GuildCreateEvent.class) // Listen for GuildCreateEvent(s)
-					.take(size) // Take only the first `size` GuildCreateEvent(s) to be received
-					.collectList()) // Take all received GuildCreateEvents and make it a List
-				.subscribe(this::handleReady); /* All guilds have been received, client is fully connected */
-			//dc.getEventDispatcher().on(DisconnectEvent.class);
-			dc.login().subscribe();
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Failed to enable the Discord plugin!", e);
-			getLogger().severe("You may be able to reset the plugin using /discord reset");
-		}
-	}
-
-	public static Guild mainServer;
-
-	private void handleReady(List<GuildCreateEvent> event) {
-		try {
-			if (mainServer != null) { //This is not the first ready event
-				getLogger().info("Ready event already handled"); //TODO: It should probably handle disconnections
-				dc.updatePresence(Presence.online(Activity.playing("Minecraft"))).subscribe(); //Update from the initial presence
-				return;
-			}
-			mainServer = mainServer().get().orElse(null); //Shouldn't change afterwards
-			if (mainServer == null) {
-				if (event.size() == 0) {
-					getLogger().severe("Main server not found! Invite the bot and do /discord reset");
-					dc.getApplicationInfo().subscribe(info -> {
-						getLogger().severe("Click here: https://discordapp.com/oauth2/authorize?client_id=" + info.getId().asString() + "&scope=bot&permissions=268509264");
-					});
-					saveConfig(); //Put default there
-					return; //We should have all guilds by now, no need to retry
-				}
-				mainServer = event.get(0).getGuild();
-				getLogger().warning("Main server set to first one: " + mainServer.getName());
-				mainServer().set(Optional.of(mainServer)); //Save in config
-			}
-			SafeMode = false;
-			DPUtils.disableIfConfigErrorRes(null, commandChannel(), DPUtils.getMessageChannel(commandChannel()));
-			//Won't disable, just prints the warning here
-
-			Component.registerComponent(this, new GeneralEventBroadcasterModule());
-			Component.registerComponent(this, new MinecraftChatModule());
-			Component.registerComponent(this, new ExceptionListenerModule());
-			Component.registerComponent(this, new GameRoleModule()); //Needs the mainServer to be set
-			Component.registerComponent(this, new AnnouncerModule());
-			Component.registerComponent(this, new FunModule());
-			new ChromaBot(this).updatePlayerList(); //Initialize ChromaBot - The MCCHatModule is tested to be enabled
-
-			getManager().registerCommand(new VersionCommand());
-			getManager().registerCommand(new UserinfoCommand());
-			getManager().registerCommand(new HelpCommand());
-			getManager().registerCommand(new DebugCommand());
-			getManager().registerCommand(new ConnectCommand());
-			if (DiscordMCCommand.resetting) //These will only execute if the chat is enabled
-				ChromaBot.getInstance().sendMessageCustomAsWell(chan -> chan.flatMap(ch -> ch.createEmbed(ecs -> ecs.setColor(Color.CYAN)
-					.setTitle("Discord plugin restarted - chat connected."))), ChannelconBroadcast.RESTART); //Really important to note the chat, hmm
-			else if (getConfig().getBoolean("serverup", false)) {
-				ChromaBot.getInstance().sendMessageCustomAsWell(chan -> chan.flatMap(ch -> ch.createEmbed(ecs -> ecs.setColor(Color.YELLOW)
-					.setTitle("Server recovered from a crash - chat connected."))), ChannelconBroadcast.RESTART);
-				val thr = new Throwable(
-					"The server shut down unexpectedly. See the log of the previous run for more details.");
-				thr.setStackTrace(new StackTraceElement[0]);
-				TBMCCoreAPI.SendException("The server crashed!", thr);
-			} else
-				ChromaBot.getInstance().sendMessageCustomAsWell(chan -> chan.flatMap(ch -> ch.createEmbed(ecs -> ecs.setColor(Color.GREEN)
-					.setTitle("Server started - chat connected."))), ChannelconBroadcast.RESTART);
-
-			DiscordMCCommand.resetting = false; //This is the last event handling this flag
-
-			getConfig().set("serverup", true);
-			saveConfig();
-			TBMCCoreAPI.SendUnsentExceptions();
-			TBMCCoreAPI.SendUnsentDebugMessages();
-
-			CommonListeners.register(dc.getEventDispatcher());
-			TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(), this);
-			TBMCCoreAPI.RegisterUserClass(DiscordPlayer.class);
-			ChromaGamerBase.addConverter(sender -> Optional.ofNullable(sender instanceof DiscordSenderBase
-				? ((DiscordSenderBase) sender).getChromaUser() : null));
-			setupProviders();
-
-			IHaveConfig.pregenConfig(this, null);
-			if (!TBMCCoreAPI.IsTestServer()) {
-				dc.updatePresence(Presence.online(Activity.playing("Minecraft"))).subscribe();
-			} else {
-				dc.updatePresence(Presence.online(Activity.playing("testing"))).subscribe();
-			}
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("An error occurred while enabling DiscordPlugin!", e);
-		}
-	}
-
-	/**
-	 * Always true, except when running "stop" from console
-	 */
-	public static boolean Restart;
-
-	@Override
-	public void pluginPreDisable() {
-		if (ChromaBot.getInstance() == null) return; //Failed to load
-		Timings timings = new Timings();
-		timings.printElapsed("Disable start");
-		MCChatUtils.forCustomAndAllMCChat(chan -> chan.flatMap(ch -> ch.createEmbed(ecs -> {
-			timings.printElapsed("Sending message to " + ch.getMention());
-			if (DiscordMCCommand.resetting)
-				ecs.setColor(Color.ORANGE).setTitle("Discord plugin restarting");
-			else
-				ecs.setColor(Restart ? Color.ORANGE : Color.RED)
-					.setTitle(Restart ? "Server restarting" : "Server stopping")
-					.setDescription(
-						Bukkit.getOnlinePlayers().size() > 0
-							? (DPUtils
-							.sanitizeString(Bukkit.getOnlinePlayers().stream()
-								.map(Player::getDisplayName).collect(Collectors.joining(", ")))
-							+ (Bukkit.getOnlinePlayers().size() == 1 ? " was " : " were ")
-							+ "kicked the hell out.") //TODO: Make configurable
-							: ""); //If 'restart' is disabled then this isn't shown even if joinleave is enabled
-		})).subscribe(), ChannelconBroadcast.RESTART, false);
-		timings.printElapsed("Updating player list");
-		ChromaBot.getInstance().updatePlayerList();
-		timings.printElapsed("Done");
-	}
-
-	@Override
-	public void pluginDisable() {
-		Timings timings = new Timings();
-		timings.printElapsed("Actual disable start (logout)");
-		MCChatPrivate.logoutAll();
-		timings.printElapsed("Config setup");
-		getConfig().set("serverup", false);
-		if (ChromaBot.getInstance() == null) return; //Failed to load
-
-		saveConfig();
-		try {
-			SafeMode = true; // Stop interacting with Discord
-			ChromaBot.delete();
-			//timings.printElapsed("Updating presence...");
-			//dc.updatePresence(Presence.idle(Activity.playing("logging out"))).block(); //No longer using the same account for testing
-			timings.printElapsed("Logging out...");
-			dc.logout().block();
-			mainServer = null; //Allow ReadyEvent again
-			//Configs are emptied so channels and servers are fetched again
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("An error occured while disabling DiscordPlugin!", e);
-		}
-	}
-
-	public static final ReactionEmoji DELIVERED_REACTION = ReactionEmoji.unicode("✅");
-
-	public static Permission perms;
-
-	private boolean setupProviders() {
-		try {
-			Class.forName("net.milkbowl.vault.permission.Permission");
-			Class.forName("net.milkbowl.vault.chat.Chat");
-		} catch (ClassNotFoundException e) {
-			return false;
-		}
-
-		RegisteredServiceProvider<Permission> permsProvider = Bukkit.getServer().getServicesManager()
-			.getRegistration(Permission.class);
-		perms = permsProvider.getProvider();
-		return perms != null;
-	}
-}

src/main/java/buttondevteam/discordplugin/DiscordSender.java

@@ -1,117 +0,0 @@
-package buttondevteam.discordplugin;
-
-import discord4j.core.object.entity.Member;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.User;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissibleBase;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-import reactor.core.publisher.Mono;
-
-import java.util.Set;
-
-public class DiscordSender extends DiscordSenderBase implements CommandSender {
-	private PermissibleBase perm = new PermissibleBase(this);
-
-	private String name;
-
-	public DiscordSender(User user, MessageChannel channel) {
-		super(user, channel);
-		val def = "Discord user";
-		name = user == null ? def : user.asMember(DiscordPlugin.mainServer.getId())
-			.onErrorResume(t -> Mono.empty()).blockOptional().map(Member::getDisplayName).orElse(def);
-	}
-
-	public DiscordSender(User user, MessageChannel channel, String name) {
-		super(user, channel);
-		this.name = name;
-	}
-
-	@Override
-	public boolean isPermissionSet(String name) {
-		return perm.isPermissionSet(name);
-	}
-
-	@Override
-	public boolean isPermissionSet(Permission perm) {
-		return this.perm.isPermissionSet(perm);
-	}
-
-	@Override
-	public boolean hasPermission(String name) {
-		if (name.contains("essentials") && !name.equals("essentials.list"))
-			return false;
-		return perm.hasPermission(name);
-	}
-
-	@Override
-	public boolean hasPermission(Permission perm) {
-		return this.perm.hasPermission(perm);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
-		return perm.addAttachment(plugin, name, value);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin) {
-		return perm.addAttachment(plugin);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
-		return perm.addAttachment(plugin, name, value, ticks);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
-		return perm.addAttachment(plugin, ticks);
-	}
-
-	@Override
-	public void removeAttachment(PermissionAttachment attachment) {
-		perm.removeAttachment(attachment);
-	}
-
-	@Override
-	public void recalculatePermissions() {
-		perm.recalculatePermissions();
-	}
-
-	@Override
-	public Set<PermissionAttachmentInfo> getEffectivePermissions() {
-		return perm.getEffectivePermissions();
-	}
-
-	@Override
-	public boolean isOp() {
-		return false;
-	}
-
-	@Override
-	public void setOp(boolean value) {
-	}
-
-	@Override
-	public Server getServer() {
-		return Bukkit.getServer();
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public Spigot spigot() {
-		return new CommandSender.Spigot();
-	}
-
-}

src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java

@@ -1,74 +0,0 @@
-package buttondevteam.discordplugin;
-
-import buttondevteam.lib.TBMCCoreAPI;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.User;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitTask;
-
-public abstract class DiscordSenderBase implements CommandSender {
-	/**
-	 * May be null.
-	 */
-	protected User user;
-	protected MessageChannel channel;
-
-	protected DiscordSenderBase(User user, MessageChannel channel) {
-		this.user = user;
-		this.channel = channel;
-	}
-
-	private volatile String msgtosend = "";
-	private volatile BukkitTask sendtask;
-
-	/**
-	 * Returns the user. May be null.
-	 * 
-	 * @return The user or null.
-	 */
-	public User getUser() {
-		return user;
-	}
-
-	public MessageChannel getChannel() {
-		return channel;
-	}
-
-	private DiscordPlayer chromaUser;
-
-	/**
-	 * Loads the user data on first query.
-	 *
-	 * @return A Chroma user of Discord or a Discord user of Chroma
-	 */
-	public DiscordPlayer getChromaUser() {
-		if (chromaUser == null) chromaUser = DiscordPlayer.getUser(user.getId().asString(), DiscordPlayer.class);
-		return chromaUser;
-	}
-
-	@Override
-	public void sendMessage(String message) {
-		try {
-			final boolean broadcast = new Exception().getStackTrace()[2].getMethodName().contains("broadcast");
-			//if (broadcast && DiscordPlugin.hooked) - TODO: What should happen if unhooked
-			if (broadcast)
-				return;
-			final String sendmsg = DPUtils.sanitizeString(message);
-			msgtosend += "\n" + sendmsg;
-			if (sendtask == null)
-				sendtask = Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin, () -> {
-					channel.createMessage((!broadcast && user != null ? user.getMention() + "\n" : "") + msgtosend.trim()).subscribe();
-					sendtask = null;
-					msgtosend = "";
-				}, 4); // Waits a 0.2 second to gather all/most of the different messages
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("An error occured while sending message to DiscordSender", e);
-		}
-	}
-
-	@Override
-	public void sendMessage(String[] messages) {
-		sendMessage(String.join("\n", messages));
-	}
-}

src/main/java/buttondevteam/discordplugin/IMCPlayer.java

@@ -1,8 +0,0 @@
-package buttondevteam.discordplugin;
-
-import buttondevteam.discordplugin.playerfaker.VCMDWrapper;
-import org.bukkit.entity.Player;
-
-public interface IMCPlayer<T> extends Player {
-	VCMDWrapper getVanillaCmdListener();
-}

src/main/java/buttondevteam/discordplugin/announcer/AnnouncerModule.java

@@ -1,144 +0,0 @@
-package buttondevteam.discordplugin.announcer;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ComponentMetadata;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import buttondevteam.lib.player.ChromaGamerBase;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.MessageChannel;
-import lombok.val;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Posts new posts from Reddit to the specified channel(s). It will pin the regular posts (not the mod posts).
- */
-@ComponentMetadata(enabledByDefault = false)
-public class AnnouncerModule extends Component<DiscordPlugin> {
-	/**
-	 * Channel to post new posts.
-	 */
-	public ReadOnlyConfigData<Mono<MessageChannel>> channel() {
-		return DPUtils.channelData(getConfig(), "channel");
-	}
-
-	/**
-	 * Channel where distinguished (moderator) posts go.
-	 */
-	public ReadOnlyConfigData<Mono<MessageChannel>> modChannel() {
-		return DPUtils.channelData(getConfig(), "modChannel");
-	}
-
-	/**
-	 * Automatically unpins all messages except the last few. Set to 0 or >50 to disable
-	 */
-	public ConfigData<Short> keepPinned() {
-		return getConfig().getData("keepPinned", (short) 40);
-	}
-
-	private ConfigData<Long> lastAnnouncementTime() {
-		return getConfig().getData("lastAnnouncementTime", 0L);
-	}
-
-	private ConfigData<Long> lastSeenTime() {
-		return getConfig().getData("lastSeenTime", 0L);
-	}
-
-	/**
-	 * The subreddit to pull the posts from
-	 */
-	private ConfigData<String> subredditURL() {
-		return getConfig().getData("subredditURL", "https://www.reddit.com/r/ChromaGamers");
-	}
-
-	private static boolean stop = false;
-
-	@Override
-	protected void enable() {
-		if (DPUtils.disableIfConfigError(this, channel(), modChannel())) return;
-		stop = false; //If not the first time
-		val keepPinned = keepPinned().get();
-		if (keepPinned == 0) return;
-		Flux<Message> msgs = channel().get().flatMapMany(MessageChannel::getPinnedMessages);
-		msgs.subscribe(Message::unpin);
-		new Thread(this::AnnouncementGetterThreadMethod).start();
-	}
-
-	@Override
-	protected void disable() {
-		stop = true;
-	}
-
-	private void AnnouncementGetterThreadMethod() {
-		while (!stop) {
-			try {
-				if (!isEnabled()) {
-					Thread.sleep(10000);
-					continue;
-				}
-				String body = TBMCCoreAPI.DownloadString(subredditURL().get() + "/new/.json?limit=10");
-				JsonArray json = new JsonParser().parse(body).getAsJsonObject().get("data").getAsJsonObject()
-					.get("children").getAsJsonArray();
-				StringBuilder msgsb = new StringBuilder();
-				StringBuilder modmsgsb = new StringBuilder();
-				long lastanntime = lastAnnouncementTime().get();
-				for (int i = json.size() - 1; i >= 0; i--) {
-					JsonObject item = json.get(i).getAsJsonObject();
-					final JsonObject data = item.get("data").getAsJsonObject();
-					String author = data.get("author").getAsString();
-					JsonElement distinguishedjson = data.get("distinguished");
-					String distinguished;
-					if (distinguishedjson.isJsonNull())
-						distinguished = null;
-					else
-						distinguished = distinguishedjson.getAsString();
-					String permalink = "https://www.reddit.com" + data.get("permalink").getAsString();
-					long date = data.get("created_utc").getAsLong();
-					if (date > lastSeenTime().get())
-						lastSeenTime().set(date);
-					else if (date > lastAnnouncementTime().get()) {
-						do {
-							val reddituserclass = ChromaGamerBase.getTypeForFolder("reddit");
-							if (reddituserclass == null)
-								break;
-							val user = ChromaGamerBase.getUser(author, reddituserclass);
-							String id = user.getConnectedID(DiscordPlayer.class);
-							if (id != null)
-								author = "<@" + id + ">";
-						} while (false);
-						if (!author.startsWith("<"))
-							author = "/u/" + author;
-						(distinguished != null && distinguished.equals("moderator") ? modmsgsb : msgsb)
-							.append("A new post was submitted to the subreddit by ").append(author).append("\n")
-							.append(permalink).append("\n");
-						lastanntime = date;
-					}
-				}
-				if (msgsb.length() > 0)
-					channel().get().flatMap(ch -> ch.createMessage(msgsb.toString()))
-						.flatMap(Message::pin).subscribe();
-				if (modmsgsb.length() > 0)
-					modChannel().get().flatMap(ch -> ch.createMessage(modmsgsb.toString()))
-						.flatMap(Message::pin).subscribe();
-				if (lastAnnouncementTime().get() != lastanntime)
-					lastAnnouncementTime().set(lastanntime); // If sending succeeded
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			try {
-				Thread.sleep(10000);
-			} catch (InterruptedException ex) {
-				Thread.currentThread().interrupt();
-			}
-		}
-	}
-}

src/main/java/buttondevteam/discordplugin/broadcaster/GeneralEventBroadcasterModule.java

@@ -1,44 +0,0 @@
-package buttondevteam.discordplugin.broadcaster;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.Component;
-import lombok.Getter;
-
-/**
- * Uses a bit of a hacky method of getting all broadcasted messages, including advancements and any other message that's for everyone.
- * If this component is enabled then these messages will show up on Discord.
- */
-public class GeneralEventBroadcasterModule extends Component<DiscordPlugin> {
-	private static @Getter boolean hooked = false;
-
-	@Override
-	protected void enable() {
-		try {
-			PlayerListWatcher.hookUpDown(true);
-			DPUtils.getLogger().info("Finished hooking into the player list");
-			hooked = true;
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Error while hacking the player list! Disable this module if you're on an incompatible version.", e);
-		} catch (NoClassDefFoundError e) {
-			DPUtils.getLogger().warning("Error while hacking the player list! Disable this module if you're on an incompatible version.");
-		}
-
-	}
-
-	@Override
-	protected void disable() {
-		try {
-			if (!hooked) return;
-			if (PlayerListWatcher.hookUpDown(false))
-				DPUtils.getLogger().info("Finished unhooking the player list!");
-			else
-				DPUtils.getLogger().info("Didn't have the player list hooked.");
-			hooked = false;
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Error while hacking the player list!", e);
-		} catch (NoClassDefFoundError ignored) {
-		}
-	}
-}

src/main/java/buttondevteam/discordplugin/broadcaster/PlayerListWatcher.java

@@ -1,166 +0,0 @@
-package buttondevteam.discordplugin.broadcaster;
-
-import buttondevteam.discordplugin.mcchat.MCChatUtils;
-import buttondevteam.lib.TBMCCoreAPI;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-public class PlayerListWatcher {
-	private static Object plist;
-	private static Object mock;
-
-	/*public PlayerListWatcher(DedicatedServer minecraftserver) {
-		super(minecraftserver); // <-- Does some init stuff and calls Bukkit.setServer() so we have to use Objenesis
-	}
-
-	public void sendAll(Packet<?> packet) {
-		plist.sendAll(packet);
-		try { // Some messages get sent by directly constructing a packet
-			if (packet instanceof PacketPlayOutChat) {
-				Field msgf = PacketPlayOutChat.class.getDeclaredField("a");
-				msgf.setAccessible(true);
-				MCChatUtils.forAllMCChat(MCChatUtils.send(((IChatBaseComponent) msgf.get(packet)).toPlainText()));
-			}
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Failed to broadcast message sent to all players - hacking failed.", e);
-		}
-	}
-
-	@Override
-	public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) { // Needed so it calls the overridden method
-		plist.getServer().sendMessage(ichatbasecomponent);
-		ChatMessageType chatmessagetype = flag ? ChatMessageType.SYSTEM : ChatMessageType.CHAT;
-
-		// CraftBukkit start - we run this through our processor first so we can get web links etc
-		this.sendAll(new PacketPlayOutChat(CraftChatMessage.fixComponent(ichatbasecomponent), chatmessagetype));
-		// CraftBukkit end
-	}
-
-	@Override
-	public void sendMessage(IChatBaseComponent ichatbasecomponent) { // Needed so it calls the overriden method
-		this.sendMessage(ichatbasecomponent, true);
-	}
-
-	@Override
-	public void sendMessage(IChatBaseComponent[] iChatBaseComponents) { // Needed so it calls the overridden method
-		for (IChatBaseComponent component : iChatBaseComponents) {
-			sendMessage(component, true);
-		}
-	}*/
-
-	static boolean hookUpDown(boolean up) throws Exception {
-		val csc = Bukkit.getServer().getClass();
-		Field conf = csc.getDeclaredField("console");
-		conf.setAccessible(true);
-		val server = conf.get(Bukkit.getServer());
-		val nms = server.getClass().getPackage().getName();
-		val dplc = Class.forName(nms + ".DedicatedPlayerList");
-		val currentPL = server.getClass().getMethod("getPlayerList").invoke(server);
-		if (up) {
-			val icbcl = Class.forName(nms + ".IChatBaseComponent");
-			val sendMessage = server.getClass().getMethod("sendMessage", icbcl);
-			val cmtcl = Class.forName(nms + ".ChatMessageType");
-			val systemType = cmtcl.getDeclaredField("SYSTEM").get(null);
-			val chatType = cmtcl.getDeclaredField("CHAT").get(null);
-
-			val obc = csc.getPackage().getName();
-			val ccmcl = Class.forName(obc + ".util.CraftChatMessage");
-			val fixComponent = ccmcl.getMethod("fixComponent", icbcl);
-			val ppoc = Class.forName(nms + ".PacketPlayOutChat");
-			val ppocC = Class.forName(nms + ".PacketPlayOutChat").getConstructor(icbcl, cmtcl);
-			val sendAll = dplc.getMethod("sendAll", Class.forName(nms + ".Packet"));
-			Method tpt;
-			try {
-				tpt = icbcl.getMethod("toPlainText");
-			} catch (NoSuchMethodException e) {
-				tpt = icbcl.getMethod("getString");
-			}
-			val toPlainText = tpt;
-			mock = Mockito.mock(dplc, new Answer() { // Cannot call super constructor
-				@Override
-				public Object answer(InvocationOnMock invocation) throws Throwable {
-					final Method method = invocation.getMethod();
-					if (!method.getName().equals("sendMessage")) {
-						if (method.getName().equals("sendAll")) {
-							sendAll(invocation.getArgument(0));
-							return null;
-						}
-						return method.invoke(plist, invocation.getArguments());
-					}
-					val args = invocation.getArguments();
-					val params = method.getParameterTypes();
-					if (params.length == 0) {
-						TBMCCoreAPI.SendException("Found a strange method",
-							new Exception("Found a sendMessage() method without arguments."));
-						return null;
-					}
-					if (params[0].getSimpleName().equals("IChatBaseComponent[]"))
-						for (val arg : (Object[]) args[0])
-							sendMessage(arg, true);
-					else if (params[0].getSimpleName().equals("IChatBaseComponent"))
-						if (params.length > 1 && params[1].getSimpleName().equalsIgnoreCase("boolean"))
-							sendMessage(args[0], (Boolean) args[1]);
-						else
-							sendMessage(args[0], true);
-					else
-						TBMCCoreAPI.SendException("Found a method with interesting params",
-							new Exception("Found a sendMessage(" + params[0].getSimpleName() + ") method"));
-					return null;
-				}
-
-				private void sendMessage(Object chatComponent, boolean system) {
-					try { //Converted to use reflection
-						sendMessage.invoke(server, chatComponent);
-						Object chatmessagetype = system ? systemType : chatType;
-
-						// CraftBukkit start - we run this through our processor first so we can get web links etc
-						this.sendAll(ppocC.newInstance(fixComponent.invoke(null, chatComponent), chatmessagetype));
-						// CraftBukkit end
-					} catch (Exception e) {
-						TBMCCoreAPI.SendException("An error occurred while passing a vanilla message through the player list", e);
-					}
-				}
-
-				private void sendAll(Object packet) {
-					try { // Some messages get sent by directly constructing a packet
-						sendAll.invoke(plist, packet);
-						if (packet.getClass() == ppoc) {
-							Field msgf = ppoc.getDeclaredField("a");
-							msgf.setAccessible(true);
-							MCChatUtils.forAllMCChat(MCChatUtils.send((String) toPlainText.invoke(msgf.get(packet))));
-						}
-					} catch (Exception e) {
-						TBMCCoreAPI.SendException("Failed to broadcast message sent to all players - hacking failed.", e);
-					}
-				}
-			});
-			plist = currentPL;
-			for (var plc = dplc; plc != null; plc = plc.getSuperclass()) { //Set all fields
-				for (var f : plc.getDeclaredFields()) {
-					f.setAccessible(true);
-					Field modf = f.getClass().getDeclaredField("modifiers");
-					modf.setAccessible(true);
-					modf.set(f, f.getModifiers() & ~Modifier.FINAL);
-					f.set(mock, f.get(plist));
-				}
-			}
-		}
-		try {
-			server.getClass().getMethod("a", dplc).invoke(server, up ? mock : plist);
-		} catch (NoSuchMethodException e) {
-			server.getClass().getMethod("a", Class.forName(server.getClass().getPackage().getName() + ".PlayerList"))
-				.invoke(server, up ? mock : plist);
-		}
-		Field pllf = csc.getDeclaredField("playerList");
-		pllf.setAccessible(true);
-		pllf.set(Bukkit.getServer(), up ? mock : plist);
-		return true;
-	}
-}

src/main/java/buttondevteam/discordplugin/commands/Command2DC.java

@@ -1,19 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.chat.Command2;
-
-import java.lang.reflect.Method;
-
-public class Command2DC extends Command2<ICommand2DC, Command2DCSender> {
-	@Override
-	public void registerCommand(ICommand2DC command) {
-		super.registerCommand(command, DiscordPlugin.getPrefix()); //Needs to be configurable for the helps
-	}
-
-	@Override
-	public boolean hasPermission(Command2DCSender sender, ICommand2DC command, Method method) {
-		//return !command.isModOnly() || sender.getMessage().getAuthor().hasRole(DiscordPlugin.plugin.modRole().get()); //TODO: modRole may be null; more customisable way?
-		return true;
-	}
-}

src/main/java/buttondevteam/discordplugin/commands/Command2DCSender.java

@@ -1,39 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.lib.chat.Command2Sender;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.User;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
-@RequiredArgsConstructor
-public class Command2DCSender implements Command2Sender {
-	private final @Getter
-	Message message;
-
-	@Override
-	public void sendMessage(String message) {
-		if (message.length() == 0) return;
-		message = DPUtils.sanitizeString(message);
-		message = Character.toLowerCase(message.charAt(0)) + message.substring(1);
-		val msg = message;
-		/*this.message.getAuthorAsMember().flatMap(author ->
-			this.message.getChannel().flatMap(ch ->
-				ch.createMessage(author.getNicknameMention() + ", " + msg))).subscribe();*/
-		this.message.getChannel().flatMap(ch ->
-			ch.createMessage(this.message.getAuthor().map(u -> DPUtils.nickMention(u.getId()) + ", ").orElse("")
-				+ msg)).subscribe();
-	}
-
-	@Override
-	public void sendMessage(String[] message) {
-		sendMessage(String.join("\n", message));
-	}
-
-	@Override
-	public String getName() {
-		return message.getAuthor().map(User::getUsername).orElse("Discord");
-	}
-}

src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java

@@ -1,64 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.player.TBMCPlayer;
-import buttondevteam.lib.player.TBMCPlayerBase;
-import com.google.common.collect.HashBiMap;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
-@CommandClass(helpText = {
-	"Connect command", //
-	"This command lets you connect your account with a Minecraft account. This allows using the Minecraft chat and other things.", //
-})
-public class ConnectCommand extends ICommand2DC {
-
-	/**
-	 * Key: Minecraft name<br>
-	 * Value: Discord ID
-	 */
-	public static HashBiMap<String, String> WaitingToConnect = HashBiMap.create();
-
-	@Command2.Subcommand
-	public boolean def(Command2DCSender sender, String Minecraftname) {
-		val message = sender.getMessage();
-		val channel = message.getChannel().block();
-		val author = message.getAuthor().orElse(null);
-		if (author == null || channel == null) return true;
-		if (WaitingToConnect.inverse().containsKey(author.getId().asString())) {
-			channel.createMessage(
-				"Replacing " + WaitingToConnect.inverse().get(author.getId().asString()) + " with " + Minecraftname).subscribe();
-			WaitingToConnect.inverse().remove(author.getId().asString());
-		}
-		@SuppressWarnings("deprecation")
-		OfflinePlayer p = Bukkit.getOfflinePlayer(Minecraftname);
-		if (p == null) {
-			channel.createMessage("The specified Minecraft player cannot be found").subscribe();
-			return true;
-		}
-		try (TBMCPlayer pl = TBMCPlayerBase.getPlayer(p.getUniqueId(), TBMCPlayer.class)) {
-			DiscordPlayer dp = pl.getAs(DiscordPlayer.class);
-			if (dp != null && author.getId().asString().equals(dp.getDiscordID())) {
-				channel.createMessage("You already have this account connected.").subscribe();
-				return true;
-			}
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("An error occured while connecting a Discord account!", e);
-			channel.createMessage("An internal error occured!\n" + e).subscribe();
-		}
-		WaitingToConnect.put(p.getName(), author.getId().asString());
-		channel.createMessage(
-			"Alright! Now accept the connection in Minecraft from the account " + Minecraftname
-				+ " before the next server restart. You can also adjust the Minecraft name you want to connect to with the same command.").subscribe();
-		if (p.isOnline())
-			((Player) p).sendMessage("§bTo connect with the Discord account " + author.getUsername() + "#"
-				+ author.getDiscriminator() + " do /discord accept");
-		return true;
-	}
-
-}

src/main/java/buttondevteam/discordplugin/commands/DebugCommand.java

@@ -1,30 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.listeners.CommonListeners;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import reactor.core.publisher.Mono;
-
-@CommandClass(helpText = {
-	"Switches debug mode."
-})
-public class DebugCommand extends ICommand2DC {
-	@Command2.Subcommand
-	public boolean def(Command2DCSender sender) {
-		sender.getMessage().getAuthorAsMember()
-			.switchIfEmpty(sender.getMessage().getAuthor() //Support DMs
-				.map(u -> u.asMember(DiscordPlugin.mainServer.getId()))
-				.orElse(Mono.empty()))
-			.flatMap(m -> DiscordPlugin.plugin.modRole().get()
-				.map(mr -> m.getRoleIds().stream().anyMatch(r -> r.equals(mr.getId())))
-				.switchIfEmpty(Mono.fromSupplier(() -> DiscordPlugin.mainServer.getOwnerId().asLong() == m.getId().asLong()))) //Role not found
-			.onErrorReturn(false).subscribe(success -> {
-				if (success)
-					sender.sendMessage("debug " + (CommonListeners.debug() ? "enabled" : "disabled"));
-				else
-					sender.sendMessage("you need to be a moderator to use this command.");
-			});
-		return true;
-	}
-}

src/main/java/buttondevteam/discordplugin/commands/HelpCommand.java

@@ -1,24 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-
-@CommandClass(helpText = {
-	"Help command", //
-	"Shows some info about a command or lists the available commands.", //
-})
-public class HelpCommand extends ICommand2DC {
-	@Command2.Subcommand
-	public boolean def(Command2DCSender sender, @Command2.TextArg @Command2.OptionalArg String args) {
-		if (args == null || args.length() == 0)
-			sender.sendMessage(getManager().getCommandsText());
-		else {
-			String[] ht = getManager().getHelpText(args);
-			if (ht == null)
-				sender.sendMessage("Command not found: " + args);
-			else
-				sender.sendMessage(ht);
-		}
-		return true;
-	}
-}

src/main/java/buttondevteam/discordplugin/commands/ICommand2DC.java

@@ -1,20 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.chat.ICommand2;
-import lombok.Getter;
-import lombok.val;
-
-public abstract class ICommand2DC extends ICommand2<Command2DCSender> {
-	public <T extends ICommand2> ICommand2DC() {
-		super(DiscordPlugin.plugin.getManager());
-		val ann = getClass().getAnnotation(CommandClass.class);
-		if (ann == null)
-			modOnly = false;
-		else
-			modOnly = ann.modOnly();
-	}
-
-	private final @Getter boolean modOnly;
-}

src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java

@@ -1,93 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.player.ChromaGamerBase;
-import buttondevteam.lib.player.ChromaGamerBase.InfoTarget;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.User;
-import lombok.val;
-
-import java.util.List;
-
-@CommandClass(helpText = {
-	"User information", //
-	"Shows some information about users, from Discord, from Minecraft or from Reddit if they have these accounts connected.", //
-	"If used without args, shows your info.", //
-})
-public class UserinfoCommand extends ICommand2DC {
-	@Command2.Subcommand
-	public boolean def(Command2DCSender sender, @Command2.OptionalArg @Command2.TextArg String user) {
-		val message = sender.getMessage();
-		User target = null;
-		val channel = message.getChannel().block();
-		assert channel != null;
-		if (user == null || user.length() == 0)
-			target = message.getAuthor().orElse(null);
-		else {
-			@SuppressWarnings("OptionalGetWithoutIsPresent") final User firstmention = message.getUserMentions()
-				.filter(m -> !m.getId().asString().equals(DiscordPlugin.dc.getSelfId().get().asString())).blockFirst();
-			if (firstmention != null)
-				target = firstmention;
-			else if (user.contains("#")) {
-				String[] targettag = user.split("#");
-				final List<User> targets = getUsers(message, targettag[0]);
-				if (targets.size() == 0) {
-					channel.createMessage("The user cannot be found (by name): " + user).subscribe();
-					return true;
-				}
-				for (User ptarget : targets) {
-					if (ptarget.getDiscriminator().equalsIgnoreCase(targettag[1])) {
-						target = ptarget;
-						break;
-					}
-				}
-				if (target == null) {
-					channel.createMessage("The user cannot be found (by discriminator): " + user + "(Found " + targets.size()
-						+ " users with the name.)").subscribe();
-					return true;
-				}
-			} else {
-				final List<User> targets = getUsers(message, user);
-				if (targets.size() == 0) {
-					channel.createMessage("The user cannot be found on Discord: " + user).subscribe();
-					return true;
-				}
-				if (targets.size() > 1) {
-					channel.createMessage("Multiple users found with that (nick)name. Please specify the whole tag, like ChromaBot#6338 or use a ping.").subscribe();
-					return true;
-				}
-				target = targets.get(0);
-			}
-		}
-		if (target == null) {
-			sender.sendMessage("An error occurred.");
-			return true;
-		}
-		try (DiscordPlayer dp = ChromaGamerBase.getUser(target.getId().asString(), DiscordPlayer.class)) {
-			StringBuilder uinfo = new StringBuilder("User info for ").append(target.getUsername()).append(":\n");
-			uinfo.append(dp.getInfo(InfoTarget.Discord));
-			channel.createMessage(uinfo.toString()).subscribe();
-		} catch (Exception e) {
-			channel.createMessage("An error occured while getting the user!").subscribe();
-			TBMCCoreAPI.SendException("Error while getting info about " + target.getUsername() + "!", e);
-		}
-		return true;
-	}
-
-	private List<User> getUsers(Message message, String args) {
-		final List<User> targets;
-		val guild = message.getGuild().block();
-		if (guild == null) //Private channel
-			targets = DiscordPlugin.dc.getUsers().filter(u -> u.getUsername().equalsIgnoreCase(args))
-				.collectList().block();
-		else
-			targets = guild.getMembers().filter(m -> m.getUsername().equalsIgnoreCase(args))
-				.map(m -> (User) m).collectList().block();
-		return targets;
-	}
-
-}

src/main/java/buttondevteam/discordplugin/commands/VersionCommand.java

@@ -1,26 +0,0 @@
-package buttondevteam.discordplugin.commands;
-
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import lombok.val;
-
-@CommandClass(helpText = {
-	"Version",
-	"Returns the plugin's version"
-})
-public class VersionCommand extends ICommand2DC {
-	@Command2.Subcommand
-	public boolean def(Command2DCSender sender) {
-		sender.sendMessage(getVersion());
-		return true;
-	}
-
-	public static String[] getVersion() {
-		val desc = DiscordPlugin.plugin.getDescription();
-		return new String[]{ //
-				desc.getFullName(), //
-				desc.getWebsite() //
-		};
-	}
-}

src/main/java/buttondevteam/discordplugin/exceptions/DebugMessageListener.java

@@ -1,36 +0,0 @@
-package buttondevteam.discordplugin.exceptions;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCDebugMessageEvent;
-import discord4j.core.object.entity.MessageChannel;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import reactor.core.publisher.Mono;
-
-public class DebugMessageListener implements Listener {
-	@EventHandler
-	public void onDebugMessage(TBMCDebugMessageEvent e) {
-		SendMessage(e.getDebugMessage());
-		e.setSent();
-	}
-
-	private static void SendMessage(String message) {
-		if (DiscordPlugin.SafeMode || !ComponentManager.isEnabled(ExceptionListenerModule.class))
-			return;
-		try {
-			Mono<MessageChannel> mc = ExceptionListenerModule.getChannel();
-			if (mc == null) return;
-			StringBuilder sb = new StringBuilder();
-			sb.append("```").append("\n");
-			if (message.length() > 2000)
-				message = message.substring(0, 2000);
-			sb.append(message).append("\n");
-			sb.append("```");
-			mc.flatMap(ch -> ch.createMessage(sb.toString())).subscribe();
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-}

src/main/java/buttondevteam/discordplugin/exceptions/ExceptionListenerModule.java

@@ -1,116 +0,0 @@
-package buttondevteam.discordplugin.exceptions;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.TBMCExceptionEvent;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import discord4j.core.object.entity.Guild;
-import discord4j.core.object.entity.GuildChannel;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.Role;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import reactor.core.publisher.Mono;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Listens for errors from the Chroma plugins and posts them to Discord, ignoring repeating errors so it's not that spammy.
- */
-public class ExceptionListenerModule extends Component<DiscordPlugin> implements Listener {
-	private List<Throwable> lastthrown = new ArrayList<>();
-	private List<String> lastsourcemsg = new ArrayList<>();
-
-	@EventHandler
-	public void onException(TBMCExceptionEvent e) {
-		if (DiscordPlugin.SafeMode || !ComponentManager.isEnabled(getClass()))
-			return;
-		if (lastthrown.stream()
-			.anyMatch(ex -> Arrays.equals(e.getException().getStackTrace(), ex.getStackTrace())
-				&& (e.getException().getMessage() == null ? ex.getMessage() == null
-				: e.getException().getMessage().equals(ex.getMessage()))) // e.Exception.Message==ex.Message
-			&& lastsourcemsg.contains(e.getSourceMessage()))
-			return;
-		SendException(e.getException(), e.getSourceMessage());
-		if (lastthrown.size() >= 10)
-			lastthrown.remove(0);
-		if (lastsourcemsg.size() >= 10)
-			lastsourcemsg.remove(0);
-		lastthrown.add(e.getException());
-		lastsourcemsg.add(e.getSourceMessage());
-		e.setHandled();
-	}
-
-	private static void SendException(Throwable e, String sourcemessage) {
-		if (instance == null) return;
-		try {
-			getChannel().flatMap(channel -> {
-				Mono<Role> coderRole;
-				if (channel instanceof GuildChannel)
-					coderRole = instance.pingRole(((GuildChannel) channel).getGuild()).get();
-				else
-					coderRole = Mono.empty();
-				return coderRole.map(role -> TBMCCoreAPI.IsTestServer() ? new StringBuilder()
-					: new StringBuilder(role.getMention()).append("\n"))
-					.defaultIfEmpty(new StringBuilder())
-					.flatMap(sb -> {
-						sb.append(sourcemessage).append("\n");
-						sb.append("```").append("\n");
-						String stackTrace = Arrays.stream(ExceptionUtils.getStackTrace(e).split("\\n"))
-							.filter(s -> !s.contains("\tat ") || s.contains("\tat buttondevteam."))
-							.collect(Collectors.joining("\n"));
-						if (sb.length() + stackTrace.length() >= 1980)
-							stackTrace = stackTrace.substring(0, 1980 - sb.length());
-						sb.append(stackTrace).append("\n");
-						sb.append("```");
-						return channel.createMessage(sb.toString());
-					});
-			}).subscribe();
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	private static ExceptionListenerModule instance;
-
-	public static Mono<MessageChannel> getChannel() {
-		if (instance != null) return instance.channel().get();
-		return Mono.empty();
-	}
-
-	/**
-	 * The channel to post the errors to.
-	 */
-	private ReadOnlyConfigData<Mono<MessageChannel>> channel() {
-		return DPUtils.channelData(getConfig(), "channel");
-	}
-
-	/**
-	 * The role to ping if an error occurs. Set to empty ('') to disable.
-	 */
-	private ConfigData<Mono<Role>> pingRole(Mono<Guild> guild) {
-		return DPUtils.roleData(getConfig(), "pingRole", "Coder", guild);
-	}
-
-	@Override
-	protected void enable() {
-		if (DPUtils.disableIfConfigError(this, channel())) return;
-		instance = this;
-		Bukkit.getPluginManager().registerEvents(new ExceptionListenerModule(), getPlugin());
-		TBMCCoreAPI.RegisterEventsForExceptions(new DebugMessageListener(), getPlugin());
-	}
-
-	@Override
-	protected void disable() {
-		instance = null;
-	}
-}

src/main/java/buttondevteam/discordplugin/fun/FunModule.java

@@ -1,163 +0,0 @@
-package buttondevteam.discordplugin.fun;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import com.google.common.collect.Lists;
-import discord4j.core.event.domain.PresenceUpdateEvent;
-import discord4j.core.object.entity.*;
-import discord4j.core.object.presence.Status;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import reactor.core.publisher.Mono;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
-/**
- * All kinds of random things.
- * The YEEHAW event uses an emoji named :YEEHAW: if available
- */
-public class FunModule extends Component<DiscordPlugin> implements Listener {
-	private static final String[] serverReadyStrings = new String[]{"in one week from now", // Ali
-		"between now and the heat-death of the universe.", // Ghostise
-		"soon™", "ask again this time next month", // Ghostise
-		"in about 3 seconds", // Nicolai
-		"after we finish 8 plugins", // Ali
-		"tomorrow.", // Ali
-		"after one tiiiny feature", // Ali
-		"next commit", // Ali
-		"after we finish strangling Towny", // Ali
-		"when we kill every *fucking* bug", // Ali
-		"once the server stops screaming.", // Ali
-		"after HL3 comes out", // Ali
-		"next time you ask", // Ali
-		"when will *you* be open?" // Ali
-	};
-
-	/**
-	 * Questions that the bot will choose a random answer to give to.
-	 */
-	private ConfigData<String[]> serverReady() {
-		return getConfig().getData("serverReady", () -> new String[]{"when will the server be open",
-			"when will the server be ready", "when will the server be done", "when will the server be complete",
-			"when will the server be finished", "when's the server ready", "when's the server open",
-			"vhen vill ze server be open?"});
-	}
-
-	/**
-	 * Answers for a recognized question. Selected randomly.
-	 */
-	private ConfigData<ArrayList<String>> serverReadyAnswers() {
-		return getConfig().getData("serverReadyAnswers", () -> Lists.newArrayList(serverReadyStrings));
-	}
-
-	private static final Random serverReadyRandom = new Random();
-	private static final ArrayList<Short> usableServerReadyStrings = new ArrayList<>(0);
-
-	private void createUsableServerReadyStrings() {
-		IntStream.range(0, serverReadyAnswers().get().size())
-			.forEach(i -> FunModule.usableServerReadyStrings.add((short) i));
-	}
-
-	@Override
-	protected void enable() {
-		registerListener(this);
-	}
-
-	@Override
-	protected void disable() {
-		lastlist = lastlistp = ListC = 0;
-	}
-
-	private static short lastlist = 0;
-	private static short lastlistp = 0;
-
-	private static short ListC = 0;
-
-	public static boolean executeMemes(Message message) {
-		val fm = ComponentManager.getIfEnabled(FunModule.class);
-		if (fm == null) return false;
-		String msglowercased = message.getContent().orElse("").toLowerCase();
-		lastlist++;
-		if (lastlist > 5) {
-			ListC = 0;
-			lastlist = 0;
-		}
-		if (msglowercased.equals("list") && Bukkit.getOnlinePlayers().size() == lastlistp && ListC++ > 2) // Lowered already
-		{
-			DPUtils.reply(message, Mono.empty(), "stop it. You know the answer.").subscribe();
-			lastlist = 0;
-			lastlistp = (short) Bukkit.getOnlinePlayers().size();
-			return true; //Handled
-		}
-		lastlistp = (short) Bukkit.getOnlinePlayers().size(); //Didn't handle
-		if (!TBMCCoreAPI.IsTestServer()
-			&& Arrays.stream(fm.serverReady().get()).anyMatch(msglowercased::contains)) {
-			int next;
-			if (usableServerReadyStrings.size() == 0)
-				fm.createUsableServerReadyStrings();
-			next = usableServerReadyStrings.remove(serverReadyRandom.nextInt(usableServerReadyStrings.size()));
-			DPUtils.reply(message, Mono.empty(), fm.serverReadyAnswers().get().get(next)).subscribe();
-			return false; //Still process it as a command/mcchat if needed
-		}
-		return false;
-	}
-
-	@EventHandler
-	public void onPlayerJoin(PlayerJoinEvent event) {
-		ListC = 0;
-	}
-
-	/**
-	 * If all of the people who have this role are online, the bot will post a full house.
-	 */
-	private ConfigData<Mono<Role>> fullHouseDevRole(Mono<Guild> guild) {
-		return DPUtils.roleData(getConfig(), "fullHouseDevRole", "Developer", guild);
-	}
-
-
-	/**
-	 * The channel to post the full house to.
-	 */
-	private ReadOnlyConfigData<Mono<MessageChannel>> fullHouseChannel() {
-		return DPUtils.channelData(getConfig(), "fullHouseChannel");
-	}
-
-	private static long lasttime = 0;
-
-	public static void handleFullHouse(PresenceUpdateEvent event) {
-		val fm = ComponentManager.getIfEnabled(FunModule.class);
-		if (fm == null) return;
-		if (Calendar.getInstance().get(Calendar.DAY_OF_MONTH) % 5 != 0) return;
-		fm.fullHouseChannel().get()
-			.filter(ch -> ch instanceof GuildChannel)
-			.flatMap(channel -> fm.fullHouseDevRole(((GuildChannel) channel).getGuild()).get()
-				.filter(role -> event.getOld().map(p -> p.getStatus().equals(Status.OFFLINE)).orElse(false))
-				.filter(role -> !event.getCurrent().getStatus().equals(Status.OFFLINE))
-				.filterWhen(devrole -> event.getMember().flatMap(m -> m.getRoles()
-					.any(r -> r.getId().asLong() == devrole.getId().asLong())))
-				.filterWhen(devrole ->
-					event.getGuild().flatMapMany(g -> g.getMembers().filter(m -> m.getRoleIds().stream().anyMatch(s -> s.equals(devrole.getId()))))
-						.flatMap(Member::getPresence).all(pr -> !pr.getStatus().equals(Status.OFFLINE)))
-				.filter(devrole -> lasttime + 10 < TimeUnit.NANOSECONDS.toHours(System.nanoTime())) //This should stay so it checks this last
-				.flatMap(devrole -> {
-					lasttime = TimeUnit.NANOSECONDS.toHours(System.nanoTime());
-					return channel.createMessage(mcs -> mcs.setContent("Full house!").setEmbed(ecs ->
-						ecs.setImage(
-							"https://cdn.discordapp.com/attachments/249295547263877121/249687682618359808/poker-hand-full-house-aces-kings-playing-cards-15553791.png")
-					));
-				})).subscribe();
-	}
-}

src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java

@@ -1,99 +0,0 @@
-package buttondevteam.discordplugin.listeners;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.commands.Command2DCSender;
-import buttondevteam.discordplugin.util.Timings;
-import buttondevteam.lib.TBMCCoreAPI;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.PrivateChannel;
-import discord4j.core.object.entity.Role;
-import lombok.val;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class CommandListener {
-	/**
-	 * Runs a ChromaBot command. If mentionedonly is false, it will only execute the command if it was in #bot with the correct prefix or in private.
-	 *
-	 * @param message       The Discord message
-	 * @param mentionedonly Only run the command if ChromaBot is mentioned at the start of the message
-	 * @return Whether it <b>did not run</b> the command
-	 */
-	public static Mono<Boolean> runCommand(Message message, MessageChannel commandChannel, boolean mentionedonly) {
-		Timings timings = CommonListeners.timings;
-		Mono<Boolean> ret = Mono.just(true);
-		if (!message.getContent().isPresent())
-			return ret; //Pin messages and such, let the mcchat listener deal with it
-		val content = message.getContent().get();
-		timings.printElapsed("A");
-		return message.getChannel().flatMap(channel -> {
-			Mono<?> tmp = ret;
-			if (!mentionedonly) { //mentionedonly conditions are in CommonListeners
-				timings.printElapsed("B");
-				if (!(channel instanceof PrivateChannel)
-					&& !(content.charAt(0) == DiscordPlugin.getPrefix()
-					&& channel.getId().asLong() == commandChannel.getId().asLong())) //
-					return ret;
-				timings.printElapsed("C");
-				tmp = ret.then(channel.type()).thenReturn(true); // Fun (this true is ignored - x)
-			}
-			final StringBuilder cmdwithargs = new StringBuilder(content);
-			val gotmention = new AtomicBoolean();
-			timings.printElapsed("Before self");
-			return tmp.flatMapMany(x ->
-				DiscordPlugin.dc.getSelf().flatMap(self -> self.asMember(DiscordPlugin.mainServer.getId()))
-					.flatMapMany(self -> {
-						timings.printElapsed("D");
-						gotmention.set(checkanddeletemention(cmdwithargs, self.getMention(), message));
-						gotmention.set(checkanddeletemention(cmdwithargs, self.getNicknameMention(), message) || gotmention.get());
-						val mentions = message.getRoleMentions();
-						return self.getRoles().filterWhen(r -> mentions.any(rr -> rr.getName().equals(r.getName())))
-							.map(Role::getMention);
-					}).map(mentionRole -> {
-					timings.printElapsed("E");
-					gotmention.set(checkanddeletemention(cmdwithargs, mentionRole, message) || gotmention.get()); // Delete all mentions
-					return !mentionedonly || gotmention.get(); //Stops here if false
-				}).switchIfEmpty(Mono.fromSupplier(() -> !mentionedonly || gotmention.get())))
-				.filter(b -> b).last(false).filter(b -> b).doOnNext(b -> channel.type().subscribe()).flatMap(b -> {
-					String cmdwithargsString = cmdwithargs.toString();
-					try {
-						timings.printElapsed("F");
-						if (!DiscordPlugin.plugin.getManager().handleCommand(new Command2DCSender(message), cmdwithargsString))
-							return DPUtils.reply(message, channel, "unknown command. Do " + DiscordPlugin.getPrefix() + "help for help.\n" + cmdwithargsString)
-								.map(m -> false);
-					} catch (Exception e) {
-						TBMCCoreAPI.SendException("Failed to process Discord command: " + cmdwithargsString, e);
-					}
-					return Mono.just(false); //If the command succeeded or there was an error, return false
-				}).defaultIfEmpty(true);
-		});
-	}
-
-	private static boolean checkanddeletemention(StringBuilder cmdwithargs, String mention, Message message) {
-		final char prefix = DiscordPlugin.getPrefix();
-		if (message.getContent().orElse("").startsWith(mention)) // TODO: Resolve mentions: Compound arguments, either a mention or text
-			if (cmdwithargs.length() > mention.length() + 1) {
-				int i = cmdwithargs.indexOf(" ", mention.length());
-				if (i == -1)
-					i = mention.length();
-				else
-					//noinspection StatementWithEmptyBody
-					for (; i < cmdwithargs.length() && cmdwithargs.charAt(i) == ' '; i++)
-						; //Removes any space before the command
-				cmdwithargs.delete(0, i);
-				cmdwithargs.insert(0, prefix); //Always use the prefix for processing
-			} else
-				cmdwithargs.replace(0, cmdwithargs.length(), prefix + "help");
-		else {
-			if (cmdwithargs.length() == 0)
-				cmdwithargs.replace(0, cmdwithargs.length(), prefix + "help");
-			else if (cmdwithargs.charAt(0) != prefix)
-				cmdwithargs.insert(0, prefix);
-			return false; //Don't treat / as mention, mentions can be used in public mcchat
-		}
-		return true;
-	}
-}

src/main/java/buttondevteam/discordplugin/listeners/CommonListeners.java

@@ -1,89 +0,0 @@
-package buttondevteam.discordplugin.listeners;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.fun.FunModule;
-import buttondevteam.discordplugin.mcchat.MinecraftChatModule;
-import buttondevteam.discordplugin.role.GameRoleModule;
-import buttondevteam.discordplugin.util.Timings;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.Component;
-import discord4j.core.event.EventDispatcher;
-import discord4j.core.event.domain.PresenceUpdateEvent;
-import discord4j.core.event.domain.message.MessageCreateEvent;
-import discord4j.core.event.domain.role.RoleCreateEvent;
-import discord4j.core.event.domain.role.RoleDeleteEvent;
-import discord4j.core.event.domain.role.RoleUpdateEvent;
-import discord4j.core.object.entity.PrivateChannel;
-import lombok.val;
-import reactor.core.publisher.Mono;
-
-public class CommonListeners {
-
-	public static final Timings timings = new Timings();
-
-	/*
-	MentionEvent:
-	- CommandListener (starts with mention, only 'channelcon' and not in #bot)
-
-	MessageReceivedEvent:
-	- v CommandListener (starts with mention, in #bot or a connected chat)
-	- Minecraft chat (is enabled in the channel and message isn't [/]mcchat)
-	- CommandListener (with the correct prefix in #bot, or in private)
-	*/
-	public static void register(EventDispatcher dispatcher) {
-		dispatcher.on(MessageCreateEvent.class).flatMap(event -> {
-			timings.printElapsed("Message received");
-			val def = Mono.empty();
-			if (DiscordPlugin.SafeMode)
-				return def;
-			val author = event.getMessage().getAuthor();
-			if (!author.isPresent() || author.get().isBot())
-				return def;
-			if (FunModule.executeMemes(event.getMessage()))
-				return def;
-			val commandChannel = DiscordPlugin.plugin.commandChannel().get();
-			val commandCh = DPUtils.getMessageChannel(DiscordPlugin.plugin.commandChannel());
-			return commandCh.filterWhen(ch -> event.getMessage().getChannel().map(mch ->
-				(commandChannel != null && mch.getId().asLong() == commandChannel.asLong()) //If mentioned, that's higher than chat
-					|| mch instanceof PrivateChannel
-					|| event.getMessage().getContent().orElse("").contains("channelcon")) //Only 'channelcon' is allowed in other channels
-				.flatMap(shouldRun -> { //Only continue if this doesn't handle the event
-					if (!shouldRun)
-						return Mono.just(true); //The condition is only for the first command execution, not mcchat
-					timings.printElapsed("Run command 1");
-					return CommandListener.runCommand(event.getMessage(), ch, true); //#bot is handled here
-				})).filterWhen(ch -> {
-				timings.printElapsed("mcchat");
-				val mcchat = Component.getComponents().get(MinecraftChatModule.class);
-				if (mcchat != null && mcchat.isEnabled()) //ComponentManager.isEnabled() searches the component again
-					return ((MinecraftChatModule) mcchat).getListener().handleDiscord(event); //Also runs Discord commands in chat channels
-				return Mono.empty(); //Wasn't handled, continue
-			}).filterWhen(ch -> {
-				timings.printElapsed("Run command 2");
-				return CommandListener.runCommand(event.getMessage(), ch, false);
-			});
-		}).onErrorContinue((err, obj) -> TBMCCoreAPI.SendException("An error occured while handling a message!", err))
-			.subscribe();
-		dispatcher.on(PresenceUpdateEvent.class).subscribe(event -> {
-			if (DiscordPlugin.SafeMode)
-				return;
-			FunModule.handleFullHouse(event);
-		});
-		dispatcher.on(RoleCreateEvent.class).subscribe(GameRoleModule::handleRoleEvent);
-		dispatcher.on(RoleDeleteEvent.class).subscribe(GameRoleModule::handleRoleEvent);
-		dispatcher.on(RoleUpdateEvent.class).subscribe(GameRoleModule::handleRoleEvent);
-
-	}
-
-	private static boolean debug = false;
-
-	public static void debug(String debug) {
-		if (CommonListeners.debug) //Debug
-			DPUtils.getLogger().info(debug);
-	}
-
-	public static boolean debug() {
-		return debug = !debug;
-	}
-}

src/main/java/buttondevteam/discordplugin/listeners/DiscordListener.java

@@ -1,4 +0,0 @@
-package buttondevteam.discordplugin.listeners;
-
-public interface DiscordListener {
-}

src/main/java/buttondevteam/discordplugin/listeners/MCListener.java

@@ -1,58 +0,0 @@
-package buttondevteam.discordplugin.listeners;
-
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.commands.ConnectCommand;
-import buttondevteam.lib.player.TBMCPlayerGetInfoEvent;
-import buttondevteam.lib.player.TBMCPlayerJoinEvent;
-import discord4j.core.object.entity.Member;
-import discord4j.core.object.entity.User;
-import discord4j.core.object.util.Snowflake;
-import lombok.val;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.ServerCommandEvent;
-import reactor.core.publisher.Mono;
-
-public class MCListener implements Listener {
-	@EventHandler
-	public void onPlayerJoin(TBMCPlayerJoinEvent e) {
-		if (ConnectCommand.WaitingToConnect.containsKey(e.GetPlayer().PlayerName().get())) {
-			@SuppressWarnings("ConstantConditions") User user = DiscordPlugin.dc
-				.getUserById(Snowflake.of(ConnectCommand.WaitingToConnect.get(e.GetPlayer().PlayerName().get()))).block();
-			if (user == null) return;
-			e.getPlayer().sendMessage("§bTo connect with the Discord account @" + user.getUsername() + "#" + user.getDiscriminator()
-				+ " do /discord accept");
-			e.getPlayer().sendMessage("§bIf it wasn't you, do /discord decline");
-		}
-	}
-
-	@EventHandler
-	public void onGetInfo(TBMCPlayerGetInfoEvent e) {
-		if (DiscordPlugin.SafeMode)
-			return;
-		DiscordPlayer dp = e.getPlayer().getAs(DiscordPlayer.class);
-		if (dp == null || dp.getDiscordID() == null || dp.getDiscordID().equals(""))
-			return;
-		val userOpt = DiscordPlugin.dc.getUserById(Snowflake.of(dp.getDiscordID())).onErrorResume(t -> Mono.empty()).blockOptional();
-		if (!userOpt.isPresent()) return;
-		User user = userOpt.get();
-		e.addInfo("Discord tag: " + user.getUsername() + "#" + user.getDiscriminator());
-		val memberOpt = user.asMember(DiscordPlugin.mainServer.getId()).onErrorResume(t -> Mono.empty()).blockOptional();
-		if (!memberOpt.isPresent()) return;
-		Member member = memberOpt.get();
-		val prOpt = member.getPresence().blockOptional();
-		if (!prOpt.isPresent()) return;
-		val pr = prOpt.get();
-		e.addInfo(pr.getStatus().toString());
-		if (pr.getActivity().isPresent()) {
-			val activity = pr.getActivity().get();
-			e.addInfo(activity.getType() + ": " + activity.getName());
-		}
-	}
-
-	@EventHandler
-	public void onServerCommand(ServerCommandEvent e) {
-		DiscordPlugin.Restart = !e.getCommand().equalsIgnoreCase("stop"); // The variable is always true except if stopped
-	}
-}

src/main/java/buttondevteam/discordplugin/mcchat/ChannelconCommand.java

@@ -1,175 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.core.component.channel.ChatRoom;
-import buttondevteam.discordplugin.*;
-import buttondevteam.discordplugin.commands.Command2DCSender;
-import buttondevteam.discordplugin.commands.ICommand2DC;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.player.TBMCPlayer;
-import discord4j.core.object.entity.GuildChannel;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.User;
-import discord4j.core.object.util.Permission;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import org.bukkit.Bukkit;
-import reactor.core.publisher.Mono;
-
-import javax.annotation.Nullable;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-@SuppressWarnings("SimplifyOptionalCallChains") //Java 11
-@CommandClass(helpText = {"Channel connect", //
-	"This command allows you to connect a Minecraft channel to a Discord channel (just like how the global chat is connected to #minecraft-chat).", //
-	"You need to have access to the MC channel and have manage permissions on the Discord channel.", //
-	"You also need to have your Minecraft account connected. In #bot use /connect <mcname>.", //
-	"Call this command from the channel you want to use.", //
-	"Usage: @Bot channelcon <mcchannel>", //
-	"Use the ID (command) of the channel, for example `g` for the global chat.", //
-	"To remove a connection use @ChromaBot channelcon remove in the channel.", //
-	"Mentioning the bot is needed in this case because the / prefix only works in #bot.", //
-	"Invite link: <Unknown>" //
-})
-@RequiredArgsConstructor
-public class ChannelconCommand extends ICommand2DC {
-	private final MinecraftChatModule module;
-
-	@Command2.Subcommand
-	public boolean remove(Command2DCSender sender) {
-		val message = sender.getMessage();
-		if (checkPerms(message, null)) return true;
-		if (MCChatCustom.removeCustomChat(message.getChannelId()))
-			DPUtils.reply(message, Mono.empty(), "channel connection removed.").subscribe();
-		else
-			DPUtils.reply(message, Mono.empty(), "this channel isn't connected.").subscribe();
-		return true;
-	}
-
-	@Command2.Subcommand
-	public boolean toggle(Command2DCSender sender, @Command2.OptionalArg String toggle) {
-		val message = sender.getMessage();
-		if (checkPerms(message, null)) return true;
-		val cc = MCChatCustom.getCustomChat(message.getChannelId());
-		if (cc == null)
-			return respond(sender, "this channel isn't connected.");
-		Supplier<String> togglesString = () -> Arrays.stream(ChannelconBroadcast.values()).map(t -> t.toString().toLowerCase() + ": " + ((cc.toggles & t.flag) == 0 ? "disabled" : "enabled")).collect(Collectors.joining("\n"))
-			+ "\n\n" + TBMCSystemChatEvent.BroadcastTarget.stream().map(target -> target.getName() + ": " + (cc.brtoggles.contains(target) ? "enabled" : "disabled")).collect(Collectors.joining("\n"));
-		if (toggle == null) {
-			DPUtils.reply(message, Mono.empty(), "toggles:\n" + togglesString.get()).subscribe();
-			return true;
-		}
-		String arg = toggle.toUpperCase();
-		val b = Arrays.stream(ChannelconBroadcast.values()).filter(t -> t.toString().equals(arg)).findAny();
-		if (!b.isPresent()) {
-			val bt = TBMCSystemChatEvent.BroadcastTarget.get(arg);
-			if (bt == null) {
-				DPUtils.reply(message, Mono.empty(), "cannot find toggle. Toggles:\n" + togglesString.get()).subscribe();
-				return true;
-			}
-			final boolean add;
-			if (add = !cc.brtoggles.contains(bt))
-				cc.brtoggles.add(bt);
-			else
-				cc.brtoggles.remove(bt);
-			return respond(sender, "'" + bt.getName() + "' " + (add ? "en" : "dis") + "abled");
-		}
-		//A B | F
-		//------- A: original - B: mask - F: new
-		//0 0 | 0
-		//0 1 | 1
-		//1 0 | 1
-		//1 1 | 0
-		// XOR
-		cc.toggles ^= b.get().flag;
-		DPUtils.reply(message, Mono.empty(), "'" + b.get().toString().toLowerCase() + "' " + ((cc.toggles & b.get().flag) == 0 ? "disabled" : "enabled")).subscribe();
-		return true;
-	}
-
-	@Command2.Subcommand
-	public boolean def(Command2DCSender sender, String channelID) {
-		val message = sender.getMessage();
-		if (!module.allowCustomChat().get()) {
-			sender.sendMessage("channel connection is not allowed on this Minecraft server.");
-			return true;
-		}
-		val channel = message.getChannel().block();
-		if (checkPerms(message, channel)) return true;
-		if (MCChatCustom.hasCustomChat(message.getChannelId()))
-			return respond(sender, "this channel is already connected to a Minecraft channel. Use `@ChromaBot channelcon remove` to remove it.");
-		val chan = Channel.getChannels().filter(ch -> ch.ID.equalsIgnoreCase(channelID) || (Arrays.stream(ch.IDs().get()).anyMatch(cid -> cid.equalsIgnoreCase(channelID)))).findAny();
-		if (!chan.isPresent()) { //TODO: Red embed that disappears over time (kinda like the highlight messages in OW)
-			DPUtils.reply(message, channel, "MC channel with ID '" + channelID + "' not found! The ID is the command for it without the /.").subscribe();
-			return true;
-		}
-		if (!message.getAuthor().isPresent()) return true;
-		val author = message.getAuthor().get();
-		val dp = DiscordPlayer.getUser(author.getId().asString(), DiscordPlayer.class);
-		val chp = dp.getAs(TBMCPlayer.class);
-		if (chp == null) {
-			DPUtils.reply(message, channel, "you need to connect your Minecraft account. On the main server in " + DPUtils.botmention() + " do " + DiscordPlugin.getPrefix() + "connect <MCname>").subscribe();
-			return true;
-		}
-		DiscordConnectedPlayer dcp = DiscordConnectedPlayer.create(message.getAuthor().get(), channel, chp.getUUID(), Bukkit.getOfflinePlayer(chp.getUUID()).getName(), module);
-		//Using a fake player with no login/logout, should be fine for this event
-		String groupid = chan.get().getGroupID(dcp);
-		if (groupid == null && !(chan.get() instanceof ChatRoom)) { //ChatRooms don't allow it unless the user joins, which happens later
-			DPUtils.reply(message, channel, "sorry, you cannot use that Minecraft channel.").subscribe();
-			return true;
-		}
-		if (chan.get() instanceof ChatRoom) { //ChatRooms don't work well
-			DPUtils.reply(message, channel, "chat rooms are not supported yet.").subscribe();
-			return true;
-		}
-        /*if (MCChatListener.getCustomChats().stream().anyMatch(cc -> cc.groupID.equals(groupid) && cc.mcchannel.ID.equals(chan.get().ID))) {
-            DPUtils.reply(message, null, "sorry, this MC chat is already connected to a different channel, multiple channels are not supported atm.");
-            return true;
-        }*/ //TODO: "Channel admins" that can connect channels?
-		MCChatCustom.addCustomChat(channel, groupid, chan.get(), author, dcp, 0, new HashSet<>());
-		if (chan.get() instanceof ChatRoom)
-			DPUtils.reply(message, channel, "alright, connection made to the room!").subscribe();
-		else
-			DPUtils.reply(message, channel, "alright, connection made to group `" + groupid + "`!").subscribe();
-		return true;
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	private boolean checkPerms(Message message, @Nullable MessageChannel channel) {
-		if (channel == null)
-			channel = message.getChannel().block();
-		if (!(channel instanceof GuildChannel)) {
-			DPUtils.reply(message, channel, "you can only use this command in a server!").subscribe();
-			return true;
-		}
-		var perms = ((GuildChannel) channel).getEffectivePermissions(message.getAuthor().map(User::getId).get()).block();
-		if (!perms.contains(Permission.ADMINISTRATOR) && !perms.contains(Permission.MANAGE_CHANNELS)) {
-			DPUtils.reply(message, channel, "you need to have manage permissions for this channel!").subscribe();
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public String[] getHelpText(Method method, Command2.Subcommand ann) {
-		return new String[]{ //
-			"Channel connect", //
-			"This command allows you to connect a Minecraft channel to a Discord channel (just like how the global chat is connected to #minecraft-chat).", //
-			"You need to have access to the MC channel and have manage permissions on the Discord channel.", //
-			"You also need to have your Minecraft account connected. In " + DPUtils.botmention() + " use " + DiscordPlugin.getPrefix() + "connect <mcname>.", //
-			"Call this command from the channel you want to use.", //
-			"Usage: " + Objects.requireNonNull(DiscordPlugin.dc.getSelf().block()).getMention() + " channelcon <mcchannel>", //
-			"Use the ID (command) of the channel, for example `g` for the global chat.", //
-			"To remove a connection use @ChromaBot channelcon remove in the channel.", //
-			"Mentioning the bot is needed in this case because the " + DiscordPlugin.getPrefix() + " prefix only works in " + DPUtils.botmention() + ".", //
-			"Invite link: <https://discordapp.com/oauth2/authorize?client_id=" + DiscordPlugin.dc.getApplicationInfo().map(info -> info.getId().asString()).blockOptional().orElse("Unknown") + "&scope=bot&permissions=268509264>"
-		};
-	}
-}

src/main/java/buttondevteam/discordplugin/mcchat/MCChatCommand.java

@@ -1,51 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.commands.Command2DCSender;
-import buttondevteam.discordplugin.commands.ICommand2DC;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import discord4j.core.object.entity.PrivateChannel;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
-@CommandClass(helpText = {
-	"MC Chat",
-	"This command enables or disables the Minecraft chat in private messages.", //
-	"It can be useful if you don't want your messages to be visible, for example when talking in a private channel.", //
-	"You can also run all of the ingame commands you have access to using this command, if you have your accounts connected." //
-})
-@RequiredArgsConstructor
-public class MCChatCommand extends ICommand2DC {
-
-	private final MinecraftChatModule module;
-
-	@Command2.Subcommand
-	public boolean def(Command2DCSender sender) {
-		if (!module.allowPrivateChat().get()) {
-			sender.sendMessage("using the private chat is not allowed on this Minecraft server.");
-			return true;
-		}
-		val message = sender.getMessage();
-		val channel = message.getChannel().block();
-		@SuppressWarnings("OptionalGetWithoutIsPresent") val author = message.getAuthor().get();
-		if (!(channel instanceof PrivateChannel)) {
-			DPUtils.reply(message, channel, "this command can only be issued in a direct message with the bot.").subscribe();
-			return true;
-		}
-		try (final DiscordPlayer user = DiscordPlayer.getUser(author.getId().asString(), DiscordPlayer.class)) {
-			boolean mcchat = !user.isMinecraftChatEnabled();
-			MCChatPrivate.privateMCChat(channel, mcchat, author, user);
-			DPUtils.reply(message, channel, "Minecraft chat " + (mcchat //
-				? "enabled. Use '" + DiscordPlugin.getPrefix() + "mcchat' again to turn it off." //
-				: "disabled.")).subscribe();
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Error while setting mcchat for user " + author.getUsername() + "#" + author.getDiscriminator(), e);
-		}
-		return true;
-	} // TODO: Pin channel switching to indicate the current channel
-
-}

src/main/java/buttondevteam/discordplugin/mcchat/MCChatCustom.java

@@ -1,75 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.core.component.channel.ChatRoom;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.User;
-import discord4j.core.object.util.Snowflake;
-import lombok.NonNull;
-import lombok.val;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-public class MCChatCustom {
-	/**
-	 * Used for town or nation chats or anything else
-	 */
-	static ArrayList<CustomLMD> lastmsgCustom = new ArrayList<>();
-
-	public static void addCustomChat(MessageChannel channel, String groupid, Channel mcchannel, User user, DiscordConnectedPlayer dcp, int toggles, Set<TBMCSystemChatEvent.BroadcastTarget> brtoggles) {
-		if (mcchannel instanceof ChatRoom) {
-			((ChatRoom) mcchannel).joinRoom(dcp);
-			if (groupid == null) groupid = mcchannel.getGroupID(dcp);
-		}
-		val lmd = new CustomLMD(channel, user, groupid, mcchannel, dcp, toggles, brtoggles);
-		lastmsgCustom.add(lmd);
-	}
-
-	public static boolean hasCustomChat(Snowflake channel) {
-		return lastmsgCustom.stream().anyMatch(lmd -> lmd.channel.getId().asLong() == channel.asLong());
-	}
-
-	@Nullable
-	public static CustomLMD getCustomChat(Snowflake channel) {
-		return lastmsgCustom.stream().filter(lmd -> lmd.channel.getId().asLong() == channel.asLong()).findAny().orElse(null);
-	}
-
-	public static boolean removeCustomChat(Snowflake channel) {
-		MCChatUtils.lastmsgfromd.remove(channel.asLong());
-		return lastmsgCustom.removeIf(lmd -> {
-			if (lmd.channel.getId().asLong() != channel.asLong())
-				return false;
-			if (lmd.mcchannel instanceof ChatRoom)
-				((ChatRoom) lmd.mcchannel).leaveRoom(lmd.dcp);
-			return true;
-		});
-	}
-
-	public static List<CustomLMD> getCustomChats() {
-		return Collections.unmodifiableList(lastmsgCustom);
-	}
-
-	public static class CustomLMD extends MCChatUtils.LastMsgData {
-		public final String groupID;
-		public final Channel mcchannel;
-		public final DiscordConnectedPlayer dcp;
-		public int toggles;
-		public Set<TBMCSystemChatEvent.BroadcastTarget> brtoggles;
-
-		private CustomLMD(@NonNull MessageChannel channel, @NonNull User user,
-						  @NonNull String groupid, @NonNull Channel mcchannel, @NonNull DiscordConnectedPlayer dcp, int toggles, Set<TBMCSystemChatEvent.BroadcastTarget> brtoggles) {
-			super(channel, user);
-			groupID = groupid;
-			this.mcchannel = mcchannel;
-			this.dcp = dcp;
-			this.toggles = toggles;
-			this.brtoggles = brtoggles;
-		}
-	}
-}

src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java

@@ -1,432 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.core.component.channel.ChatRoom;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.DiscordSender;
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.listeners.CommandListener;
-import buttondevteam.discordplugin.listeners.CommonListeners;
-import buttondevteam.discordplugin.playerfaker.VanillaCommandListener;
-import buttondevteam.discordplugin.playerfaker.VanillaCommandListener14;
-import buttondevteam.discordplugin.util.Timings;
-import buttondevteam.lib.*;
-import buttondevteam.lib.chat.ChatMessage;
-import buttondevteam.lib.chat.TBMCChatAPI;
-import buttondevteam.lib.player.TBMCPlayer;
-import com.vdurmont.emoji.EmojiParser;
-import discord4j.core.event.domain.message.MessageCreateEvent;
-import discord4j.core.object.Embed;
-import discord4j.core.object.entity.*;
-import discord4j.core.object.util.Snowflake;
-import discord4j.core.spec.EmbedCreateSpec;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.scheduler.BukkitTask;
-import reactor.core.publisher.Mono;
-
-import java.awt.*;
-import java.time.Instant;
-import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class MCChatListener implements Listener {
-	private BukkitTask sendtask;
-	private LinkedBlockingQueue<AbstractMap.SimpleEntry<TBMCChatEvent, Instant>> sendevents = new LinkedBlockingQueue<>();
-	private Runnable sendrunnable;
-	private static Thread sendthread;
-	private final MinecraftChatModule module;
-
-	public MCChatListener(MinecraftChatModule minecraftChatModule) {
-		module = minecraftChatModule;
-	}
-
-	@EventHandler // Minecraft
-	public void onMCChat(TBMCChatEvent ev) {
-		if (!ComponentManager.isEnabled(MinecraftChatModule.class) || ev.isCancelled()) //SafeMode: Needed so it doesn't restart after server shutdown
-			return;
-		sendevents.add(new AbstractMap.SimpleEntry<>(ev, Instant.now()));
-		if (sendtask != null)
-			return;
-		sendrunnable = () -> {
-			sendthread = Thread.currentThread();
-			processMCToDiscord();
-			if (DiscordPlugin.plugin.isEnabled()) //Don't run again if shutting down
-				sendtask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, sendrunnable);
-		};
-		sendtask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, sendrunnable);
-	}
-
-	private void processMCToDiscord() {
-		try {
-			TBMCChatEvent e;
-			Instant time;
-			val se = sendevents.take(); // Wait until an element is available
-			e = se.getKey();
-			time = se.getValue();
-
-			final String authorPlayer = "[" + DPUtils.sanitizeStringNoEscape(e.getChannel().DisplayName().get()) + "] " //
-				+ ("Minecraft".equals(e.getOrigin()) ? "" : "[" + e.getOrigin().substring(0, 1) + "]") //
-				+ (DPUtils.sanitizeStringNoEscape(ChromaUtils.getDisplayName(e.getSender())));
-			val color = e.getChannel().Color().get();
-			final Consumer<EmbedCreateSpec> embed = ecs -> {
-				ecs.setDescription(e.getMessage()).setColor(new Color(color.getRed(),
-					color.getGreen(), color.getBlue()));
-				String url = module.profileURL().get();
-				if (e.getSender() instanceof Player)
-					DPUtils.embedWithHead(ecs, authorPlayer, e.getSender().getName(),
-						url.length() > 0 ? url + "?type=minecraft&id="
-							+ ((Player) e.getSender()).getUniqueId() : null);
-				else if (e.getSender() instanceof DiscordSenderBase)
-					ecs.setAuthor(authorPlayer, url.length() > 0 ? url + "?type=discord&id="
-							+ ((DiscordSenderBase) e.getSender()).getUser().getId().asString() : null,
-						((DiscordSenderBase) e.getSender()).getUser().getAvatarUrl());
-				else
-					DPUtils.embedWithHead(ecs, authorPlayer, e.getSender().getName(), null);
-				ecs.setTimestamp(time);
-			};
-			final long nanoTime = System.nanoTime();
-			InterruptibleConsumer<MCChatUtils.LastMsgData> doit = lastmsgdata -> {
-				if (lastmsgdata.message == null
-					|| !authorPlayer.equals(lastmsgdata.message.getEmbeds().get(0).getAuthor().map(Embed.Author::getName).orElse(null))
-					|| lastmsgdata.time / 1000000000f < nanoTime / 1000000000f - 120
-					|| !lastmsgdata.mcchannel.ID.equals(e.getChannel().ID)
-					|| lastmsgdata.content.length() + e.getMessage().length() + 1 > 2048) {
-					lastmsgdata.message = lastmsgdata.channel.createEmbed(embed).block();
-					lastmsgdata.time = nanoTime;
-					lastmsgdata.mcchannel = e.getChannel();
-					lastmsgdata.content = e.getMessage();
-				} else {
-					lastmsgdata.content = lastmsgdata.content + "\n"
-						+ e.getMessage(); // The message object doesn't get updated
-					lastmsgdata.message.edit(mes -> mes.setEmbed(embed.andThen(ecs ->
-						ecs.setDescription(lastmsgdata.content)))).block();
-				}
-			};
-			// Checks if the given channel is different than where the message was sent from
-			// Or if it was from MC
-			Predicate<Snowflake> isdifferentchannel = id -> !(e.getSender() instanceof DiscordSenderBase)
-				|| ((DiscordSenderBase) e.getSender()).getChannel().getId().asLong() != id.asLong();
-
-			if (e.getChannel().isGlobal()
-				&& (e.isFromCommand() || isdifferentchannel.test(module.chatChannel().get())))
-				doit.accept(MCChatUtils.lastmsgdata == null
-					? MCChatUtils.lastmsgdata = new MCChatUtils.LastMsgData(module.chatChannelMono().block(), null)
-					: MCChatUtils.lastmsgdata);
-
-			for (MCChatUtils.LastMsgData data : MCChatPrivate.lastmsgPerUser) {
-				if ((e.isFromCommand() || isdifferentchannel.test(data.channel.getId()))
-					&& e.shouldSendTo(MCChatUtils.getSender(data.channel.getId(), data.user)))
-					doit.accept(data);
-			}
-
-			val iterator = MCChatCustom.lastmsgCustom.iterator();
-			while (iterator.hasNext()) {
-				val lmd = iterator.next();
-				if ((e.isFromCommand() || isdifferentchannel.test(lmd.channel.getId())) //Test if msg is from Discord
-					&& e.getChannel().ID.equals(lmd.mcchannel.ID) //If it's from a command, the command msg has been deleted, so we need to send it
-					&& e.getGroupID().equals(lmd.groupID)) { //Check if this is the group we want to test - #58
-					if (e.shouldSendTo(lmd.dcp)) //Check original user's permissions
-						doit.accept(lmd);
-					else {
-						iterator.remove(); //If the user no longer has permission, remove the connection
-						lmd.channel.createMessage("The user no longer has permission to view the channel, connection removed.").subscribe();
-					}
-				}
-			}
-		} catch (InterruptedException ex) { //Stop if interrupted anywhere
-			sendtask.cancel();
-			sendtask = null;
-		} catch (Exception ex) {
-			TBMCCoreAPI.SendException("Error while sending message to Discord!", ex);
-		}
-	}
-
-	@EventHandler
-	public void onChatPreprocess(TBMCChatPreprocessEvent event) {
-		int start = -1;
-		while ((start = event.getMessage().indexOf('@', start + 1)) != -1) {
-			int mid = event.getMessage().indexOf('#', start + 1);
-			if (mid == -1)
-				return;
-			int end_ = event.getMessage().indexOf(' ', mid + 1);
-			if (end_ == -1)
-				end_ = event.getMessage().length();
-			final int end = end_;
-			final int startF = start;
-			val user = DiscordPlugin.dc.getUsers().filter(u -> u.getUsername().equals(event.getMessage().substring(startF + 1, mid)))
-				.filter(u -> u.getDiscriminator().equals(event.getMessage().substring(mid + 1, end))).blockFirst();
-			if (user != null) //TODO: Nicknames
-				event.setMessage(event.getMessage().substring(0, startF) + "@" + user.getUsername()
-					+ (event.getMessage().length() > end ? event.getMessage().substring(end) : "")); // TODO: Add formatting
-			start = end; // Skip any @s inside the mention
-		}
-	}
-
-	// ......................DiscordSender....DiscordConnectedPlayer.DiscordPlayerSender
-	// Offline public chat......x............................................
-	// Online public chat.......x...........................................x
-	// Offline private chat.....x.......................x....................
-	// Online private chat......x.......................x...................x
-	// If online and enabling private chat, don't login
-	// If leaving the server and private chat is enabled (has ConnectedPlayer), call login in a task on lowest priority
-	// If private chat is enabled and joining the server, logout the fake player on highest priority
-	// If online and disabling private chat, don't logout
-	// The maps may not contain the senders for UnconnectedSenders
-
-	/**
-	 * Stop the listener. Any calls to onMCChat will restart it as long as we're not in safe mode.
-	 *
-	 * @param wait Wait 5 seconds for the threads to stop
-	 */
-	public static void stop(boolean wait) {
-		if (sendthread != null) sendthread.interrupt();
-		if (recthread != null) recthread.interrupt();
-		try {
-			if (sendthread != null) {
-				sendthread.interrupt();
-				if (wait)
-					sendthread.join(5000);
-			}
-			if (recthread != null) {
-				recthread.interrupt();
-				if (wait)
-					recthread.join(5000);
-			}
-			MCChatUtils.lastmsgdata = null;
-			MCChatPrivate.lastmsgPerUser.clear();
-			MCChatCustom.lastmsgCustom.clear();
-			MCChatUtils.lastmsgfromd.clear();
-			MCChatUtils.ConnectedSenders.clear();
-			MCChatUtils.UnconnectedSenders.clear();
-			recthread = sendthread = null;
-		} catch (InterruptedException e) {
-			e.printStackTrace(); //This thread shouldn't be interrupted
-		}
-	}
-
-	private BukkitTask rectask;
-	private LinkedBlockingQueue<MessageCreateEvent> recevents = new LinkedBlockingQueue<>();
-	private Runnable recrun;
-	private static Thread recthread;
-
-	// Discord
-	public Mono<Boolean> handleDiscord(MessageCreateEvent ev) {
-		val ret = Mono.just(true);
-		if (!ComponentManager.isEnabled(MinecraftChatModule.class))
-			return ret;
-		Timings timings = CommonListeners.timings;
-		timings.printElapsed("Chat event");
-		val author = ev.getMessage().getAuthor();
-		final boolean hasCustomChat = MCChatCustom.hasCustomChat(ev.getMessage().getChannelId());
-		return ev.getMessage().getChannel().filter(channel -> {
-			timings.printElapsed("Filter 1");
-			return !(ev.getMessage().getChannelId().asLong() != module.chatChannel().get().asLong()
-				&& !(channel instanceof PrivateChannel
-				&& author.map(u -> MCChatPrivate.isMinecraftChatEnabled(u.getId().asString())).orElse(false))
-				&& !hasCustomChat); //Chat isn't enabled on this channel
-		}).filter(channel -> {
-			timings.printElapsed("Filter 2");
-			return !(channel instanceof PrivateChannel //Only in private chat
-				&& ev.getMessage().getContent().isPresent()
-				&& ev.getMessage().getContent().get().length() < "/mcchat<>".length()
-				&& ev.getMessage().getContent().get().replace("/", "")
-				.equalsIgnoreCase("mcchat")); //Either mcchat or /mcchat
-			//Allow disabling the chat if needed
-		}).filterWhen(channel -> CommandListener.runCommand(ev.getMessage(), channel, true))
-			//Allow running commands in chat channels
-			.filter(channel -> {
-				MCChatUtils.resetLastMessage(channel);
-				recevents.add(ev);
-				timings.printElapsed("Message event added");
-				if (rectask != null)
-					return true;
-				recrun = () -> { //Don't return in a while loop next time
-					recthread = Thread.currentThread();
-					processDiscordToMC();
-					if (DiscordPlugin.plugin.isEnabled()) //Don't run again if shutting down
-						rectask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, recrun); //Continue message processing
-				};
-				rectask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, recrun); //Start message processing
-				return true;
-			}).map(b -> false).defaultIfEmpty(true);
-	}
-
-	private void processDiscordToMC() {
-		MessageCreateEvent event;
-		try {
-			event = recevents.take();
-		} catch (InterruptedException e1) {
-			rectask.cancel();
-			return;
-		}
-		val sender = event.getMessage().getAuthor().orElse(null);
-		String dmessage = event.getMessage().getContent().orElse("");
-		try {
-			final DiscordSenderBase dsender = MCChatUtils.getSender(event.getMessage().getChannelId(), sender);
-			val user = dsender.getChromaUser();
-
-			for (User u : event.getMessage().getUserMentions().toIterable()) { //TODO: Role mentions
-				dmessage = dmessage.replace(u.getMention(), "@" + u.getUsername()); // TODO: IG Formatting
-				val m = u.asMember(DiscordPlugin.mainServer.getId()).onErrorResume(t -> Mono.empty()).blockOptional();
-				if (m.isPresent()) {
-					val mm = m.get();
-					final String nick = mm.getDisplayName();
-					dmessage = dmessage.replace(mm.getNicknameMention(), "@" + nick);
-				}
-			}
-			for (GuildChannel ch : event.getGuild().flux().flatMap(Guild::getChannels).toIterable()) {
-				dmessage = dmessage.replace(ch.getMention(), "#" + ch.getName()); // TODO: IG Formatting
-			}
-
-			dmessage = EmojiParser.parseToAliases(dmessage, EmojiParser.FitzpatrickAction.PARSE); //Converts emoji to text- TODO: Add option to disable (resource pack?)
-			dmessage = dmessage.replaceAll(":(\\S+)\\|type_(?:(\\d)|(1)_2):", ":$1::skin-tone-$2:"); //Convert to Discord's format so it still shows up
-
-			dmessage = dmessage.replaceAll("<a?:(\\S+):(\\d+)>", ":$1:"); //We don't need info about the custom emojis, just display their text
-
-			Function<String, String> getChatMessage = msg -> //
-				msg + (event.getMessage().getAttachments().size() > 0 ? "\n" + event.getMessage()
-					.getAttachments().stream().map(Attachment::getUrl).collect(Collectors.joining("\n"))
-					: "");
-
-			MCChatCustom.CustomLMD clmd = MCChatCustom.getCustomChat(event.getMessage().getChannelId());
-
-			boolean react = false;
-
-			val sendChannel = event.getMessage().getChannel().block();
-			boolean isPrivate = sendChannel instanceof PrivateChannel;
-			if (dmessage.startsWith("/")) { // Ingame command
-				if (!isPrivate)
-					event.getMessage().delete().subscribe();
-				final String cmd = dmessage.substring(1);
-				final String cmdlowercased = cmd.toLowerCase();
-				if (dsender instanceof DiscordSender && module.whitelistedCommands().get().stream()
-					.noneMatch(s -> cmdlowercased.equals(s) || cmdlowercased.startsWith(s + " "))) {
-					// Command not whitelisted
-					dsender.sendMessage("Sorry, you can only access these commands:\n"
-						+ module.whitelistedCommands().get().stream().map(uc -> "/" + uc)
-						.collect(Collectors.joining(", "))
-						+ (user.getConnectedID(TBMCPlayer.class) == null
-						? "\nTo access your commands, first please connect your accounts, using /connect in "
-						+ DPUtils.botmention()
-						+ "\nThen y"
-						: "\nY")
-						+ "ou can access all of your regular commands (even offline) in private chat: DM me `mcchat`!");
-					return;
-				}
-				val ev = new TBMCCommandPreprocessEvent(dsender, dmessage);
-				Bukkit.getScheduler().runTask(DiscordPlugin.plugin, () ->
-					Bukkit.getPluginManager().callEvent(ev));
-				if (ev.isCancelled())
-					return;
-				int spi = cmdlowercased.indexOf(' ');
-				final String topcmd = spi == -1 ? cmdlowercased : cmdlowercased.substring(0, spi);
-				Optional<Channel> ch = Channel.getChannels()
-					.filter(c -> c.ID.equalsIgnoreCase(topcmd)
-						|| (c.IDs().get().length > 0
-						&& Arrays.stream(c.IDs().get()).anyMatch(id -> id.equalsIgnoreCase(topcmd)))).findAny();
-				if (!ch.isPresent()) //TODO: What if talking in the public chat while we have it on a different one
-					Bukkit.getScheduler().runTask(DiscordPlugin.plugin, //Commands need to be run sync
-						() -> { //TODO: Better handling...
-							val channel = user.channel();
-							val chtmp = channel.get();
-							if (clmd != null) {
-								channel.set(clmd.mcchannel); //Hack to send command in the channel
-							} //TODO: Permcheck isn't implemented for commands
-							try {
-								String mcpackage = Bukkit.getServer().getClass().getPackage().getName();
-								if (mcpackage.contains("1_12"))
-									VanillaCommandListener.runBukkitOrVanillaCommand(dsender, cmd);
-								else if (mcpackage.contains("1_14"))
-									VanillaCommandListener14.runBukkitOrVanillaCommand(dsender, cmd);
-								else
-									Bukkit.dispatchCommand(dsender, cmd);
-							} catch (NoClassDefFoundError e) {
-								TBMCCoreAPI.SendException("A class is not found when trying to run command " + cmd + "!", e);
-							}
-							Bukkit.getLogger().info(dsender.getName() + " issued command from Discord: /" + cmd);
-							if (clmd != null)
-								channel.set(chtmp);
-						});
-				else {
-					Channel chc = ch.get();
-					if (!chc.isGlobal() && !isPrivate)
-						dsender.sendMessage(
-							"You can only talk in a public chat here. DM `mcchat` to enable private chat to talk in the other channels.");
-					else {
-						if (spi == -1) // Switch channels
-						{
-							val channel = dsender.getChromaUser().channel();
-							val oldch = channel.get();
-							if (oldch instanceof ChatRoom)
-								((ChatRoom) oldch).leaveRoom(dsender);
-							if (!oldch.ID.equals(chc.ID)) {
-								channel.set(chc);
-								if (chc instanceof ChatRoom)
-									((ChatRoom) chc).joinRoom(dsender);
-							} else
-								channel.set(Channel.GlobalChat);
-							dsender.sendMessage("You're now talking in: "
-								+ DPUtils.sanitizeString(channel.get().DisplayName().get()));
-						} else { // Send single message
-							final String msg = cmd.substring(spi + 1);
-							val cmb = ChatMessage.builder(dsender, user, getChatMessage.apply(msg)).fromCommand(true);
-							if (clmd == null)
-								TBMCChatAPI.SendChatMessage(cmb.build(), chc);
-							else
-								TBMCChatAPI.SendChatMessage(cmb.permCheck(clmd.dcp).build(), chc);
-							react = true;
-						}
-					}
-				}
-			} else {// Not a command
-				if (dmessage.length() == 0 && event.getMessage().getAttachments().size() == 0
-					&& !isPrivate && event.getMessage().getType() == Message.Type.CHANNEL_PINNED_MESSAGE) {
-					val rtr = clmd != null ? clmd.mcchannel.getRTR(clmd.dcp)
-						: dsender.getChromaUser().channel().get().getRTR(dsender);
-					TBMCChatAPI.SendSystemMessage(clmd != null ? clmd.mcchannel : dsender.getChromaUser().channel().get(), rtr,
-						(dsender instanceof Player ? ((Player) dsender).getDisplayName()
-							: dsender.getName()) + " pinned a message on Discord.", TBMCSystemChatEvent.BroadcastTarget.ALL);
-				} else {
-					val cmb = ChatMessage.builder(dsender, user, getChatMessage.apply(dmessage)).fromCommand(false);
-					if (clmd != null)
-						TBMCChatAPI.SendChatMessage(cmb.permCheck(clmd.dcp).build(), clmd.mcchannel);
-					else
-						TBMCChatAPI.SendChatMessage(cmb.build());
-					react = true;
-				}
-			}
-			if (react) {
-				try {
-					val lmfd = MCChatUtils.lastmsgfromd.get(event.getMessage().getChannelId().asLong());
-					if (lmfd != null) {
-						lmfd.removeSelfReaction(DiscordPlugin.DELIVERED_REACTION).subscribe(); // Remove it no matter what, we know it's there 99.99% of the time
-					}
-				} catch (Exception e) {
-					TBMCCoreAPI.SendException("An error occured while removing reactions from chat!", e);
-				}
-				MCChatUtils.lastmsgfromd.put(event.getMessage().getChannelId().asLong(), event.getMessage());
-				event.getMessage().addReaction(DiscordPlugin.DELIVERED_REACTION).subscribe();
-			}
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("An error occured while handling message \"" + dmessage + "\"!", e);
-		}
-	}
-
-	@FunctionalInterface
-	private interface InterruptibleConsumer<T> {
-		void accept(T value) throws TimeoutException, InterruptedException;
-	}
-}

src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java

@@ -1,67 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.lib.player.TBMCPlayer;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.PrivateChannel;
-import discord4j.core.object.entity.User;
-import lombok.val;
-import org.bukkit.Bukkit;
-
-import java.util.ArrayList;
-
-public class MCChatPrivate {
-
-	/**
-	 * Used for messages in PMs (mcchat).
-	 */
-	static ArrayList<MCChatUtils.LastMsgData> lastmsgPerUser = new ArrayList<>();
-
-	public static boolean privateMCChat(MessageChannel channel, boolean start, User user, DiscordPlayer dp) {
-		TBMCPlayer mcp = dp.getAs(TBMCPlayer.class);
-		if (mcp != null) { // If the accounts aren't connected, can't make a connected sender
-			val p = Bukkit.getPlayer(mcp.getUUID());
-			val op = Bukkit.getOfflinePlayer(mcp.getUUID());
-			val mcm = ComponentManager.getIfEnabled(MinecraftChatModule.class);
-			if (start) {
-				val sender = DiscordConnectedPlayer.create(user, channel, mcp.getUUID(), op.getName(), mcm);
-				MCChatUtils.addSender(MCChatUtils.ConnectedSenders, user, sender);
-				if (p == null)// Player is offline - If the player is online, that takes precedence
-					MCChatUtils.callLoginEvents(sender);
-			} else {
-				val sender = MCChatUtils.removeSender(MCChatUtils.ConnectedSenders, channel.getId(), user);
-				assert sender != null;
-				if (p == null // Player is offline - If the player is online, that takes precedence
-					&& sender.isLoggedIn()) //Don't call the quit event if login failed
-					MCChatUtils.callLogoutEvent(sender, true);
-				sender.setLoggedIn(false);
-			}
-		} // ---- PermissionsEx warning is normal on logout ----
-		if (!start)
-			MCChatUtils.lastmsgfromd.remove(channel.getId().asLong());
-		return start //
-			? lastmsgPerUser.add(new MCChatUtils.LastMsgData(channel, user)) // Doesn't support group DMs
-			: lastmsgPerUser.removeIf(lmd -> lmd.channel.getId().asLong() == channel.getId().asLong());
-	}
-
-	public static boolean isMinecraftChatEnabled(DiscordPlayer dp) {
-		return isMinecraftChatEnabled(dp.getDiscordID());
-	}
-
-	public static boolean isMinecraftChatEnabled(String did) { // Don't load the player data just for this
-		return lastmsgPerUser.stream()
-			.anyMatch(lmd -> ((PrivateChannel) lmd.channel)
-				.getRecipientIds().stream().anyMatch(u -> u.asString().equals(did)));
-	}
-
-	public static void logoutAll() {
-		for (val entry : MCChatUtils.ConnectedSenders.entrySet())
-			for (val valueEntry : entry.getValue().entrySet())
-				if (MCChatUtils.getSender(MCChatUtils.OnlineSenders, valueEntry.getKey(), valueEntry.getValue().getUser()) == null) //If the player is online then the fake player was already logged out
-					MCChatUtils.callLogoutEvent(valueEntry.getValue(), false); //This is sync
-		MCChatUtils.ConnectedSenders.clear();
-	}
-
-}

src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java

@@ -1,387 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.core.MainPlugin;
-import buttondevteam.discordplugin.*;
-import buttondevteam.discordplugin.broadcaster.GeneralEventBroadcasterModule;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import com.google.common.collect.Sets;
-import discord4j.core.object.entity.*;
-import discord4j.core.object.util.Snowflake;
-import io.netty.util.collection.LongObjectHashMap;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.plugin.AuthorNagException;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredListener;
-import reactor.core.publisher.Mono;
-
-import javax.annotation.Nullable;
-import java.net.InetAddress;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class MCChatUtils {
-	/**
-	 * May contain P<DiscordID> as key for public chat
-	 */
-	public static final HashMap<String, HashMap<Snowflake, DiscordSender>> UnconnectedSenders = new HashMap<>();
-	public static final HashMap<String, HashMap<Snowflake, DiscordConnectedPlayer>> ConnectedSenders = new HashMap<>();
-	/**
-	 * May contain P&lt;DiscordID&gt; as key for public chat
-	 */
-	public static final HashMap<String, HashMap<Snowflake, DiscordPlayerSender>> OnlineSenders = new HashMap<>();
-	static @Nullable LastMsgData lastmsgdata;
-	static LongObjectHashMap<Message> lastmsgfromd = new LongObjectHashMap<>(); // Last message sent by a Discord user, used for clearing checkmarks
-	private static MinecraftChatModule module;
-	private static HashMap<Class<? extends Event>, HashSet<String>> staticExcludedPlugins = new HashMap<>();
-
-	public static void updatePlayerList() {
-		val mod = getModule();
-		if (mod == null || !mod.showPlayerListOnDC().get()) return;
-		if (lastmsgdata != null)
-			updatePL(lastmsgdata);
-		MCChatCustom.lastmsgCustom.forEach(MCChatUtils::updatePL);
-	}
-
-	private static boolean notEnabled() {
-		return getModule() == null;
-	}
-
-	private static MinecraftChatModule getModule() {
-		if (module == null) module = ComponentManager.getIfEnabled(MinecraftChatModule.class);
-		else if (!module.isEnabled()) module = null; //Reset if disabled
-		return module;
-	}
-
-	private static void updatePL(LastMsgData lmd) {
-		if (!(lmd.channel instanceof TextChannel)) {
-			TBMCCoreAPI.SendException("Failed to update player list for channel " + lmd.channel.getId(),
-				new Exception("The channel isn't a (guild) text channel."));
-			return;
-		}
-		String topic = ((TextChannel) lmd.channel).getTopic().orElse("");
-		if (topic.length() == 0)
-			topic = ".\n----\nMinecraft chat\n----\n.";
-		String[] s = topic.split("\\n----\\n");
-		if (s.length < 3)
-			return;
-		String gid;
-		if (lmd instanceof MCChatCustom.CustomLMD)
-			gid = ((MCChatCustom.CustomLMD) lmd).groupID;
-		else //If we're not using a custom chat then it's either can ("everyone") or can't (null) see at most
-			gid = buttondevteam.core.component.channel.Channel.GROUP_EVERYONE; // (Though it's a public chat then rn)
-		AtomicInteger C = new AtomicInteger();
-		s[s.length - 1] = "Players: " + Bukkit.getOnlinePlayers().stream()
-			.filter(p -> gid.equals(lmd.mcchannel.getGroupID(p))) //If they can see it
-			.filter(MCChatUtils::checkEssentials)
-			.filter(p -> C.incrementAndGet() > 0) //Always true
-			.map(p -> DPUtils.sanitizeString(p.getDisplayName())).collect(Collectors.joining(", "));
-		s[0] = C + " player" + (C.get() != 1 ? "s" : "") + " online";
-		((TextChannel) lmd.channel).edit(tce -> tce.setTopic(String.join("\n----\n", s)).setReason("Player list update")).subscribe(); //Don't wait
-	}
-
-	private static boolean checkEssentials(Player p) {
-		var ess = MainPlugin.ess;
-		if (ess == null) return true;
-		return !ess.getUser(p).isHidden();
-	}
-
-	public static <T extends DiscordSenderBase> T addSender(HashMap<String, HashMap<Snowflake, T>> senders,
-	                                                        User user, T sender) {
-		return addSender(senders, user.getId().asString(), sender);
-	}
-
-	public static <T extends DiscordSenderBase> T addSender(HashMap<String, HashMap<Snowflake, T>> senders,
-	                                                        String did, T sender) {
-		var map = senders.get(did);
-		if (map == null)
-			map = new HashMap<>();
-		map.put(sender.getChannel().getId(), sender);
-		senders.put(did, map);
-		return sender;
-	}
-
-	public static <T extends DiscordSenderBase> T getSender(HashMap<String, HashMap<Snowflake, T>> senders,
-	                                                        Snowflake channel, User user) {
-		var map = senders.get(user.getId().asString());
-		if (map != null)
-			return map.get(channel);
-		return null;
-	}
-
-	public static <T extends DiscordSenderBase> T removeSender(HashMap<String, HashMap<Snowflake, T>> senders,
-	                                                           Snowflake channel, User user) {
-		var map = senders.get(user.getId().asString());
-		if (map != null)
-			return map.remove(channel);
-		return null;
-	}
-
-	public static void forAllMCChat(Consumer<Mono<MessageChannel>> action) {
-		if (notEnabled()) return;
-		action.accept(module.chatChannelMono());
-		for (LastMsgData data : MCChatPrivate.lastmsgPerUser)
-			action.accept(Mono.just(data.channel));
-		// lastmsgCustom.forEach(cc -> action.accept(cc.channel)); - Only send relevant messages to custom chat
-	}
-
-	/**
-	 * For custom and all MC chat
-	 *
-	 * @param action  The action to act
-	 * @param toggle  The toggle to check
-	 * @param hookmsg Whether the message is also sent from the hook
-	 */
-	public static void forCustomAndAllMCChat(Consumer<Mono<MessageChannel>> action, @Nullable ChannelconBroadcast toggle, boolean hookmsg) {
-		if (notEnabled()) return;
-		if (!GeneralEventBroadcasterModule.isHooked() || !hookmsg)
-			forAllMCChat(action);
-		final Consumer<MCChatCustom.CustomLMD> customLMDConsumer = cc -> action.accept(Mono.just(cc.channel));
-		if (toggle == null)
-			MCChatCustom.lastmsgCustom.forEach(customLMDConsumer);
-		else
-			MCChatCustom.lastmsgCustom.stream().filter(cc -> (cc.toggles & toggle.flag) != 0).forEach(customLMDConsumer);
-	}
-
-	/**
-	 * Do the {@code action} for each custom chat the {@code sender} have access to and has that broadcast type enabled.
-	 *
-	 * @param action The action to do
-	 * @param sender The sender to check perms of or null to send to all that has it toggled
-	 * @param toggle The toggle to check or null to send to all allowed
-	 */
-	public static void forAllowedCustomMCChat(Consumer<Mono<MessageChannel>> action, @Nullable CommandSender sender, @Nullable ChannelconBroadcast toggle) {
-		if (notEnabled()) return;
-		MCChatCustom.lastmsgCustom.stream().filter(clmd -> {
-			//new TBMCChannelConnectFakeEvent(sender, clmd.mcchannel).shouldSendTo(clmd.dcp) - Thought it was this simple hehe - Wait, it *should* be this simple
-			if (toggle != null && (clmd.toggles & toggle.flag) == 0)
-				return false; //If null then allow
-			if (sender == null)
-				return true;
-			return clmd.groupID.equals(clmd.mcchannel.getGroupID(sender));
-		}).forEach(cc -> action.accept(Mono.just(cc.channel))); //TODO: Send error messages on channel connect
-	}
-
-	/**
-	 * Do the {@code action} for each custom chat the {@code sender} have access to and has that broadcast type enabled.
-	 *
-	 * @param action  The action to do
-	 * @param sender  The sender to check perms of or null to send to all that has it toggled
-	 * @param toggle  The toggle to check or null to send to all allowed
-	 * @param hookmsg Whether the message is also sent from the hook
-	 */
-	public static void forAllowedCustomAndAllMCChat(Consumer<Mono<MessageChannel>> action, @Nullable CommandSender sender, @Nullable ChannelconBroadcast toggle, boolean hookmsg) {
-		if (notEnabled()) return;
-		if (!GeneralEventBroadcasterModule.isHooked() || !hookmsg)
-			forAllMCChat(action);
-		forAllowedCustomMCChat(action, sender, toggle);
-	}
-
-	public static Consumer<Mono<MessageChannel>> send(String message) {
-		return ch -> ch.flatMap(mc -> {
-			resetLastMessage(mc);
-			return mc.createMessage(DPUtils.sanitizeString(message));
-		}).subscribe();
-	}
-
-	public static void forAllowedMCChat(Consumer<Mono<MessageChannel>> action, TBMCSystemChatEvent event) {
-		if (notEnabled()) return;
-		if (event.getChannel().isGlobal())
-			action.accept(module.chatChannelMono());
-		for (LastMsgData data : MCChatPrivate.lastmsgPerUser)
-			if (event.shouldSendTo(getSender(data.channel.getId(), data.user)))
-				action.accept(Mono.just(data.channel)); //TODO: Only store ID?
-		MCChatCustom.lastmsgCustom.stream().filter(clmd -> {
-			if (!clmd.brtoggles.contains(event.getTarget()))
-				return false;
-			return event.shouldSendTo(clmd.dcp);
-		}).map(clmd -> Mono.just(clmd.channel)).forEach(action);
-	}
-
-	/**
-	 * This method will find the best sender to use: if the player is online, use that, if not but connected then use that etc.
-	 */
-	static DiscordSenderBase getSender(Snowflake channel, final User author) {
-		//noinspection OptionalGetWithoutIsPresent
-		return Stream.<Supplier<Optional<DiscordSenderBase>>>of( // https://stackoverflow.com/a/28833677/2703239
-			() -> Optional.ofNullable(getSender(OnlineSenders, channel, author)), // Find first non-null
-			() -> Optional.ofNullable(getSender(ConnectedSenders, channel, author)), // This doesn't support the public chat, but it'll always return null for it
-			() -> Optional.ofNullable(getSender(UnconnectedSenders, channel, author)), //
-			() -> Optional.of(addSender(UnconnectedSenders, author,
-				new DiscordSender(author, (MessageChannel) DiscordPlugin.dc.getChannelById(channel).block())))).map(Supplier::get).filter(Optional::isPresent).map(Optional::get).findFirst().get();
-	}
-
-	/**
-	 * Resets the last message, so it will start a new one instead of appending to it.
-	 * This is used when someone (even the bot) sends a message to the channel.
-	 *
-	 * @param channel The channel to reset in - the process is slightly different for the public, private and custom chats
-	 */
-	public static void resetLastMessage(Channel channel) {
-		if (notEnabled()) return;
-		if (channel.getId().asLong() == module.chatChannel().get().asLong()) {
-			(lastmsgdata == null ? lastmsgdata = new LastMsgData(module.chatChannelMono().block(), null)
-				: lastmsgdata).message = null;
-			return;
-		} // Don't set the whole object to null, the player and channel information should be preserved
-		for (LastMsgData data : channel instanceof PrivateChannel ? MCChatPrivate.lastmsgPerUser : MCChatCustom.lastmsgCustom) {
-			if (data.channel.getId().asLong() == channel.getId().asLong()) {
-				data.message = null;
-				return;
-			}
-		}
-		//If it gets here, it's sending a message to a non-chat channel
-	}
-
-	public static void addStaticExcludedPlugin(Class<? extends Event> event, String plugin) {
-		staticExcludedPlugins.compute(event, (e, hs) -> hs == null
-			? Sets.newHashSet(plugin)
-			: (hs.add(plugin) ? hs : hs));
-	}
-
-	public static void callEventExcludingSome(Event event) {
-		if (notEnabled()) return;
-		val second = staticExcludedPlugins.get(event.getClass());
-		String[] first = module.excludedPlugins().get();
-		String[] both = second == null ? first
-			: Arrays.copyOf(first, first.length + second.size());
-		int i = first.length;
-		if (second != null)
-			for (String plugin : second)
-				both[i++] = plugin;
-		callEventExcluding(event, false, both);
-	}
-
-	/**
-	 * Calls an event with the given details.
-	 * <p>
-	 * This method only synchronizes when the event is not asynchronous.
-	 *
-	 * @param event   Event details
-	 * @param only    Flips the operation and <b>includes</b> the listed plugins
-	 * @param plugins The plugins to exclude. Not case sensitive.
-	 */
-	@SuppressWarnings("WeakerAccess")
-	public static void callEventExcluding(Event event, boolean only, String... plugins) { // Copied from Spigot-API and modified a bit
-		if (event.isAsynchronous()) {
-			if (Thread.holdsLock(Bukkit.getPluginManager())) {
-				throw new IllegalStateException(
-					event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.");
-			}
-			if (Bukkit.getServer().isPrimaryThread()) {
-				throw new IllegalStateException(
-					event.getEventName() + " cannot be triggered asynchronously from primary server thread.");
-			}
-			fireEventExcluding(event, only, plugins);
-		} else {
-			synchronized (Bukkit.getPluginManager()) {
-				fireEventExcluding(event, only, plugins);
-			}
-		}
-	}
-
-	private static void fireEventExcluding(Event event, boolean only, String... plugins) {
-		HandlerList handlers = event.getHandlers(); // Code taken from SimplePluginManager in Spigot-API
-		RegisteredListener[] listeners = handlers.getRegisteredListeners();
-		val server = Bukkit.getServer();
-
-		for (RegisteredListener registration : listeners) {
-			if (!registration.getPlugin().isEnabled()
-				|| Arrays.stream(plugins).anyMatch(p -> only ^ p.equalsIgnoreCase(registration.getPlugin().getName())))
-				continue; // Modified to exclude plugins
-
-			try {
-				registration.callEvent(event);
-			} catch (AuthorNagException ex) {
-				Plugin plugin = registration.getPlugin();
-
-				if (plugin.isNaggable()) {
-					plugin.setNaggable(false);
-
-					server.getLogger().log(Level.SEVERE,
-						String.format("Nag author(s): '%s' of '%s' about the following: %s",
-							plugin.getDescription().getAuthors(), plugin.getDescription().getFullName(),
-							ex.getMessage()));
-				}
-			} catch (Throwable ex) {
-				server.getLogger().log(Level.SEVERE, "Could not pass event " + event.getEventName() + " to "
-					+ registration.getPlugin().getDescription().getFullName(), ex);
-			}
-		}
-	}
-
-	/**
-	 * Call it from an async thread.
-	 */
-	public static void callLoginEvents(DiscordConnectedPlayer dcp) {
-		Consumer<Supplier<String>> loginFail = kickMsg -> {
-			dcp.sendMessage("Minecraft chat disabled, as the login failed: " + kickMsg.get());
-			MCChatPrivate.privateMCChat(dcp.getChannel(), false, dcp.getUser(), dcp.getChromaUser());
-		}; //Probably also happens if the user is banned or so
-		val event = new AsyncPlayerPreLoginEvent(dcp.getName(), InetAddress.getLoopbackAddress(), dcp.getUniqueId());
-		callEventExcludingSome(event);
-		if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
-			loginFail.accept(event::getKickMessage);
-			return;
-		}
-		Bukkit.getScheduler().runTask(DiscordPlugin.plugin, () -> {
-			val ev = new PlayerLoginEvent(dcp, "localhost", InetAddress.getLoopbackAddress());
-			callEventExcludingSome(ev);
-			if (ev.getResult() != PlayerLoginEvent.Result.ALLOWED) {
-				loginFail.accept(ev::getKickMessage);
-				return;
-			}
-			callEventExcludingSome(new PlayerJoinEvent(dcp, ""));
-			dcp.setLoggedIn(true);
-			DPUtils.getLogger().info(dcp.getName() + " (" + dcp.getUniqueId() + ") logged in from Discord");
-		});
-	}
-
-	/**
-	 * Only calls the events if the player is actually logged in
-	 *
-	 * @param dcp       The player
-	 * @param needsSync Whether we're in an async thread
-	 */
-	public static void callLogoutEvent(DiscordConnectedPlayer dcp, boolean needsSync) {
-		if (!dcp.isLoggedIn()) return;
-		val event = new PlayerQuitEvent(dcp, "");
-		if (needsSync) callEventSync(event);
-		else callEventExcludingSome(event);
-		dcp.setLoggedIn(false);
-		DPUtils.getLogger().info(dcp.getName() + " (" + dcp.getUniqueId() + ") logged out from Discord");
-	}
-
-	static void callEventSync(Event event) {
-		Bukkit.getScheduler().runTask(DiscordPlugin.plugin, () -> callEventExcludingSome(event));
-	}
-
-	@RequiredArgsConstructor
-	public static class LastMsgData {
-		public Message message;
-		public long time;
-		public String content;
-		public final MessageChannel channel;
-		public buttondevteam.core.component.channel.Channel mcchannel;
-		public final User user;
-	}
-}

src/main/java/buttondevteam/discordplugin/mcchat/MCListener.java

@@ -1,185 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.discordplugin.*;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.player.TBMCPlayer;
-import buttondevteam.lib.player.TBMCPlayerBase;
-import buttondevteam.lib.player.TBMCYEEHAWEvent;
-import com.earth2me.essentials.CommandSource;
-import discord4j.core.object.entity.Role;
-import discord4j.core.object.util.Snowflake;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import net.ess3.api.events.AfkStatusChangeEvent;
-import net.ess3.api.events.MuteStatusChangeEvent;
-import net.ess3.api.events.NickChangeEvent;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.*;
-import org.bukkit.event.player.PlayerLoginEvent.Result;
-import org.bukkit.event.server.BroadcastMessageEvent;
-import org.bukkit.event.server.TabCompleteEvent;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Optional;
-
-@RequiredArgsConstructor
-class MCListener implements Listener {
-	private final MinecraftChatModule module;
-
-	@EventHandler(priority = EventPriority.HIGHEST)
-	public void onPlayerLogin(PlayerLoginEvent e) {
-		if (e.getResult() != Result.ALLOWED)
-			return;
-		if (e.getPlayer() instanceof DiscordConnectedPlayer)
-			return;
-		MCChatUtils.ConnectedSenders.values().stream().flatMap(v -> v.values().stream()) //Only private mcchat should be in ConnectedSenders
-			.filter(s -> s.getUniqueId().equals(e.getPlayer().getUniqueId())).findAny()
-			.ifPresent(dcp -> MCChatUtils.callLogoutEvent(dcp, false));
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerJoin(PlayerJoinEvent e) {
-		if (e.getPlayer() instanceof DiscordConnectedPlayer)
-			return; // Don't show the joined message for the fake player
-		Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, () -> {
-			final Player p = e.getPlayer();
-			DiscordPlayer dp = TBMCPlayerBase.getPlayer(p.getUniqueId(), TBMCPlayer.class).getAs(DiscordPlayer.class);
-			if (dp != null) {
-				DiscordPlugin.dc.getUserById(Snowflake.of(dp.getDiscordID())).flatMap(user -> user.getPrivateChannel().flatMap(chan -> module.chatChannelMono().flatMap(cc -> {
-					MCChatUtils.addSender(MCChatUtils.OnlineSenders, dp.getDiscordID(),
-						new DiscordPlayerSender(user, chan, p));
-					MCChatUtils.addSender(MCChatUtils.OnlineSenders, dp.getDiscordID(),
-						new DiscordPlayerSender(user, cc, p)); //Stored per-channel
-					return Mono.empty();
-				}))).subscribe();
-			}
-			final String message = e.getJoinMessage();
-			if (message != null && message.trim().length() > 0)
-				MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(message), e.getPlayer(), ChannelconBroadcast.JOINLEAVE, true);
-			ChromaBot.getInstance().updatePlayerList();
-		});
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerLeave(PlayerQuitEvent e) {
-		if (e.getPlayer() instanceof DiscordConnectedPlayer)
-			return; // Only care about real users
-		MCChatUtils.OnlineSenders.entrySet()
-			.removeIf(entry -> entry.getValue().entrySet().stream().anyMatch(p -> p.getValue().getUniqueId().equals(e.getPlayer().getUniqueId())));
-		Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin,
-			() -> MCChatUtils.ConnectedSenders.values().stream().flatMap(v -> v.values().stream())
-				.filter(s -> s.getUniqueId().equals(e.getPlayer().getUniqueId())).findAny()
-				.ifPresent(MCChatUtils::callLoginEvents));
-		Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin,
-			ChromaBot.getInstance()::updatePlayerList, 5);
-		final String message = e.getQuitMessage();
-		if (message != null && message.trim().length() > 0)
-			MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(message), e.getPlayer(), ChannelconBroadcast.JOINLEAVE, true);
-	}
-
-	@EventHandler(priority = EventPriority.HIGHEST)
-	public void onPlayerKick(PlayerKickEvent e) {
-        /*if (!DiscordPlugin.hooked && !e.getReason().equals("The server is restarting")
-                && !e.getReason().equals("Server closed")) // The leave messages errored with the previous setup, I could make it wait since I moved it here, but instead I have a special
-            MCChatListener.forAllowedCustomAndAllMCChat(e.getPlayer().getName() + " left the game"); // message for this - Oh wait this doesn't even send normally because of the hook*/
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerDeath(PlayerDeathEvent e) {
-		MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(e.getDeathMessage()), e.getEntity(), ChannelconBroadcast.DEATH, true);
-	}
-
-	@EventHandler
-	public void onPlayerAFK(AfkStatusChangeEvent e) {
-		final Player base = e.getAffected().getBase();
-		if (e.isCancelled() || !base.isOnline())
-			return;
-		final String msg = base.getDisplayName()
-			+ " is " + (e.getValue() ? "now" : "no longer") + " AFK.";
-		MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(msg), base, ChannelconBroadcast.AFK, false);
-	}
-
-	private ConfigData<Mono<Role>> muteRole() {
-		return DPUtils.roleData(module.getConfig(), "muteRole", "Muted");
-	}
-
-	@EventHandler
-	public void onPlayerMute(MuteStatusChangeEvent e) {
-		final Mono<Role> role = muteRole().get();
-		if (role == null) return;
-		final CommandSource source = e.getAffected().getSource();
-		if (!source.isPlayer())
-			return;
-		final DiscordPlayer p = TBMCPlayerBase.getPlayer(source.getPlayer().getUniqueId(), TBMCPlayer.class)
-			.getAs(DiscordPlayer.class);
-		if (p == null) return;
-		DPUtils.ignoreError(DiscordPlugin.dc.getUserById(Snowflake.of(p.getDiscordID()))
-			.flatMap(user -> user.asMember(DiscordPlugin.mainServer.getId()))
-			.flatMap(user -> role.flatMap(r -> {
-				if (e.getValue())
-					user.addRole(r.getId());
-				else
-					user.removeRole(r.getId());
-				val modlog = module.modlogChannel().get();
-				String msg = (e.getValue() ? "M" : "Unm") + "uted user: " + user.getUsername() + "#" + user.getDiscriminator();
-				DPUtils.getLogger().info(msg);
-				if (modlog != null)
-					return modlog.flatMap(ch -> ch.createMessage(msg));
-				return Mono.empty();
-			}))).subscribe();
-	}
-
-	@EventHandler
-	public void onChatSystemMessage(TBMCSystemChatEvent event) {
-		MCChatUtils.forAllowedMCChat(MCChatUtils.send(event.getMessage()), event);
-	}
-
-	@EventHandler
-	public void onBroadcastMessage(BroadcastMessageEvent event) {
-		MCChatUtils.forCustomAndAllMCChat(MCChatUtils.send(event.getMessage()), ChannelconBroadcast.BROADCAST, false);
-	}
-
-	@EventHandler
-	public void onYEEHAW(TBMCYEEHAWEvent event) { //TODO: Inherit from the chat event base to have channel support
-		String name = event.getSender() instanceof Player ? ((Player) event.getSender()).getDisplayName()
-			: event.getSender().getName();
-		//Channel channel = ChromaGamerBase.getFromSender(event.getSender()).channel().get(); - TODO
-		DiscordPlugin.mainServer.getEmojis().filter(e -> "YEEHAW".equals(e.getName()))
-			.take(1).singleOrEmpty().map(Optional::of).defaultIfEmpty(Optional.empty()).subscribe(yeehaw ->
-			MCChatUtils.forAllMCChat(MCChatUtils.send(name + (yeehaw.map(guildEmoji -> " <:YEEHAW:" + guildEmoji.getId().asString() + ">s").orElse(" YEEHAWs")))));
-	}
-
-	@EventHandler
-	public void onNickChange(NickChangeEvent event) {
-		MCChatUtils.updatePlayerList();
-	}
-
-	@EventHandler
-	public void onTabComplete(TabCompleteEvent event) {
-		int i = event.getBuffer().lastIndexOf(' ');
-		String t = event.getBuffer().substring(i + 1); //0 if not found
-		//System.out.println("Last token: " + t);
-		if (!t.startsWith("@"))
-			return;
-		String token = t.substring(1);
-		//System.out.println("Token: " + token);
-		val x = DiscordPlugin.mainServer.getMembers()
-			.flatMap(m -> Flux.just(m.getUsername(), m.getNickname().orElse("")))
-			.filter(s -> s.startsWith(token))
-			.map(s -> "@" + s)
-			.doOnNext(event.getCompletions()::add).blockLast();
-		//System.out.println("Finished - last: " + x);
-	}
-
-	@EventHandler
-	public void onCommandSend(PlayerCommandSendEvent event) {
-		event.getCommands().add("g");
-	}
-}

src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java

@@ -1,170 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.MainPlugin;
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.playerfaker.perm.LPInjector;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import com.google.common.collect.Lists;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.util.Snowflake;
-import lombok.Getter;
-import lombok.val;
-import org.bukkit.Bukkit;
-import reactor.core.publisher.Mono;
-
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-/**
- * Provides Minecraft chat connection to Discord. Commands may be used either in a public chat (limited) or in a DM.
- */
-public class MinecraftChatModule extends Component<DiscordPlugin> {
-	private @Getter MCChatListener listener;
-
-	/**
-	 * A list of commands that can be used in public chats - Warning: Some plugins will treat players as OPs, always test before allowing a command!
-	 */
-	public ConfigData<ArrayList<String>> whitelistedCommands() {
-		return getConfig().getData("whitelistedCommands", () -> Lists.newArrayList("list", "u", "shrug", "tableflip", "unflip", "mwiki",
-			"yeehaw", "lenny", "rp", "plugins"));
-	}
-
-	/**
-	 * The channel to use as the public Minecraft chat - everything public gets broadcasted here
-	 */
-	public ReadOnlyConfigData<Snowflake> chatChannel() {
-		return DPUtils.snowflakeData(getConfig(), "chatChannel", 0L);
-	}
-
-	public Mono<MessageChannel> chatChannelMono() {
-		return DPUtils.getMessageChannel(chatChannel().getPath(), chatChannel().get());
-	}
-
-	/**
-	 * The channel where the plugin can log when it mutes a player on Discord because of a Minecraft mute
-	 */
-	public ReadOnlyConfigData<Mono<MessageChannel>> modlogChannel() {
-		return DPUtils.channelData(getConfig(), "modlogChannel");
-	}
-
-	/**
-	 * The plugins to exclude from fake player events used for the 'mcchat' command - some plugins may crash, add them here
-	 */
-	public ConfigData<String[]> excludedPlugins() {
-		return getConfig().getData("excludedPlugins", new String[]{"ProtocolLib", "LibsDisguises", "JourneyMapServer"});
-	}
-
-	/**
-	 * If this setting is on then players logged in through the 'mcchat' command will be able to teleport using plugin commands.
-	 * They can then use commands like /tpahere to teleport others to that place.<br />
-	 * If this is off, then teleporting will have no effect.
-	 */
-	public ConfigData<Boolean> allowFakePlayerTeleports() {
-		return getConfig().getData("allowFakePlayerTeleports", false);
-	}
-
-	/**
-	 * If this is on, each chat channel will have a player list in their description.
-	 * It only gets added if there's no description yet or there are (at least) two lines of "----" following each other.
-	 * Note that it will replace <b>everything</b> between the first and last "----" but it will only detect exactly four dashes.
-	 * So if you want to use dashes for something else in the description, make sure it's either less or more dashes in one line.
-	 */
-	public ConfigData<Boolean> showPlayerListOnDC() {
-		return getConfig().getData("showPlayerListOnDC", true);
-	}
-
-	/**
-	 * This setting controls whether custom chat connections can be <i>created</i> (existing connections will always work).
-	 * Custom chat connections can be created using the channelcon command and they allow players to display town chat in a Discord channel for example.
-	 * See the channelcon command for more details.
-	 */
-	public ConfigData<Boolean> allowCustomChat() {
-		return getConfig().getData("allowCustomChat", true);
-	}
-
-	/**
-	 * This setting allows you to control if players can DM the bot to log on the server from Discord.
-	 * This allows them to both chat and perform any command they can in-game.
-	 */
-	public ConfigData<Boolean> allowPrivateChat() {
-		return getConfig().getData("allowPrivateChat", true);
-	}
-
-	/**
-	 * If set, message authors appearing on Discord will link to this URL. A 'type' and 'id' parameter will be added with the user's platform (Discord, Minecraft, ...) and ID.
-	 */
-	public ConfigData<String> profileURL() {
-		return getConfig().getData("profileURL", "");
-	}
-
-	@Override
-	protected void enable() {
-		if (DPUtils.disableIfConfigErrorRes(this, chatChannel(), chatChannelMono()))
-			return;
-		/*clientID = DiscordPlugin.dc.getApplicationInfo().blockOptional().map(info->info.getId().asString())
-			.orElse("Unknown"); //Need to block because otherwise it may not be set in time*/
-		listener = new MCChatListener(this);
-		TBMCCoreAPI.RegisterEventsForExceptions(listener, getPlugin());
-		TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(this), getPlugin());//These get undone if restarting/resetting - it will ignore events if disabled
-		getPlugin().getManager().registerCommand(new MCChatCommand(this));
-		getPlugin().getManager().registerCommand(new ChannelconCommand(this));
-
-		val chcons = getConfig().getConfig().getConfigurationSection("chcons");
-		if (chcons == null) //Fallback to old place
-			getConfig().getConfig().getRoot().getConfigurationSection("chcons");
-		if (chcons != null) {
-			val chconkeys = chcons.getKeys(false);
-			for (val chconkey : chconkeys) {
-				val chcon = chcons.getConfigurationSection(chconkey);
-				val mcch = Channel.getChannels().filter(ch -> ch.ID.equals(chcon.getString("mcchid"))).findAny();
-				val ch = DiscordPlugin.dc.getChannelById(Snowflake.of(chcon.getLong("chid"))).block();
-				val did = chcon.getLong("did");
-				val user = DiscordPlugin.dc.getUserById(Snowflake.of(did)).block();
-				val groupid = chcon.getString("groupid");
-				val toggles = chcon.getInt("toggles");
-				val brtoggles = chcon.getStringList("brtoggles");
-				if (!mcch.isPresent() || ch == null || user == null || groupid == null)
-					continue;
-				Bukkit.getScheduler().runTask(getPlugin(), () -> { //<-- Needed because of occasional ConcurrentModificationExceptions when creating the player (PermissibleBase)
-					val dcp = DiscordConnectedPlayer.create(user, (MessageChannel) ch, UUID.fromString(chcon.getString("mcuid")), chcon.getString("mcname"), this);
-					MCChatCustom.addCustomChat((MessageChannel) ch, groupid, mcch.get(), user, dcp, toggles, brtoggles.stream().map(TBMCSystemChatEvent.BroadcastTarget::get).filter(Objects::nonNull).collect(Collectors.toSet()));
-				});
-			}
-		}
-
-		try {
-			new LPInjector(MainPlugin.Instance);
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Failed to init LuckPerms injector", e);
-		} catch (NoClassDefFoundError e) {
-			getPlugin().getLogger().info("No LuckPerms, not injecting");
-		}
-	}
-
-	@Override
-	protected void disable() {
-		val chcons = MCChatCustom.getCustomChats();
-		val chconsc = getConfig().getConfig().createSection("chcons");
-		for (val chcon : chcons) {
-			val chconc = chconsc.createSection(chcon.channel.getId().asString());
-			chconc.set("mcchid", chcon.mcchannel.ID);
-			chconc.set("chid", chcon.channel.getId().asLong());
-			chconc.set("did", chcon.user.getId().asLong());
-			chconc.set("mcuid", chcon.dcp.getUniqueId().toString());
-			chconc.set("mcname", chcon.dcp.getName());
-			chconc.set("groupid", chcon.groupID);
-			chconc.set("toggles", chcon.toggles);
-			chconc.set("brtoggles", chcon.brtoggles.stream().map(TBMCSystemChatEvent.BroadcastTarget::getName).collect(Collectors.toList()));
-		}
-		MCChatListener.stop(true);
-	}
-}

src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java

@@ -1,146 +0,0 @@
-package buttondevteam.discordplugin.mccommands;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.commands.ConnectCommand;
-import buttondevteam.discordplugin.commands.VersionCommand;
-import buttondevteam.discordplugin.mcchat.MCChatUtils;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.chat.ICommand2MC;
-import buttondevteam.lib.player.ChromaGamerBase;
-import buttondevteam.lib.player.TBMCPlayer;
-import buttondevteam.lib.player.TBMCPlayerBase;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import reactor.core.publisher.Mono;
-
-import java.lang.reflect.Method;
-
-@CommandClass(path = "discord", helpText = {
-	"Discord",
-	"This command allows performing Discord-related actions."
-})
-public class DiscordMCCommand extends ICommand2MC {
-	@Command2.Subcommand
-	public boolean accept(Player player) {
-		if (checkSafeMode(player)) return true;
-		String did = ConnectCommand.WaitingToConnect.get(player.getName());
-		if (did == null) {
-			player.sendMessage("§cYou don't have a pending connection to Discord.");
-			return true;
-		}
-		DiscordPlayer dp = ChromaGamerBase.getUser(did, DiscordPlayer.class);
-		TBMCPlayer mcp = TBMCPlayerBase.getPlayer(player.getUniqueId(), TBMCPlayer.class);
-		dp.connectWith(mcp);
-		dp.save();
-		mcp.save();
-		ConnectCommand.WaitingToConnect.remove(player.getName());
-		MCChatUtils.UnconnectedSenders.remove(did); //Remove all unconnected, will be recreated where needed
-		player.sendMessage("§bAccounts connected.");
-		return true;
-	}
-
-	@Command2.Subcommand
-	public boolean decline(Player player) {
-		if (checkSafeMode(player)) return true;
-		String did = ConnectCommand.WaitingToConnect.remove(player.getName());
-		if (did == null) {
-			player.sendMessage("§cYou don't have a pending connection to Discord.");
-			return true;
-		}
-		player.sendMessage("§bPending connection declined.");
-		return true;
-	}
-
-	@Command2.Subcommand(permGroup = Command2.Subcommand.MOD_GROUP, helpText = {
-		"Reload Discord plugin",
-		"Reloads the config. To apply some changes, you may need to also run /discord reset."
-	})
-	public void reload(CommandSender sender) {
-		if (DiscordPlugin.plugin.tryReloadConfig())
-			sender.sendMessage("§bConfig reloaded.");
-		else
-			sender.sendMessage("§cFailed to reload config.");
-	}
-
-	public static boolean resetting = false;
-
-	@Command2.Subcommand(permGroup = Command2.Subcommand.MOD_GROUP, helpText = {
-		"Reset ChromaBot", //
-		"This command disables and then enables the plugin." //
-	})
-	public void reset(CommandSender sender) {
-		Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, () -> {
-			if (!DiscordPlugin.plugin.tryReloadConfig()) {
-				sender.sendMessage("§cFailed to reload config so not resetting. Check the console.");
-				return;
-			}
-			resetting = true; //Turned off after sending enable message (ReadyEvent)
-			sender.sendMessage("§bDisabling DiscordPlugin...");
-			Bukkit.getPluginManager().disablePlugin(DiscordPlugin.plugin);
-			if (!(sender instanceof DiscordSenderBase)) //Sending to Discord errors
-				sender.sendMessage("§bEnabling DiscordPlugin...");
-			Bukkit.getPluginManager().enablePlugin(DiscordPlugin.plugin);
-			if (!(sender instanceof DiscordSenderBase)) //Sending to Discord errors
-				sender.sendMessage("§bReset finished!");
-		});
-	}
-
-	@Command2.Subcommand(helpText = {
-		"Version command",
-		"Prints the plugin version"
-	})
-	public void version(CommandSender sender) {
-		sender.sendMessage(VersionCommand.getVersion());
-	}
-
-	@Command2.Subcommand(helpText = {
-		"Invite",
-		"Shows an invite link to the server"
-	})
-	public void invite(CommandSender sender) {
-		if (checkSafeMode(sender)) return;
-		String invi = DiscordPlugin.plugin.inviteLink().get();
-		if (invi.length() > 0) {
-			sender.sendMessage("§bInvite link: " + invi);
-			return;
-		}
-		DiscordPlugin.mainServer.getInvites().limitRequest(1)
-			.switchIfEmpty(Mono.fromRunnable(() -> sender.sendMessage("§cNo invites found for the server.")))
-			.subscribe(inv -> {
-				sender.sendMessage("§bInvite link: https://discord.gg/" + inv.getCode());
-			}, e -> sender.sendMessage("§cThe invite link is not set and the bot has no permission to get it."));
-	}
-
-	@Override
-	public String[] getHelpText(Method method, Command2.Subcommand ann) {
-		switch (method.getName()) {
-			case "accept":
-				return new String[]{ //
-					"Accept Discord connection", //
-					"Accept a pending connection between your Discord and Minecraft account.", //
-					"To start the connection process, do §b/connect <MCname>§r in the " + DPUtils.botmention() + " channel on Discord", //
-				};
-			case "decline":
-				return new String[]{ //
-					"Decline Discord connection", //
-					"Decline a pending connection between your Discord and Minecraft account.", //
-					"To start the connection process, do §b/connect <MCname>§r in the " + DPUtils.botmention() + " channel on Discord", //
-				};
-			default:
-				return super.getHelpText(method, ann);
-		}
-	}
-
-	private boolean checkSafeMode(CommandSender sender) {
-		if (DiscordPlugin.SafeMode) {
-			sender.sendMessage("§cThe plugin isn't initialized. Check console for details.");
-			return true;
-		}
-		return false;
-	}
-}

src/main/java/buttondevteam/discordplugin/playerfaker/DiscordInventory.java

@@ -1,208 +0,0 @@
-package buttondevteam.discordplugin.playerfaker;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.*;
-import java.util.stream.IntStream;
-
-public class DiscordInventory implements Inventory {
-	private ItemStack[] items = new ItemStack[27];
-	private List<ItemStack> itemStacks = Arrays.asList(items);
-	@Getter
-	@Setter
-	public int maxStackSize;
-	private static ItemStack emptyStack = new ItemStack(Material.AIR, 0);
-
-	@Override
-	public int getSize() {
-		return items.length;
-	}
-
-	@Override
-	public String getName() {
-		return "Discord inventory";
-	}
-
-	@Override
-	public ItemStack getItem(int index) {
-		if (index >= items.length)
-			return emptyStack;
-		else
-			return items[index];
-	}
-
-	@Override
-	public void setItem(int index, ItemStack item) {
-		if (index < items.length)
-			items[index] = item;
-	}
-
-	@Override
-	public HashMap<Integer, ItemStack> addItem(ItemStack... items) throws IllegalArgumentException {
-		return IntStream.range(0, items.length).collect(HashMap::new, (map, i) -> map.put(i, items[i]), HashMap::putAll); //Pretend that we can't add anything
-	}
-
-	@Override
-	public HashMap<Integer, ItemStack> removeItem(ItemStack... items) throws IllegalArgumentException {
-		return IntStream.range(0, items.length).collect(HashMap::new, (map, i) -> map.put(i, items[i]), HashMap::putAll); //Pretend that we can't add anything
-	}
-
-	@Override
-	public ItemStack[] getContents() {
-		return items;
-	}
-
-	@Override
-	public void setContents(ItemStack[] items) throws IllegalArgumentException {
-		this.items = items;
-	}
-
-	@Override
-	public ItemStack[] getStorageContents() {
-		return items;
-	}
-
-	@Override
-	public void setStorageContents(ItemStack[] items) throws IllegalArgumentException {
-		this.items = items;
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public boolean contains(int materialId) {
-		return itemStacks.stream().anyMatch(is -> is.getType().getId() == materialId);
-	}
-
-	@Override
-	public boolean contains(Material material) throws IllegalArgumentException {
-		return itemStacks.stream().anyMatch(is -> is.getType() == material);
-	}
-
-	@Override
-	public boolean contains(ItemStack item) {
-		return itemStacks.stream().anyMatch(is -> is.getType() == item.getType() && is.getAmount() == item.getAmount());
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public boolean contains(int materialId, int amount) {
-		return itemStacks.stream().anyMatch(is -> is.getType().getId() == materialId && is.getAmount() == amount);
-	}
-
-	@Override
-	public boolean contains(Material material, int amount) throws IllegalArgumentException {
-		return itemStacks.stream().anyMatch(is -> is.getType() == material && is.getAmount() == amount);
-	}
-
-	@Override
-	public boolean contains(ItemStack item, int amount) { //Not correct implementation but whatever
-		return itemStacks.stream().anyMatch(is -> is.getType() == item.getType() && is.getAmount() == amount);
-	}
-
-	@Override
-	public boolean containsAtLeast(ItemStack item, int amount) {
-		return false;
-	}
-
-	@Override
-	public HashMap<Integer, ? extends ItemStack> all(int materialId) {
-		return new HashMap<>();
-	}
-
-	@Override
-	public HashMap<Integer, ? extends ItemStack> all(Material material) throws IllegalArgumentException {
-		return new HashMap<>();
-	}
-
-	@Override
-	public HashMap<Integer, ? extends ItemStack> all(ItemStack item) {
-		return new HashMap<>();
-	}
-
-	@Override
-	public int first(int materialId) {
-		return -1;
-	}
-
-	@Override
-	public int first(Material material) throws IllegalArgumentException {
-		return -1;
-	}
-
-	@Override
-	public int first(ItemStack item) {
-		return -1;
-	}
-
-	@Override
-	public int firstEmpty() {
-		return -1;
-	}
-
-	@Override
-	public void remove(int materialId) {
-	}
-
-	@Override
-	public void remove(Material material) throws IllegalArgumentException {
-	}
-
-	@Override
-	public void remove(ItemStack item) {
-	}
-
-	@Override
-	public void clear(int index) {
-		if (index < items.length)
-			items[index] = null;
-	}
-
-	@Override
-	public void clear() {
-		Arrays.fill(items, null);
-	}
-
-	@Override
-	public List<HumanEntity> getViewers() {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public String getTitle() {
-		return "Discord inventory";
-	}
-
-	@Override
-	public InventoryType getType() {
-		return InventoryType.CHEST;
-	}
-
-	@Override
-	public InventoryHolder getHolder() {
-		return null;
-	}
-
-	@SuppressWarnings("NullableProblems")
-	@Override
-	public ListIterator<ItemStack> iterator() {
-		return itemStacks.listIterator();
-	}
-
-	@Override
-	public ListIterator<ItemStack> iterator(int index) {
-		return itemStacks.listIterator(index);
-	}
-
-	@Override
-	public Location getLocation() {
-		return null;
-	}
-}

src/main/java/buttondevteam/discordplugin/playerfaker/VCMDWrapper.java

@@ -1,39 +0,0 @@
-package buttondevteam.discordplugin.playerfaker;
-
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.IMCPlayer;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-@RequiredArgsConstructor
-public class VCMDWrapper {
-	@Getter //Needed to mock the player
-	private final Object listener;
-
-	/**
-	 * This constructor will only send raw vanilla messages to the sender in plain text.
-	 *
-	 * @param player The Discord sender player (the wrapper)
-	 */
-	public static <T extends DiscordSenderBase & IMCPlayer<T>> Object createListener(T player) {
-		return createListener(player, null);
-	}
-
-	/**
-	 * This constructor will send both raw vanilla messages to the sender in plain text and forward the raw message to the provided player.
-	 *
-	 * @param player       The Discord sender player (the wrapper)
-	 * @param bukkitplayer The Bukkit player to send the raw message to
-	 */
-	public static <T extends DiscordSenderBase & IMCPlayer<T>> Object createListener(T player, Player bukkitplayer) {
-		String mcpackage = Bukkit.getServer().getClass().getPackage().getName();
-		if (mcpackage.contains("1_12"))
-			return bukkitplayer == null ? new VanillaCommandListener<>(player) : new VanillaCommandListener<>(player, bukkitplayer);
-		else if (mcpackage.contains("1_14"))
-			return bukkitplayer == null ? new VanillaCommandListener14<>(player) : new VanillaCommandListener14<>(player, bukkitplayer);
-		else
-			return null;
-	}
-}

src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java

@@ -1,103 +0,0 @@
-package buttondevteam.discordplugin.playerfaker;
-
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.IMCPlayer;
-import lombok.Getter;
-import lombok.val;
-import net.minecraft.server.v1_12_R1.*;
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_12_R1.command.VanillaCommandWrapper;
-import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-import java.util.Arrays;
-
-public class VanillaCommandListener<T extends DiscordSenderBase & IMCPlayer<T>> implements ICommandListener {
-	private @Getter T player;
-	private Player bukkitplayer;
-
-	/**
-	 * This constructor will only send raw vanilla messages to the sender in plain text.
-	 * 
-	 * @param player
-	 *            The Discord sender player (the wrapper)
-	 */
-	public VanillaCommandListener(T player) {
-		this.player = player;
-		this.bukkitplayer = null;
-	}
-
-	/**
-	 * This constructor will send both raw vanilla messages to the sender in plain text and forward the raw message to the provided player.
-	 * 
-	 * @param player
-	 *            The Discord sender player (the wrapper)
-	 * @param bukkitplayer
-	 *            The Bukkit player to send the raw message to
-	 */
-	public VanillaCommandListener(T player, Player bukkitplayer) {
-		this.player = player;
-		this.bukkitplayer = bukkitplayer;
-		if (!(bukkitplayer instanceof CraftPlayer))
-			throw new ClassCastException("bukkitplayer must be a Bukkit player!");
-	}
-
-	@Override
-	public MinecraftServer C_() {
-		return ((CraftServer) Bukkit.getServer()).getServer();
-	}
-
-	@Override
-	public boolean a(int oplevel, String cmd) {
-		// return oplevel <= 2; // Value from CommandBlockListenerAbstract, found what it is in EntityPlayer - Wait, that'd always allow OP commands
-		return oplevel == 0 || player.isOp();
-	}
-
-	@Override
-	public String getName() {
-		return player.getName();
-	}
-
-	@Override
-	public World getWorld() {
-		return ((CraftWorld) player.getWorld()).getHandle();
-	}
-
-	@Override
-	public void sendMessage(IChatBaseComponent arg0) {
-		player.sendMessage(arg0.toPlainText());
-		if (bukkitplayer != null)
-			((CraftPlayer) bukkitplayer).getHandle().sendMessage(arg0);
-	}
-
-	public static boolean runBukkitOrVanillaCommand(DiscordSenderBase dsender, String cmdstr) {
-		val cmd = ((CraftServer) Bukkit.getServer()).getCommandMap().getCommand(cmdstr.split(" ")[0].toLowerCase());
-		if (!(dsender instanceof Player) || !(cmd instanceof VanillaCommandWrapper))
-			return Bukkit.dispatchCommand(dsender, cmdstr); // Unconnected users are treated well in vanilla cmds
-
-		if (!(dsender instanceof IMCPlayer))
-			throw new ClassCastException(
-					"dsender needs to implement IMCPlayer to use vanilla commands as it implements Player.");
-
-		IMCPlayer<?> sender = (IMCPlayer<?>) dsender; // Don't use val on recursive interfaces :P
-
-		val vcmd = (VanillaCommandWrapper) cmd;
-		if (!vcmd.testPermission(sender))
-			return true;
-
-		ICommandListener icommandlistener = (ICommandListener) sender.getVanillaCmdListener().getListener();
-		String[] args = cmdstr.split(" ");
-		args = Arrays.copyOfRange(args, 1, args.length);
-		try {
-			vcmd.dispatchVanillaCommand(sender, icommandlistener, args);
-		} catch (CommandException commandexception) {
-			// Taken from CommandHandler
-			ChatMessage chatmessage = new ChatMessage(commandexception.getMessage(), commandexception.getArgs());
-			chatmessage.getChatModifier().setColor(EnumChatFormat.RED);
-			icommandlistener.sendMessage(chatmessage);
-		}
-		return true;
-	}
-}

src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java

@@ -1,106 +0,0 @@
-package buttondevteam.discordplugin.playerfaker;
-
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.IMCPlayer;
-import lombok.Getter;
-import lombok.val;
-import net.minecraft.server.v1_14_R1.*;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_14_R1.command.ProxiedNativeCommandSender;
-import org.bukkit.craftbukkit.v1_14_R1.command.VanillaCommandWrapper;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-import java.util.Arrays;
-
-public class VanillaCommandListener14<T extends DiscordSenderBase & IMCPlayer<T>> implements ICommandListener {
-	private @Getter T player;
-	private Player bukkitplayer;
-
-	/**
-	 * This constructor will only send raw vanilla messages to the sender in plain text.
-	 *
-	 * @param player The Discord sender player (the wrapper)
-	 */
-	public VanillaCommandListener14(T player) {
-		this.player = player;
-		this.bukkitplayer = null;
-	}
-
-	/**
-	 * This constructor will send both raw vanilla messages to the sender in plain text and forward the raw message to the provided player.
-	 *
-	 * @param player       The Discord sender player (the wrapper)
-	 * @param bukkitplayer The Bukkit player to send the raw message to
-	 */
-	public VanillaCommandListener14(T player, Player bukkitplayer) {
-		this.player = player;
-		this.bukkitplayer = bukkitplayer;
-		if (!(bukkitplayer instanceof CraftPlayer))
-			throw new ClassCastException("bukkitplayer must be a Bukkit player!");
-	}
-
-	@Override
-	public void sendMessage(IChatBaseComponent arg0) {
-		player.sendMessage(arg0.getString());
-		if (bukkitplayer != null)
-			((CraftPlayer) bukkitplayer).getHandle().sendMessage(arg0);
-	}
-
-	@Override
-	public boolean shouldSendSuccess() {
-		return true;
-	}
-
-	@Override
-	public boolean shouldSendFailure() {
-		return true;
-	}
-
-	@Override
-	public boolean shouldBroadcastCommands() {
-		return true; //Broadcast to in-game admins
-	}
-
-	@Override
-	public CommandSender getBukkitSender(CommandListenerWrapper commandListenerWrapper) {
-		return player;
-	}
-
-	public static boolean runBukkitOrVanillaCommand(DiscordSenderBase dsender, String cmdstr) {
-		val cmd = ((CraftServer) Bukkit.getServer()).getCommandMap().getCommand(cmdstr.split(" ")[0].toLowerCase());
-		if (!(dsender instanceof Player) || !(cmd instanceof VanillaCommandWrapper))
-			return Bukkit.dispatchCommand(dsender, cmdstr); // Unconnected users are treated well in vanilla cmds
-
-		if (!(dsender instanceof IMCPlayer))
-			throw new ClassCastException(
-				"dsender needs to implement IMCPlayer to use vanilla commands as it implements Player.");
-
-		IMCPlayer<?> sender = (IMCPlayer<?>) dsender; // Don't use val on recursive interfaces :P
-
-		val vcmd = (VanillaCommandWrapper) cmd;
-		if (!vcmd.testPermission(sender))
-			return true;
-
-		val world = ((CraftWorld) Bukkit.getWorlds().get(0)).getHandle();
-		ICommandListener icommandlistener = (ICommandListener) sender.getVanillaCmdListener().getListener();
-		val wrapper = new CommandListenerWrapper(icommandlistener, new Vec3D(0, 0, 0),
-			new Vec2F(0, 0), world, 0, sender.getName(),
-			new ChatComponentText(sender.getName()), world.getMinecraftServer(), null);
-		val pncs = new ProxiedNativeCommandSender(wrapper, sender, sender);
-		String[] args = cmdstr.split(" ");
-		args = Arrays.copyOfRange(args, 1, args.length);
-		try {
-			return vcmd.execute(pncs, cmd.getLabel(), args);
-		} catch (CommandException commandexception) {
-			// Taken from CommandHandler
-			ChatMessage chatmessage = new ChatMessage(commandexception.getMessage(), commandexception.a());
-			chatmessage.getChatModifier().setColor(EnumChatFormat.RED);
-			icommandlistener.sendMessage(chatmessage);
-		}
-		return true;
-	}
-}

src/main/java/buttondevteam/discordplugin/playerfaker/perm/LPInjector.java

@@ -1,240 +0,0 @@
-package buttondevteam.discordplugin.playerfaker.perm;
-
-import buttondevteam.core.MainPlugin;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.discordplugin.mcchat.MCChatUtils;
-import buttondevteam.lib.TBMCCoreAPI;
-import me.lucko.luckperms.bukkit.LPBukkitBootstrap;
-import me.lucko.luckperms.bukkit.LPBukkitPlugin;
-import me.lucko.luckperms.bukkit.inject.dummy.DummyPermissibleBase;
-import me.lucko.luckperms.bukkit.inject.permissible.LPPermissible;
-import me.lucko.luckperms.bukkit.listeners.BukkitConnectionListener;
-import me.lucko.luckperms.common.config.ConfigKeys;
-import me.lucko.luckperms.common.locale.message.Message;
-import me.lucko.luckperms.common.model.User;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.permissions.PermissibleBase;
-import org.bukkit.permissions.PermissionAttachment;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public final class LPInjector implements Listener { //Disable login event for LuckPerms
-	private LPBukkitPlugin plugin;
-	private BukkitConnectionListener connectionListener;
-	private Set<UUID> deniedLogin;
-	private Field detectedCraftBukkitOfflineMode;
-	private Method printCraftBukkitOfflineModeError;
-	private Field PERMISSIBLE_BASE_ATTACHMENTS_FIELD;
-	private Method convertAndAddAttachments;
-	private Method getActive;
-	private Method setOldPermissible;
-	private Method getOldPermissible;
-
-	public LPInjector(MainPlugin mp) throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException {
-		LPBukkitBootstrap bs = (LPBukkitBootstrap) Bukkit.getPluginManager().getPlugin("LuckPerms");
-		Field field = LPBukkitBootstrap.class.getDeclaredField("plugin");
-		field.setAccessible(true);
-		plugin = (LPBukkitPlugin) field.get(bs);
-		MCChatUtils.addStaticExcludedPlugin(PlayerLoginEvent.class, "LuckPerms");
-		MCChatUtils.addStaticExcludedPlugin(PlayerQuitEvent.class, "LuckPerms");
-
-		field = LPBukkitPlugin.class.getDeclaredField("connectionListener");
-		field.setAccessible(true);
-		connectionListener = (BukkitConnectionListener) field.get(plugin);
-		field = connectionListener.getClass().getDeclaredField("deniedLogin");
-		field.setAccessible(true);
-		//noinspection unchecked
-		deniedLogin = (Set<UUID>) field.get(connectionListener);
-		field = connectionListener.getClass().getDeclaredField("detectedCraftBukkitOfflineMode");
-		field.setAccessible(true);
-		detectedCraftBukkitOfflineMode = field;
-		printCraftBukkitOfflineModeError = connectionListener.getClass().getDeclaredMethod("printCraftBukkitOfflineModeError");
-		printCraftBukkitOfflineModeError.setAccessible(true);
-
-		//PERMISSIBLE_FIELD = DiscordFakePlayer.class.getDeclaredField("perm");
-		//PERMISSIBLE_FIELD.setAccessible(true); //Hacking my own plugin, while we're at it
-		PERMISSIBLE_BASE_ATTACHMENTS_FIELD = PermissibleBase.class.getDeclaredField("attachments");
-		PERMISSIBLE_BASE_ATTACHMENTS_FIELD.setAccessible(true);
-
-		convertAndAddAttachments = LPPermissible.class.getDeclaredMethod("convertAndAddAttachments", Collection.class);
-		convertAndAddAttachments.setAccessible(true);
-		getActive = LPPermissible.class.getDeclaredMethod("getActive");
-		getActive.setAccessible(true);
-		setOldPermissible = LPPermissible.class.getDeclaredMethod("setOldPermissible", PermissibleBase.class);
-		setOldPermissible.setAccessible(true);
-		getOldPermissible = LPPermissible.class.getDeclaredMethod("getOldPermissible");
-		getOldPermissible.setAccessible(true);
-
-		TBMCCoreAPI.RegisterEventsForExceptions(this, mp);
-	}
-
-
-	//Code copied from LuckPerms - me.lucko.luckperms.bukkit.listeners.BukkitConnectionListener
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerLogin(PlayerLoginEvent e) {
-        /* Called when the player starts logging into the server.
-           At this point, the users data should be present and loaded. */
-
-		if (!(e.getPlayer() instanceof DiscordConnectedPlayer))
-			return; //Normal players must be handled by the plugin
-
-		final DiscordConnectedPlayer player = (DiscordConnectedPlayer) e.getPlayer();
-
-		if (plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) {
-			plugin.getLogger().info("Processing login for " + player.getUniqueId() + " - " + player.getName());
-		}
-
-		final User user = plugin.getUserManager().getIfLoaded(player.getUniqueId());
-
-		/* User instance is null for whatever reason. Could be that it was unloaded between asyncpre and now. */
-		if (user == null) {
-			deniedLogin.add(player.getUniqueId());
-
-			if (!connectionListener.getUniqueConnections().contains(player.getUniqueId())) {
-
-				plugin.getLogger().warn("User " + player.getUniqueId() + " - " + player.getName() +
-					" doesn't have data pre-loaded, they have never been processed during pre-login in this session." +
-					" - denying login.");
-
-				try {
-					if ((Boolean) detectedCraftBukkitOfflineMode.get(connectionListener)) {
-						printCraftBukkitOfflineModeError.invoke(connectionListener);
-						e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_STATE_ERROR_CB_OFFLINE_MODE.asString(plugin.getLocaleManager()));
-						return;
-					}
-				} catch (IllegalAccessException | InvocationTargetException ex) {
-					ex.printStackTrace();
-				}
-
-			} else {
-				plugin.getLogger().warn("User " + player.getUniqueId() + " - " + player.getName() +
-					" doesn't currently have data pre-loaded, but they have been processed before in this session." +
-					" - denying login.");
-			}
-
-			e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_STATE_ERROR.asString(plugin.getLocaleManager()));
-			return;
-		}
-
-		// User instance is there, now we can inject our custom Permissible into the player.
-		// Care should be taken at this stage to ensure that async tasks which manipulate bukkit data check that the player is still online.
-		try {
-			// get the existing PermissibleBase held by the player
-			PermissibleBase oldPermissible = player.getPerm();
-
-			// Make a new permissible for the user
-			LPPermissible lpPermissible = new LPPermissible(player, user, plugin);
-
-			// Inject into the player
-			inject(player, lpPermissible, oldPermissible);
-
-		} catch (Throwable t) {
-			plugin.getLogger().warn("Exception thrown when setting up permissions for " +
-				player.getUniqueId() + " - " + player.getName() + " - denying login.");
-			t.printStackTrace();
-
-			e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_SETUP_ERROR.asString(plugin.getLocaleManager()));
-			return;
-		}
-
-		plugin.refreshAutoOp(player, true);
-	}
-
-	// Wait until the last priority to unload, so plugins can still perform permission checks on this event
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerQuit(PlayerQuitEvent e) {
-		if (!(e.getPlayer() instanceof DiscordConnectedPlayer))
-			return;
-
-		final DiscordConnectedPlayer player = (DiscordConnectedPlayer) e.getPlayer();
-
-		connectionListener.handleDisconnect(player.getUniqueId());
-
-		// perform unhooking from bukkit objects 1 tick later.
-		// this allows plugins listening after us on MONITOR to still have intact permissions data
-		this.plugin.getBootstrap().getServer().getScheduler().runTaskLaterAsynchronously(this.plugin.getBootstrap(), () -> {
-			// Remove the custom permissible
-			try {
-				uninject(player, true);
-			} catch (Exception ex) {
-				ex.printStackTrace();
-			}
-
-			// Handle auto op
-			if (this.plugin.getConfiguration().get(ConfigKeys.AUTO_OP)) {
-				player.setOp(false);
-			}
-
-			// remove their contexts cache
-			this.plugin.getContextManager().onPlayerQuit(player);
-		}, 1L);
-	}
-
-	//me.lucko.luckperms.bukkit.inject.permissible.PermissibleInjector
-	private void inject(DiscordConnectedPlayer player, LPPermissible newPermissible, PermissibleBase oldPermissible) throws IllegalAccessException, InvocationTargetException {
-
-		// seems we have already injected into this player.
-		if (oldPermissible instanceof LPPermissible) {
-			throw new IllegalStateException("LPPermissible already injected into player " + player.toString());
-		}
-
-		// Move attachments over from the old permissible
-
-		//noinspection unchecked
-		List<PermissionAttachment> attachments = (List<PermissionAttachment>) PERMISSIBLE_BASE_ATTACHMENTS_FIELD.get(oldPermissible);
-
-		convertAndAddAttachments.invoke(newPermissible, attachments);
-		attachments.clear();
-		oldPermissible.clearPermissions();
-
-		// Setup the new permissible
-		((AtomicBoolean) getActive.invoke(newPermissible)).set(true);
-		setOldPermissible.invoke(newPermissible, oldPermissible);
-
-		// inject the new instance
-		player.setPerm(newPermissible);
-	}
-
-	private void uninject(DiscordConnectedPlayer player, boolean dummy) throws Exception {
-
-		// gets the players current permissible.
-		PermissibleBase permissible = player.getPerm();
-
-		// only uninject if the permissible was a luckperms one.
-		if (permissible instanceof LPPermissible) {
-			LPPermissible lpPermissible = ((LPPermissible) permissible);
-
-			// clear all permissions
-			lpPermissible.clearPermissions();
-
-			// set to inactive
-			((AtomicBoolean) getActive.invoke(lpPermissible)).set(false);
-
-			// handle the replacement permissible.
-			if (dummy) {
-				// just inject a dummy class. this is used when we know the player is about to quit the server.
-				player.setPerm(DummyPermissibleBase.INSTANCE);
-
-			} else {
-				PermissibleBase newPb = (PermissibleBase) getOldPermissible.invoke(lpPermissible);
-				if (newPb == null) {
-					newPb = new PermissibleBase(player);
-				}
-
-				player.setPerm(newPb);
-			}
-		}
-	}
-}

src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java

@@ -1,120 +0,0 @@
-package buttondevteam.discordplugin.role;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import discord4j.core.event.domain.role.RoleCreateEvent;
-import discord4j.core.event.domain.role.RoleDeleteEvent;
-import discord4j.core.event.domain.role.RoleEvent;
-import discord4j.core.event.domain.role.RoleUpdateEvent;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.Role;
-import lombok.val;
-import org.bukkit.Bukkit;
-import reactor.core.publisher.Mono;
-
-import java.awt.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Automatically collects roles with a certain color (the second to last in the upper row - #95a5a6).
- * Users can add these roles to themselves using the /role Discord command.
- */
-public class GameRoleModule extends Component<DiscordPlugin> {
-	public List<String> GameRoles;
-
-	@Override
-	protected void enable() {
-		getPlugin().getManager().registerCommand(new RoleCommand(this));
-		GameRoles = DiscordPlugin.mainServer.getRoles().filterWhen(r -> isGameRole(r, false)).map(Role::getName).collect(Collectors.toList()).block();
-	}
-
-	@Override
-	protected void disable() {
-
-	}
-
-	/**
-	 * The channel where the bot logs when it detects a role change that results in a new game role or one being removed.
-	 */
-	private ReadOnlyConfigData<Mono<MessageChannel>> logChannel() {
-		return DPUtils.channelData(getConfig(), "logChannel");
-	}
-
-	public static void handleRoleEvent(RoleEvent roleEvent) {
-		val grm = ComponentManager.getIfEnabled(GameRoleModule.class);
-		if (grm == null) return;
-		val GameRoles = grm.GameRoles;
-		val logChannel = grm.logChannel().get();
-		if (roleEvent instanceof RoleCreateEvent) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin, () -> {
-				Role role=((RoleCreateEvent) roleEvent).getRole();
-				grm.isGameRole(role, false).flatMap(b -> {
-					if (!b)
-						return Mono.empty(); //Deleted or not a game role
-					GameRoles.add(role.getName());
-					if (logChannel != null)
-						return logChannel.flatMap(ch -> ch.createMessage("Added " + role.getName() + " as game role. If you don't want this, change the role's color from the game role color."));
-					return Mono.empty();
-				}).subscribe();
-			}, 100);
-		} else if (roleEvent instanceof RoleDeleteEvent) {
-			Role role=((RoleDeleteEvent) roleEvent).getRole().orElse(null);
-			if(role==null) return;
-			if (GameRoles.remove(role.getName()) && logChannel != null)
-				logChannel.flatMap(ch -> ch.createMessage("Removed " + role.getName() + " as a game role.")).subscribe();
-		} else if (roleEvent instanceof RoleUpdateEvent) {
-			val event = (RoleUpdateEvent) roleEvent;
-			if(!event.getOld().isPresent()) {
-				DPUtils.getLogger().warning("Old role not stored, cannot update game role!");
-				return;
-			}
-			Role or=event.getOld().get();
-			grm.isGameRole(event.getCurrent(), true).flatMap(b -> {
-				if (!b) {
-					if (GameRoles.remove(or.getName()) && logChannel != null)
-						return logChannel.flatMap(ch -> ch.createMessage("Removed " + or.getName() + " as a game role because it's color changed."));
-				} else {
-					if (GameRoles.contains(or.getName()) && or.getName().equals(event.getCurrent().getName()))
-						return Mono.empty();
-					boolean removed = GameRoles.remove(or.getName()); //Regardless of whether it was a game role
-					GameRoles.add(event.getCurrent().getName()); //Add it because it has no color
-					if (logChannel != null) {
-						if (removed)
-							return logChannel.flatMap(ch -> ch.createMessage("Changed game role from " + or.getName() + " to " + event.getCurrent().getName() + "."));
-						else
-							return logChannel.flatMap(ch -> ch.createMessage("Added " + event.getCurrent().getName() + " as game role because it has the color of one."));
-					}
-				}
-				return Mono.empty();
-			}).subscribe();
-		}
-	}
-
-	private Mono<Boolean> isGameRole(Role r, boolean debugMC) {
-		boolean debug = debugMC && r.getName().equalsIgnoreCase("Minecraft");
-		if (debug) TBMCCoreAPI.sendDebugMessage("Checking if Minecraft is a game role...");
-		if (r.getGuildId().asLong() != DiscordPlugin.mainServer.getId().asLong()) {
-			if (debug) TBMCCoreAPI.sendDebugMessage("Not in the main server: " + r.getGuildId().asString());
-			return Mono.just(false); //Only allow on the main server
-		}
-		val rc = new Color(149, 165, 166, 0);
-		if (debug) TBMCCoreAPI.sendDebugMessage("Game role color: " + rc + " - MC color: " + r.getColor());
-		return Mono.just(r.getColor().equals(rc))
-			.doAfterSuccessOrError((b, e) -> {
-				if (debug) TBMCCoreAPI.sendDebugMessage("1. b: " + b + " - e: " + e);
-			}).filter(b -> b).flatMap(b ->
-				DiscordPlugin.dc.getSelf().flatMap(u -> u.asMember(DiscordPlugin.mainServer.getId()))
-					.doAfterSuccessOrError((m, e) -> {
-						if (debug) TBMCCoreAPI.sendDebugMessage("2. m: " + m.getDisplayName() + " e: " + e);
-					}).flatMap(m -> m.hasHigherRoles(Collections.singleton(r)))) //Below one of our roles
-			.doAfterSuccessOrError((b, e) -> {
-				if (debug) TBMCCoreAPI.sendDebugMessage("3. b: " + b + " - e: " + e);
-			}).defaultIfEmpty(false);
-	}
-}

src/main/java/buttondevteam/discordplugin/role/RoleCommand.java

@@ -1,109 +0,0 @@
-package buttondevteam.discordplugin.role;
-
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.commands.Command2DCSender;
-import buttondevteam.discordplugin.commands.ICommand2DC;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import discord4j.core.object.entity.Role;
-import lombok.val;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-
-@CommandClass
-public class RoleCommand extends ICommand2DC {
-
-	private GameRoleModule grm;
-
-	RoleCommand(GameRoleModule grm) {
-		this.grm = grm;
-	}
-
-	@Command2.Subcommand(helpText = {
-		"Add role",
-		"This command adds a role to your account."
-	})
-	public boolean add(Command2DCSender sender, @Command2.TextArg String rolename) {
-		final Role role = checkAndGetRole(sender, rolename);
-		if (role == null)
-			return true;
-		try {
-			sender.getMessage().getAuthorAsMember()
-				.flatMap(m -> m.addRole(role.getId()).switchIfEmpty(Mono.fromRunnable(() -> sender.sendMessage("added role."))))
-				.subscribe();
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Error while adding role!", e);
-			sender.sendMessage("an error occured while adding the role.");
-		}
-		return true;
-	}
-
-	@Command2.Subcommand(helpText = {
-		"Remove role",
-		"This command removes a role from your account."
-	})
-	public boolean remove(Command2DCSender sender, @Command2.TextArg String rolename) {
-		final Role role = checkAndGetRole(sender, rolename);
-		if (role == null)
-			return true;
-		try {
-			sender.getMessage().getAuthorAsMember()
-				.flatMap(m -> m.removeRole(role.getId()).switchIfEmpty(Mono.fromRunnable(() -> sender.sendMessage("removed role."))))
-				.subscribe();
-		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Error while removing role!", e);
-			sender.sendMessage("an error occured while removing the role.");
-		}
-		return true;
-	}
-
-	@Command2.Subcommand
-	public void list(Command2DCSender sender) {
-		var sb = new StringBuilder();
-		boolean b = false;
-		for (String role : (Iterable<String>) grm.GameRoles.stream().sorted()::iterator) {
-			sb.append(role);
-			if (!b)
-				for (int j = 0; j < Math.max(1, 20 - role.length()); j++)
-					sb.append(" ");
-			else
-				sb.append("\n");
-			b = !b;
-		}
-		if (sb.charAt(sb.length() - 1) != '\n')
-			sb.append('\n');
-		sender.sendMessage("list of roles:\n```\n" + sb + "```");
-	}
-
-	private Role checkAndGetRole(Command2DCSender sender, String rolename) {
-		String rname = rolename;
-		if (!grm.GameRoles.contains(rolename)) { //If not found as-is, correct case
-			val orn = grm.GameRoles.stream().filter(r -> r.equalsIgnoreCase(rolename)).findAny();
-			if (!orn.isPresent()) {
-				sender.sendMessage("that role cannot be found.");
-				list(sender);
-				return null;
-			}
-			rname = orn.get();
-		}
-		val frname = rname;
-		final List<Role> roles = DiscordPlugin.mainServer.getRoles().filter(r -> r.getName().equals(frname)).collectList().block();
-		if (roles == null) {
-			sender.sendMessage("an error occured.");
-			return null;
-		}
-		if (roles.size() == 0) {
-			sender.sendMessage("the specified role cannot be found on Discord! Removing from the list.");
-			grm.GameRoles.remove(rolename);
-			return null;
-		}
-		if (roles.size() > 1) {
-			sender.sendMessage("there are multiple roles with this name. Why are there multiple roles with this name?");
-			return null;
-		}
-		return roles.get(0);
-	}
-
-}

src/main/java/buttondevteam/discordplugin/util/Timings.java

@@ -1,16 +0,0 @@
-package buttondevteam.discordplugin.util;
-
-import buttondevteam.discordplugin.listeners.CommonListeners;
-
-public class Timings {
-	private long start;
-
-	public Timings() {
-		start = System.nanoTime();
-	}
-
-	public void printElapsed(String message) {
-		CommonListeners.debug(message + " (" + (System.nanoTime() - start) / 1000000L + ")");
-		start = System.nanoTime();
-	}
-}

src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+buttondevteam.discordplugin.playerfaker.DelegatingMockMaker

src/main/resources/plugin.yml

@@ -1,10 +1,18 @@
 name: Chroma-Discord
 main: buttondevteam.discordplugin.DiscordPlugin
-version: '1.0'
+version: '${noprefix.version}'
 author: NorbiPeti
-depend: [ChromaCore]
+depend: [ Chroma-Core ]
 softdepend:
   - Essentials
 commands:
   discord:
-website: 'https://github.com/TBMCPlugins/DiscordPlugin'
+    description: 'Main command for Chroma-Discord'
+website: 'https://github.com/TBMCPlugins/Chroma-Discord'
+api-version: '1.13'
+#libraries:
+#  - 'org.slf4j:slf4j-jdk14:1.7.32'
+#  - 'com.vdurmont:emoji-java:5.1.1'
+#  - 'org.mockito:mockito-core:4.2.0'
+#  - 'io.projectreactor:reactor-scala-extensions_2.13:0.8.0'
+#  - 'org.scala-lang:scala3-library_3:3.1.0'

src/main/scala/buttondevteam/discordplugin/ChannelconBroadcast.scala

@@ -0,0 +1,6 @@
+package buttondevteam.discordplugin
+
+object ChannelconBroadcast extends Enumeration {
+    type ChannelconBroadcast = Value
+    val JOINLEAVE, AFK, RESTART, DEATH, BROADCAST = Value
+}

src/main/scala/buttondevteam/discordplugin/ChromaBot.scala

@@ -0,0 +1,37 @@
+package buttondevteam.discordplugin
+
+import buttondevteam.discordplugin.ChannelconBroadcast.ChannelconBroadcast
+import buttondevteam.discordplugin.mcchat.MCChatUtils
+import discord4j.core.`object`.entity.Message
+import discord4j.core.`object`.entity.channel.MessageChannel
+import reactor.core.scala.publisher.SMono
+
+import javax.annotation.Nullable
+
+object ChromaBot {
+    private var _enabled = false
+
+    def enabled = _enabled
+
+    private[discordplugin] def enabled_=(en: Boolean): Unit = _enabled = en
+
+    /**
+     * Send a message to the chat channels and private chats.
+     *
+     * @param message The message to send, duh (use [[MessageChannel.createMessage]])
+     */
+    def sendMessage(message: SMono[MessageChannel] => SMono[Message]): Unit =
+        MCChatUtils.forPublicPrivateChat(message).subscribe()
+
+    /**
+     * Send a message to the chat channels, private chats and custom chats.
+     *
+     * @param message The message to send, duh
+     * @param toggle  The toggle type for channelcon
+     */
+    def sendMessageCustomAsWell(message: SMono[MessageChannel] => SMono[Message], @Nullable toggle: ChannelconBroadcast): Unit =
+        MCChatUtils.forCustomAndAllMCChat(message.apply, toggle, hookmsg = false).subscribe()
+
+    def updatePlayerList(): Unit =
+        MCChatUtils.updatePlayerList()
+}

src/main/scala/buttondevteam/discordplugin/DPUtils.scala

@@ -0,0 +1,210 @@
+package buttondevteam.discordplugin
+
+import buttondevteam.lib.TBMCCoreAPI
+import buttondevteam.lib.architecture.config.IConfigData
+import buttondevteam.lib.architecture.{Component, ConfigData, IHaveConfig}