diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java index 793e773..afd1729 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java @@ -23,8 +23,8 @@ import com.cryptomorin.xseries.XItemStack; import com.cryptomorin.xseries.XMaterial; import com.cryptomorin.xseries.XSound; import net.tylermurphy.hideAndSeek.Main; -import net.tylermurphy.hideAndSeek.util.CountdownDisplay; -import net.tylermurphy.hideAndSeek.util.Version; +import net.tylermurphy.hideAndSeek.game.util.CountdownDisplay; +import net.tylermurphy.hideAndSeek.game.util.Version; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; @@ -266,7 +266,7 @@ public class Config { countdownDisplay = CountdownDisplay.valueOf(config.getString("hideCountdownDisplay")); } catch (IllegalArgumentException e) { countdownDisplay = CountdownDisplay.CHAT; - Main.plugin.getLogger().warning("hideCountdownDisplay: "+config.getString("hideCountdownDisplay")+" is not a valid configuration option!"); + Main.getInstance().getLogger().warning("hideCountdownDisplay: "+config.getString("hideCountdownDisplay")+" is not a valid configuration option!"); } blockedInteracts = new ArrayList<>(); List<String> tempInteracts = config.getStringList("blockedInteracts"); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java index 5954d05..3a95fe9 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java @@ -47,9 +47,9 @@ public class ConfigManager { private ConfigManager(String filename, String defaultFilename) { this.defaultFilename = defaultFilename; - this.file = new File(Main.data, filename); + this.file = new File(Main.getInstance().getDataFolder(), filename); - File folder = Main.data; + File folder = Main.getInstance().getDataFolder(); if (!folder.exists()) { if (!folder.mkdirs()) { throw new RuntimeException("Failed to make directory: " + file.getPath()); @@ -58,7 +58,7 @@ public class ConfigManager { if (!file.exists()) { try{ - InputStream input = Main.plugin.getResource(defaultFilename); + InputStream input = Main.getInstance().getResource(defaultFilename); if (input == null) { throw new RuntimeException("Could not create input stream for "+defaultFilename); } @@ -181,7 +181,7 @@ public class ConfigManager { public void resetFile(String newDefaultFilename) { this.defaultFilename = newDefaultFilename; - InputStream input = Main.plugin.getResource(defaultFilename); + InputStream input = Main.getInstance().getResource(defaultFilename); if (input == null) { throw new RuntimeException("Could not create input stream for "+defaultFilename); } @@ -214,7 +214,7 @@ public class ConfigManager { public void saveConfig() { try { - InputStream is = Main.plugin.getResource(defaultFilename); + InputStream is = Main.getInstance().getResource(defaultFilename); if (is == null) { throw new RuntimeException("Could not create input stream for "+defaultFilename); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java index c2d7bed..18a31b2 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java @@ -20,7 +20,7 @@ package net.tylermurphy.hideAndSeek.configuration; import com.cryptomorin.xseries.XItemStack; -import net.tylermurphy.hideAndSeek.util.Version; +import net.tylermurphy.hideAndSeek.game.util.Version; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; |