From 83b7f909765bf11b42a010c05197d1f10cf56390 Mon Sep 17 00:00:00 2001 From: ineanto Date: Thu, 5 Oct 2023 13:43:50 +0200 Subject: [PATCH] feat-gui-i18n: wrong branch rebase (#5) Reviewed-on: https://ineanto.xyz/git/ineanto/nicko/pulls/5 Co-authored-by: ineanto Co-committed-by: ineanto --- src/main/java/xyz/atnrch/nicko/NickoBukkit.java | 6 ++---- src/main/resources/config.yml | 6 +++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/xyz/atnrch/nicko/NickoBukkit.java b/src/main/java/xyz/atnrch/nicko/NickoBukkit.java index ec82768..13ab606 100644 --- a/src/main/java/xyz/atnrch/nicko/NickoBukkit.java +++ b/src/main/java/xyz/atnrch/nicko/NickoBukkit.java @@ -2,9 +2,7 @@ package xyz.atnrch.nicko; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.command.PluginCommand; import org.bukkit.plugin.java.JavaPlugin; -import xyz.atnrch.nicko.command.NickoCommand; import xyz.atnrch.nicko.config.Configuration; import xyz.atnrch.nicko.config.ConfigurationManager; import xyz.atnrch.nicko.event.PlayerJoinListener; @@ -84,10 +82,10 @@ public class NickoBukkit extends JavaPlugin { } } - final PluginCommand command = getCommand("nicko"); + /*final PluginCommand command = getCommand("nicko"); if (command != null) { command.setExecutor(new NickoCommand()); - } + }*/ Structure.addGlobalIngredient('#', new SimpleItem(new ItemBuilder(Material.AIR))); Structure.addGlobalIngredient('%', new SimpleItem(new ItemBuilder(Material.BLACK_STAINED_GLASS_PANE).setDisplayName(" "))); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 0f162c9..9b854cd 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -21,9 +21,13 @@ customLocale: false # This configuration section manages SQL. sql: # Indicates wherever the data will be stored locally - # inside a .json file or in a SQL database. + # inside a .json file or in an SQL database. # Accepted values: false (Disabled), true (Enabled) enabled: false + # Toggles between the MariaDB and MySQL drivers. + # If you use the MySQL database engine, switch this to off. + # Accepted values: false (Disabled), true (Enabled) + mariadb: true # SQL database's address # Accepted values: valid IP address (e.g. localhost, 127.0.0.1) address: "localhost"