ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

fix: invalid configuration

Browse source
This commit is contained in:
aro 2023-03-06 20:19:42 +01:00
parent 31f5c4d88e
commit 80bd5ff4ab
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
View file

@ -4,17 +4,17 @@ import de.studiocode.invui.gui.structure.Structure;
import de.studiocode.invui.item.builder.ItemBuilder; import de.studiocode.invui.item.builder.ItemBuilder;
import de.studiocode.invui.item.impl.SimpleItem; import de.studiocode.invui.item.impl.SimpleItem;
import net.artelnatif.nicko.command.NickoCommand; import net.artelnatif.nicko.command.NickoCommand;
import net.artelnatif.nicko.config.Configuration;
import net.artelnatif.nicko.config.ConfigurationManager; import net.artelnatif.nicko.config.ConfigurationManager;
import net.artelnatif.nicko.event.PlayerJoinListener; import net.artelnatif.nicko.event.PlayerJoinListener;
import net.artelnatif.nicko.event.PlayerQuitListener; import net.artelnatif.nicko.event.PlayerQuitListener;
import net.artelnatif.nicko.gui.items.main.ExitGUI; import net.artelnatif.nicko.gui.items.main.ExitGUI;
import net.artelnatif.nicko.i18n.Locale; import net.artelnatif.nicko.i18n.Locale;
import net.artelnatif.nicko.i18n.LocaleFileManager; import net.artelnatif.nicko.i18n.LocaleFileManager;
import net.artelnatif.nicko.mojang.MojangAPI;
import net.artelnatif.nicko.placeholder.PlaceHolderHook;
import net.artelnatif.nicko.config.Configuration;
import net.artelnatif.nicko.impl.Internals; import net.artelnatif.nicko.impl.Internals;
import net.artelnatif.nicko.impl.InternalsProvider; import net.artelnatif.nicko.impl.InternalsProvider;
import net.artelnatif.nicko.mojang.MojangAPI;
import net.artelnatif.nicko.placeholder.PlaceHolderHook;
import net.artelnatif.nicko.storage.PlayerDataStore; import net.artelnatif.nicko.storage.PlayerDataStore;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -25,13 +25,11 @@ import org.bukkit.plugin.java.JavaPluginLoader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger;
public class NickoBukkit extends JavaPlugin { public class NickoBukkit extends JavaPlugin {
private static NickoBukkit plugin; private static NickoBukkit plugin;
private ConfigurationManager configManager; private ConfigurationManager configurationManager;
private Logger logger;
private File dataFolder; private File dataFolder;
private MojangAPI mojangAPI; private MojangAPI mojangAPI;
private Configuration configuration; private Configuration configuration;
@ -55,11 +53,11 @@ public class NickoBukkit extends JavaPlugin {
@Override @Override
public void onEnable() { public void onEnable() {
plugin = this; plugin = this;
configManager = new ConfigurationManager(getDataFolder()); configurationManager = new ConfigurationManager(getDataFolder());
configManager.saveDefaultConfig(); configurationManager.saveDefaultConfig();
mojangAPI = new MojangAPI(); mojangAPI = new MojangAPI();
dataStore = new PlayerDataStore(mojangAPI, configuration); dataStore = new PlayerDataStore(mojangAPI, getNickoConfig());
if (!getDataStore().getStorage().isError()) { if (!getDataStore().getStorage().isError()) {
getLogger().info("Loading persistence..."); getLogger().info("Loading persistence...");
@ -125,10 +123,10 @@ public class NickoBukkit extends JavaPlugin {
public Configuration getNickoConfig() { public Configuration getNickoConfig() {
try { try {
if (configuration == null) { return configuration = configManager.load(); } if (configuration == null) { return configuration = configurationManager.load(); }
return configuration; return configuration;
} catch (IOException e) { } catch (IOException e) {
logger.severe("Failed to load configuration file: " + e.getMessage()); getLogger().severe("Failed to load configuration file: " + e.getMessage());
return null; return null;
} }
} }

5
core/src/main/resources/config.yml
View file

@ -36,11 +36,6 @@ prefix: "§8[§6Nicko§8] "
# Accepted values: false (Disabled), true (Enabled) # Accepted values: false (Disabled), true (Enabled)
local: true local: true
# Enables Bungeecord support, switching
# servers will transfer player's disguise.
# Accepted values: false (Disabled), true (Enabled)
bungeecord: false
# Nicko will copy the English locale as "lang.yml" # Nicko will copy the English locale as "lang.yml"
# and will use the translations in that file when "Server Custom" # and will use the translations in that file when "Server Custom"
# is selected as the player's locale. # is selected as the player's locale.

2
core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
View file

@ -25,7 +25,7 @@ public class NickoPluginTest {
@DisplayName("Plugin Initialization") @DisplayName("Plugin Initialization")
public void testPluginInitialization() { public void testPluginInitialization() {
Assertions.assertNotNull(plugin.getDataStore().getStorage().getProvider()); Assertions.assertNotNull(plugin.getDataStore().getStorage().getProvider());
Assertions.assertNotNull(plugin.getConfig()); Assertions.assertNotNull(plugin.getNickoConfig());
} }
@AfterAll @AfterAll