Refactored a lot of stuff and added some new features

Added DragonTechMC#38: now usernames don't count as spam
Fixed DragonTechMC#36: now we get get the name of the player if he is online (but still fallback to the offline user if he isn't)
Added DragonTechMC#35: Added a replacer with stars (****) or words to replace with
Added DragonTechMC#34: now we have a Messages.conf with all (or most) player messages configurable
Added DragonTechMC#27: now you can define the directory of the file datastore
Also fixed some stuff which was erroring on SpongeAPI 7.1.0, it should now work on all versions

Author: Eufranio

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'org.spongepowered.plugin' version '0.8.1'
-    id 'com.qixalite.spongestart' version '1.6.2'
+    id 'com.qixalite.spongestart2' version '3.0.1'
     id 'java'
 }
 
@@ -17,12 +17,11 @@ repositories {
 }
 
 spongestart {
-    eula true
-    spongeForgeVersion '1.10.2-2221-5.2.0-BETA-2223'
+    minecraft '1.12.2'
 }
 
 dependencies {
-    compile 'org.spongepowered:spongeapi:5.2.0-SNAPSHOT'
+    compile 'org.spongepowered:spongeapi:7.1.0-SNAPSHOT'
     testCompile 'junit:junit:4.12'
     testCompile 'org.powermock:powermock-module-junit4:1.6.6'
     testCompile 'org.powermock:powermock-api-mockito:1.6.6'

src/main/java/me/morpheus/dtpunishment/DTPunishment.java

@@ -1,8 +1,16 @@
 package me.morpheus.dtpunishment;
 
+import me.morpheus.dtpunishment.configuration.*;
+import me.morpheus.dtpunishment.data.ChatOffenceData;
+import me.morpheus.dtpunishment.data.DataStore;
+import me.morpheus.dtpunishment.data.FileDataStore;
+import me.morpheus.dtpunishment.data.MySqlDataStore;
+import ninja.leaping.configurate.objectmapping.GuiceObjectMapperFactory;
 import org.slf4j.Logger;
 import org.spongepowered.api.Sponge;
+import org.spongepowered.api.config.ConfigDir;
 import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.game.GameReloadEvent;
 import org.spongepowered.api.event.game.state.GameInitializationEvent;
 import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
 import org.spongepowered.api.plugin.Plugin;
@@ -11,61 +19,125 @@
 import com.google.inject.Injector;
 
 import me.morpheus.dtpunishment.commands.CommandManager;
-import me.morpheus.dtpunishment.configuration.ConfigurationManager;
-import me.morpheus.dtpunishment.configuration.MainConfig;
-import me.morpheus.dtpunishment.configuration.PunishmentLength;
-import me.morpheus.dtpunishment.configuration.PunishmentLengthSerializer;
 import me.morpheus.dtpunishment.listeners.PlayerListener;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializers;
 
+import java.io.File;
+import java.nio.file.Path;
+
 @Plugin(id = "dtpunishment", name = "DTPunishment", description = "Dragon Tech Punishment: a unique chat safeguard plugin")
 public class DTPunishment {
 
-	private Logger logger;
+    @Inject
+	public Logger logger;
 
-	private Injector injector;
+    public static Logger getLogger() {
+        return instance.logger;
+    }
 
-	private Injector childInjector;
+    @Inject
+    @ConfigDir(sharedRoot = false)
+	public File configDir;
 
-	private MainConfig config;
+    public File dataDir;
 
-	private CommandManager commandManager;
+    @Inject
+    public GuiceObjectMapperFactory mapper;
 
-	@Inject
-	public DTPunishment(Logger logger, Injector injector, MainConfig mainConfig) {
-		this.logger = logger;
-		this.injector = injector;
-		this.config = mainConfig;
-		registerSerializers();
-	}
+    public DataStore dataStore;
 
-	private void registerSerializers() {
-		TypeSerializers.getDefaultSerializers().registerType(TypeToken.of(PunishmentLength.class),
-				new PunishmentLengthSerializer());
-	}
+	private static DTPunishment instance;
+
+	private ConfigManager<ChatConfig> chatConfig;
+    private ConfigManager<MainConfig> mainConfig;
+    private ConfigManager<Messages> messages;
 
 	@Listener
 	public void onServerPreInit(GamePreInitializationEvent event) {
-		logger.info("Enabling DTPunishment...");
+	    instance = this;
+
+        TypeSerializers.getDefaultSerializers().registerType(TypeToken.of(PunishmentLength.class),
+                new PunishmentLengthSerializer());
+
+	    this.chatConfig = new ConfigManager<>(ChatConfig.class, "chat.conf", configDir, mapper);
+	    this.mainConfig = new ConfigManager<>(MainConfig.class, "DTPunishments.conf", configDir, mapper);
+	    this.messages = new ConfigManager<>(Messages.class, "Messages.conf", configDir, mapper);
+
+	    File file;
+	    if (getConfig().useCustomDataDirectory && !getConfig().customDataDirectory.isEmpty()) {
+	        file = new File(new File(getConfig().customDataDirectory), "data");
+        } else {
+	        file = new File(this.configDir, "data");
+        }
+	    if (!file.exists()) file.mkdirs();
+	    this.dataDir = file;
+
+	    if (this.mainConfig.getConfig().database.enabled) {
+	        this.dataStore = new MySqlDataStore();
+        } else {
+	        this.dataStore = new FileDataStore();
+        }
 
-		// Create the child injector for the plugin
-		childInjector = injector.createChildInjector(new DTPunishmentModule(config));
-
-		// Get config manager and init
-		ConfigurationManager configurationManager = childInjector.getInstance(ConfigurationManager.class);
-		configurationManager.intialise();
+		logger.info("Enabling DTPunishment...");
 
 		// Get command manager from child injector
-		commandManager = childInjector.getInstance(CommandManager.class);
+		commandManager = new CommandManager();
+		wordChecker = new WordChecker();
+		this.offenceData = new ChatOffenceData();
 	}
 
 	@Listener
 	public void onServerInit(GameInitializationEvent event) {
 		logger.info("Registering listeners and commands...");
-		Sponge.getEventManager().registerListeners(this, childInjector.getInstance(PlayerListener.class));
+		Sponge.getEventManager().registerListeners(this, new PlayerListener());
 
 		// Register any commands
 		commandManager.registerCommands();
 	}
 
+	@Listener
+    public void onReload(GameReloadEvent e) {
+	    this.mainConfig.load();
+	    this.chatConfig.load();
+    }
+
+	public static DTPunishment getInstance() {
+	    return instance;
+    }
+
+    public static MainConfig getConfig() {
+	    return instance.mainConfig.getConfig();
+    }
+
+    public static Messages getMessages() {
+	    return instance.messages.getConfig();
+    }
+
+    public static ChatConfig getChatConfig() {
+	    return instance.chatConfig.getConfig();
+    }
+
+    public static DataStore getDataStore() {
+	    return instance.dataStore;
+    }
+
+    private CommandManager commandManager;
+	public static CommandManager getCommandManager() {
+	    return instance.commandManager;
+    }
+
+    private WordChecker wordChecker;
+	public static WordChecker getWordChecker() {
+	    return instance.wordChecker;
+    }
+
+    private ChatOffenceData offenceData;
+    public static ChatOffenceData getOffenceData() {
+        return instance.offenceData;
+    }
+
+    public static File getDataDirectory() {
+        return instance.dataDir;
+    }
+
 }

src/main/java/me/morpheus/dtpunishment/DTPunishmentModule.java

@@ -16,8 +16,9 @@
 import com.google.inject.Singleton;
 
 import me.morpheus.dtpunishment.configuration.ChatConfig;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.entity.living.player.Player;
 
-@Singleton
 public class WordChecker {
 
 	private ChatConfig chatConfig;
@@ -30,10 +31,8 @@ public class WordChecker {
 
 	private Pattern characterSpamRegexPattern;
 
-	@Inject
-	public WordChecker(ChatConfig chatConfig) {
-		this.chatConfig = chatConfig;
-
+	public WordChecker() {
+		this.chatConfig = DTPunishment.getChatConfig();
 		updateFromConfiguration();
 	}
 
@@ -102,8 +101,8 @@ public boolean containsUppercase(String message) {
 		int total = 0;
 
 		for (String word : words) {
+            if (Sponge.getServer().getPlayer(word).isPresent()) continue;
 			String cleaned = word.replaceAll("[\\W]", "");
-
 			total += cleaned.length();
 
 			if (StringUtils.isAllLowerCase(cleaned))

src/main/java/me/morpheus/dtpunishment/WordChecker.java

@@ -1,5 +1,6 @@
 package me.morpheus.dtpunishment.commands;
 
+import me.morpheus.dtpunishment.DTPunishment;
 import org.spongepowered.api.command.CommandException;
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.command.CommandSource;
@@ -16,12 +17,7 @@
 
 public class CommandLastOffence implements CommandExecutor {
 
-	private ChatOffenceData chatOffenceData;
-
-	@Inject
-	public CommandLastOffence(ChatOffenceData chatOffenceData) {
-		this.chatOffenceData = chatOffenceData;
-	}
+	private ChatOffenceData chatOffenceData = DTPunishment.getOffenceData();
 
 	@Override
 	public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {