Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-07-03 10:14:46 +02:00
Code Issues Projects Releases Wiki Activity

#1102 commands.yml file should not have any commands by default

Browse Source
This commit is contained in:
ljacqu 2017-02-20 21:11:57 +01:00
parent 39395836b4
commit 57ca81f2ba
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -241,8 +241,8 @@
<shadedPattern>fr.xephi.authme.libs.jalu.injector</shadedPattern> <shadedPattern>fr.xephi.authme.libs.jalu.injector</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.github.authme.configme</pattern> <pattern>ch.jalu.configme</pattern>
<shadedPattern>fr.xephi.authme.libs.authme.configme</shadedPattern> <shadedPattern>fr.xephi.authme.libs.jalu.configme</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.zaxxer.hikari</pattern> <pattern>com.zaxxer.hikari</pattern>
@ -892,7 +892,7 @@
<dependency> <dependency>
<groupId>ch.jalu</groupId> <groupId>ch.jalu</groupId>
<artifactId>configme</artifactId> <artifactId>configme</artifactId>
<version>0.3</version> <version>0.4</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
@ -923,7 +923,7 @@
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
<version>2.4.1</version> <version>2.7.9</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest-core</artifactId>

7
src/main/resources/commands.yml
View File

@ -20,7 +20,6 @@
# executor: CONSOLE # executor: CONSOLE
# #
# Supported command events: onLogin, onJoin, onRegister # Supported command events: onLogin, onJoin, onRegister
onLogin: onJoin: {}
welcome: onLogin: {}
command: 'msg %p Welcome back!' onRegister: {}
executor: 'PLAYER'

7
src/test/java/tools/filegeneration/GenerateCommandsYml.java
View File

@ -2,11 +2,8 @@ package tools.filegeneration;
import ch.jalu.configme.SettingsManager; import ch.jalu.configme.SettingsManager;
import ch.jalu.configme.resource.YamlFileResource; import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap;
import fr.xephi.authme.settings.commandconfig.Command;
import fr.xephi.authme.settings.commandconfig.CommandConfig; import fr.xephi.authme.settings.commandconfig.CommandConfig;
import fr.xephi.authme.settings.commandconfig.CommandSettingsHolder; import fr.xephi.authme.settings.commandconfig.CommandSettingsHolder;
import fr.xephi.authme.settings.commandconfig.Executor;
import tools.utils.AutoToolTask; import tools.utils.AutoToolTask;
import tools.utils.ToolsConstants; import tools.utils.ToolsConstants;
@ -23,10 +20,8 @@ public class GenerateCommandsYml implements AutoToolTask {
public void executeDefault() { public void executeDefault() {
File file = new File(COMMANDS_YML_FILE); File file = new File(COMMANDS_YML_FILE);
// Get default and add sample entry // Get the default
CommandConfig commandConfig = CommandSettingsHolder.COMMANDS.getDefaultValue(); CommandConfig commandConfig = CommandSettingsHolder.COMMANDS.getDefaultValue();
commandConfig.setOnLogin(
ImmutableMap.of("welcome", new Command("msg %p Welcome back!", Executor.PLAYER)));
// Export the value to the file // Export the value to the file
SettingsManager settingsManager = new SettingsManager( SettingsManager settingsManager = new SettingsManager(