feat-gui-i18n: wrong branch rebase (#5)
Reviewed-on: https://ineanto.xyz/git/ineanto/nicko/pulls/5 Co-authored-by: ineanto <pantoine.rochas@gmail.com> Co-committed-by: ineanto <pantoine.rochas@gmail.com>
This commit is contained in:
parent
929423dfbe
commit
83b7f90976
2 changed files with 7 additions and 5 deletions
|
@ -2,9 +2,7 @@ package xyz.atnrch.nicko;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.command.PluginCommand;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
import xyz.atnrch.nicko.command.NickoCommand;
|
|
||||||
import xyz.atnrch.nicko.config.Configuration;
|
import xyz.atnrch.nicko.config.Configuration;
|
||||||
import xyz.atnrch.nicko.config.ConfigurationManager;
|
import xyz.atnrch.nicko.config.ConfigurationManager;
|
||||||
import xyz.atnrch.nicko.event.PlayerJoinListener;
|
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) {
|
if (command != null) {
|
||||||
command.setExecutor(new NickoCommand());
|
command.setExecutor(new NickoCommand());
|
||||||
}
|
}*/
|
||||||
|
|
||||||
Structure.addGlobalIngredient('#', new SimpleItem(new ItemBuilder(Material.AIR)));
|
Structure.addGlobalIngredient('#', new SimpleItem(new ItemBuilder(Material.AIR)));
|
||||||
Structure.addGlobalIngredient('%', new SimpleItem(new ItemBuilder(Material.BLACK_STAINED_GLASS_PANE).setDisplayName(" ")));
|
Structure.addGlobalIngredient('%', new SimpleItem(new ItemBuilder(Material.BLACK_STAINED_GLASS_PANE).setDisplayName(" ")));
|
||||||
|
|
|
@ -21,9 +21,13 @@ customLocale: false
|
||||||
# This configuration section manages SQL.
|
# This configuration section manages SQL.
|
||||||
sql:
|
sql:
|
||||||
# Indicates wherever the data will be stored locally
|
# 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)
|
# Accepted values: false (Disabled), true (Enabled)
|
||||||
enabled: false
|
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
|
# SQL database's address
|
||||||
# Accepted values: valid IP address (e.g. localhost, 127.0.0.1)
|
# Accepted values: valid IP address (e.g. localhost, 127.0.0.1)
|
||||||
address: "localhost"
|
address: "localhost"
|
||||||
|
|
Loading…
Reference in a new issue