diff --git a/.gitignore b/.gitignore
index 3e444ba6..3e91d444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ manifest.mf
*.iml
# Maven excludes
-/target
+target/
# OS generated files
.DS_Store
diff --git a/commons/pom.xml b/commons/pom.xml
index 50efb39d..da810f1f 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -60,4 +60,184 @@
compile
+
+
+
+
+
+
+ src/main/resources
+ true
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.10.1
+
+ TotalFreedomMod.jar
+ 17
+ 17
+ 17
+
+
+
+
+
+ pl.project13.maven
+ git-commit-id-plugin
+ 4.9.10
+
+
+ get-the-git-infos
+
+ revision
+
+
+
+ validate-the-git-infos
+
+ validateRevision
+
+ package
+
+
+
+ ${project.basedir}/.git
+ git
+ yyyy-MM-dd HH:mm:ss
+ false
+ properties
+ false
+ false
+
+ git.commit.id.abbrev
+
+
+ false
+ false
+ 7
+ -dirty
+ *
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 3.1.0
+
+
+ default-cli
+ initialize
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ properties-maven-plugin
+ 1.1.0
+
+
+ initialize
+
+ read-project-properties
+
+
+
+ ${project.basedir}/src/main/resources/build.properties
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ buildnumber-maven-plugin
+ 3.0.0
+
+
+ generate-resources
+
+ create
+
+
+
+
+
+ maven.buildnumber
+ ${project.basedir}/src/main/resources/build.properties
+
+ {0,number,#}
+
+ - buildNumber
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.3.0
+
+
+ package
+
+ shade
+
+
+ true
+
+
+ io.papermc.lib
+ me.totalfreedom.totalfreedommod.paperlib
+
+
+
+ org.bstats
+ me.totalfreedom.totalfreedommod
+
+
+
+
+ org.reflections:reflections
+ io.papermc:paperlib
+ org.bstats:bstats-bukkit
+ org.bstats:bstats-base
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/discord/pom.xml b/discord/pom.xml
index 59910ddf..4f015fb7 100644
--- a/discord/pom.xml
+++ b/discord/pom.xml
@@ -38,4 +38,32 @@
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.3.0
+
+
+ package
+
+ shade
+
+
+ true
+
+
+ com.discord4j:discord4j-core
+ io.projectreactor:reactor-core
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/discord/src/main/java/me/totalfreedom/discord/listener/PrivateMessageListener.java b/discord/src/main/java/me/totalfreedom/discord/listener/PrivateMessageListener.java
index 31f040e9..c84839e9 100644
--- a/discord/src/main/java/me/totalfreedom/discord/listener/PrivateMessageListener.java
+++ b/discord/src/main/java/me/totalfreedom/discord/listener/PrivateMessageListener.java
@@ -1,8 +1,8 @@
package me.totalfreedom.discord.listener;
import discord4j.core.event.domain.message.MessageCreateEvent;
+import me.totalfreedom.discord.Bot;
import me.totalfreedom.discord.TFD4J;
-import me.totalfreedom.discord.discord.Discord;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.player.PlayerData;
@@ -29,21 +29,22 @@ public class PrivateMessageListener
{
String code = event.getMessage().getContent().strip();
String name;
- if (Discord.LINK_CODES.get(code) != null)
+ if (tfd4j.getBot().getLinkCodes().get(code) != null)
{
- PlayerData player = Discord.LINK_CODES.get(code);
+ PlayerData player = tfd4j.getBot().getLinkCodes().get(code);
name = player.getName();
player.setDiscordID(event.getMessage().getAuthor().orElseThrow().getId().asString());
Admin admin = TotalFreedomMod.getPlugin().al.getEntryByUuid(player.getUuid());
if (admin != null)
{
- Discord.syncRoles(admin, player.getDiscordID());
+ tfd4j.getImpl().syncRoles(admin, player.getDiscordID());
}
TotalFreedomMod.getPlugin().pl.save(player);
- Discord.LINK_CODES.remove(code);
- } else
+ tfd4j.getBot().getLinkCodes().remove(code);
+ }
+ else
{
return;
}
diff --git a/discord/src/main/java/me/totalfreedom/discord/util/Utilities.java b/discord/src/main/java/me/totalfreedom/discord/util/Utilities.java
index 47aad9bc..e4e0f4b4 100644
--- a/discord/src/main/java/me/totalfreedom/discord/util/Utilities.java
+++ b/discord/src/main/java/me/totalfreedom/discord/util/Utilities.java
@@ -1,31 +1,5 @@
package me.totalfreedom.discord.util;
-import com.google.common.collect.ImmutableList;
-import discord4j.core.object.entity.Guild;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.channel.Channel;
-import discord4j.core.object.entity.channel.TextChannel;
-import discord4j.core.object.reaction.ReactionEmoji;
-import discord4j.core.spec.EmbedCreateSpec;
-import discord4j.core.spec.MessageCreateSpec;
-import discord4j.discordjson.json.EmojiData;
-import discord4j.discordjson.json.ReactionData;
-import me.totalfreedom.discord.TFD4J;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import org.apache.commons.lang.WordUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.Instant;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
public class Utilities
{
private Utilities() {
diff --git a/pom.xml b/pom.xml
index e840b251..aad77ac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,185 +199,6 @@
-
-
-
-
- src/main/resources
- true
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.10.1
-
- TotalFreedomMod.jar
- 17
- 17
- 17
-
-
-
-
-
- pl.project13.maven
- git-commit-id-plugin
- 4.9.10
-
-
- get-the-git-infos
-
- revision
-
-
-
- validate-the-git-infos
-
- validateRevision
-
- package
-
-
-
- ${project.basedir}/.git
- git
- yyyy-MM-dd HH:mm:ss
- false
- properties
- false
- false
-
- git.commit.id.abbrev
-
-
- false
- false
- 7
- -dirty
- *
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 3.1.0
-
-
- default-cli
- initialize
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
-
-
-
-
-
- org.codehaus.mojo
- properties-maven-plugin
- 1.1.0
-
-
- initialize
-
- read-project-properties
-
-
-
- ${project.basedir}/src/main/resources/build.properties
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- buildnumber-maven-plugin
- 3.0.0
-
-
- generate-resources
-
- create
-
-
-
-
-
- maven.buildnumber
- ${project.basedir}/src/main/resources/build.properties
-
- {0,number,#}
-
- - buildNumber
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.3.0
-
-
- package
-
- shade
-
-
- true
-
-
- io.papermc.lib
- me.totalfreedom.totalfreedommod.paperlib
-
-
-
- org.bstats
- me.totalfreedom.totalfreedommod
-
-
-
-
- org.reflections:reflections
- io.papermc:paperlib
- org.bstats:bstats-bukkit
- org.bstats:bstats-base
-
-
-
-
-
-
-
-
-
-