Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-11-23 18:45:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix a couple compile errors after a lot of reverts and merges

Browse Source
This commit is contained in:
Christian Koop 2023-05-06 22:16:11 +02:00
parent b6a4198a60
commit 3722ebb46a
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/songoda/core/SongodaPlugin.java
View File

@ -8,7 +8,7 @@ import com.songoda.core.utils.SongodaAuth;
import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion; import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@ -44,7 +44,7 @@ public abstract class SongodaPlugin extends JavaPlugin {
/** /**
* Called after reloadConfig() is called * Called after reloadConfig() is called
*/ */
public abstract @NotNull List<SongodaYamlConfig> getConfigs(); public abstract void onConfigReload();
/** /**
* Any other plugin configuration files used by the plugin. * Any other plugin configuration files used by the plugin.

2
Core/src/main/java/com/songoda/core/configuration/Config.java
View File

@ -1,7 +1,7 @@
package com.songoda.core.configuration; package com.songoda.core.configuration;
import com.songoda.core.utils.TextUtils; import com.songoda.core.utils.TextUtils;
import org.apache.commons.lang.Validate; import org.apache.commons.lang3.Validate;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConstructor; import org.bukkit.configuration.file.YamlConstructor;

16
Core/src/main/java/com/songoda/core/gui/CustomizableGui.java
View File

@ -48,9 +48,19 @@ public class CustomizableGui extends Gui {
Config config = new Config(plugin, "gui/" + guiKey + ".yml"); Config config = new Config(plugin, "gui/" + guiKey + ".yml");
config.load(); config.load();
config.setNodeComment("overrides", "For information on how to apply overrides please visit\n" + if (!config.isConfigurationSection("overrides")) {
"https://wiki.craftaro.com/index.php/Gui"); config.setDefault("overrides.example.item", CompatibleMaterial.STONE.name(),
config.setNodeComment("overrides.example", "This is just an example and does not override to any items in this GUI."); "This is the icon material you would like to replace",
"the current material with.")
.setDefault("overrides.example.position", 5,
"This is the current position of the icon you would like to move.",
"The number represents the cell the icon currently resides in.")
.setDefaultComment("overrides.example",
"This is just an example and does not override to any items",
"in this GUI.")
.setDefaultComment("overrides",
"For information on how to apply overrides please visit",
"https://wiki.craftaro.com/index.php/Gui");
config.saveChanges(); config.saveChanges();
} }

4
Core/src/main/java/com/songoda/core/utils/BlockUtils.java
View File

@ -19,6 +19,10 @@ import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
/**
* @deprecated This class will be removed in the future and replaced with a more maintainable system.
*/
@Deprecated
public class BlockUtils { public class BlockUtils {
protected static final Set<Material> DOORS; protected static final Set<Material> DOORS;
protected static final Set<Material> PRESSURE_PLATES; protected static final Set<Material> PRESSURE_PLATES;