H8-Network/VillagerOptimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make console sender reusable

Browse Source
This commit is contained in:
xGinko 2024-01-01 12:49:08 +01:00
parent f68d745c40
commit 013b09bf1e
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
View File

@ -33,6 +33,7 @@ public final class VillagerOptimizer extends JavaPlugin {
private static VillagerCache villagerCache; private static VillagerCache villagerCache;
private static HashMap<String, LanguageCache> languageCacheMap; private static HashMap<String, LanguageCache> languageCacheMap;
private static Config config; private static Config config;
private static ConsoleCommandSender console;
private static Logger logger; private static Logger logger;
public final static Style plugin_style = Style.style(TextColor.color(102,255,230), TextDecoration.BOLD); public final static Style plugin_style = Style.style(TextColor.color(102,255,230), TextDecoration.BOLD);
@ -41,7 +42,7 @@ public final class VillagerOptimizer extends JavaPlugin {
public void onEnable() { public void onEnable() {
instance = this; instance = this;
logger = getLogger(); logger = getLogger();
ConsoleCommandSender console = getServer().getConsoleSender(); console = getServer().getConsoleSender();
console.sendMessage(Component.text("╭────────────────────────────────────────────────────────────╮").style(plugin_style)); console.sendMessage(Component.text("╭────────────────────────────────────────────────────────────╮").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
@ -56,14 +57,22 @@ public final class VillagerOptimizer extends JavaPlugin {
console.sendMessage(Component.text("│ /_/ by xGinko │").style(plugin_style)); console.sendMessage(Component.text("│ /_/ by xGinko │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text("https://github.com/xGinko/VillagerOptimizer").color(NamedTextColor.GRAY)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text("https://github.com/xGinko/VillagerOptimizer")
.color(NamedTextColor.GRAY)).append(Component.text(" │").style(plugin_style)));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text(" ➤ Loading Translations...").style(plugin_style)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text(" ➤ Loading Translations...").style(plugin_style))
.append(Component.text(" │").style(plugin_style)));
reloadLang(true); reloadLang(true);
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text(" ➤ Loading Config...").style(plugin_style)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text(" ➤ Loading Config...").style(plugin_style))
.append(Component.text(" │").style(plugin_style)));
reloadConfiguration(); reloadConfiguration();
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text(" ✓ Done.").color(NamedTextColor.WHITE).decorate(TextDecoration.BOLD)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text(" ✓ Done.").color(NamedTextColor.WHITE).decorate(TextDecoration.BOLD))
.append(Component.text(" │").style(plugin_style)));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("╰────────────────────────────────────────────────────────────╯").style(plugin_style)); console.sendMessage(Component.text("╰────────────────────────────────────────────────────────────╯").style(plugin_style));
@ -82,6 +91,9 @@ public final class VillagerOptimizer extends JavaPlugin {
public static VillagerCache getCache() { public static VillagerCache getCache() {
return villagerCache; return villagerCache;
} }
public static ConsoleCommandSender getConsole() {
return console;
}
public static Logger getLog() { public static Logger getLog() {
return logger; return logger;
} }
@ -92,7 +104,8 @@ public final class VillagerOptimizer extends JavaPlugin {
return commandSender instanceof Player player ? getLang(player.locale()) : getLang(config.default_lang); return commandSender instanceof Player player ? getLang(player.locale()) : getLang(config.default_lang);
} }
public static LanguageCache getLang(String lang) { public static LanguageCache getLang(String lang) {
return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase()); if (!config.auto_lang) return languageCacheMap.get(config.default_lang.toString().toLowerCase());
return languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase()));
} }
public void reloadPlugin() { public void reloadPlugin() {
@ -115,7 +128,6 @@ public final class VillagerOptimizer extends JavaPlugin {
private void reloadLang(boolean startup) { private void reloadLang(boolean startup) {
languageCacheMap = new HashMap<>(); languageCacheMap = new HashMap<>();
ConsoleCommandSender console = getServer().getConsoleSender();
try { try {
File langDirectory = new File(getDataFolder() + File.separator + "lang"); File langDirectory = new File(getDataFolder() + File.separator + "lang");
Files.createDirectories(langDirectory.toPath()); Files.createDirectories(langDirectory.toPath());

26
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
View File

@ -33,6 +33,7 @@ public final class VillagerOptimizer extends JavaPlugin {
private static VillagerCache villagerCache; private static VillagerCache villagerCache;
private static HashMap<String, LanguageCache> languageCacheMap; private static HashMap<String, LanguageCache> languageCacheMap;
private static Config config; private static Config config;
private static ConsoleCommandSender console;
private static Logger logger; private static Logger logger;
public final static Style plugin_style = Style.style(TextColor.color(102,255,230), TextDecoration.BOLD); public final static Style plugin_style = Style.style(TextColor.color(102,255,230), TextDecoration.BOLD);
@ -41,7 +42,7 @@ public final class VillagerOptimizer extends JavaPlugin {
public void onEnable() { public void onEnable() {
instance = this; instance = this;
logger = getLogger(); logger = getLogger();
ConsoleCommandSender console = getServer().getConsoleSender(); console = getServer().getConsoleSender();
console.sendMessage(Component.text("╭────────────────────────────────────────────────────────────╮").style(plugin_style)); console.sendMessage(Component.text("╭────────────────────────────────────────────────────────────╮").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
@ -56,14 +57,22 @@ public final class VillagerOptimizer extends JavaPlugin {
console.sendMessage(Component.text("│ /_/ by xGinko │").style(plugin_style)); console.sendMessage(Component.text("│ /_/ by xGinko │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text("https://github.com/xGinko/VillagerOptimizer").color(NamedTextColor.GRAY)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text("https://github.com/xGinko/VillagerOptimizer")
.color(NamedTextColor.GRAY)).append(Component.text(" │").style(plugin_style)));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text(" ➤ Loading Translations...").style(plugin_style)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text(" ➤ Loading Translations...").style(plugin_style))
.append(Component.text(" │").style(plugin_style)));
reloadLang(true); reloadLang(true);
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text(" ➤ Loading Config...").style(plugin_style)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text(" ➤ Loading Config...").style(plugin_style))
.append(Component.text(" │").style(plugin_style)));
reloadConfiguration(); reloadConfiguration();
console.sendMessage(Component.text("│ ").style(plugin_style).append(Component.text(" ✓ Done.").color(NamedTextColor.WHITE).decorate(TextDecoration.BOLD)).append(Component.text(" │").style(plugin_style))); console.sendMessage(Component.text("│ ")
.style(plugin_style).append(Component.text(" ✓ Done.").color(NamedTextColor.WHITE).decorate(TextDecoration.BOLD))
.append(Component.text(" │").style(plugin_style)));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("│ │").style(plugin_style)); console.sendMessage(Component.text("│ │").style(plugin_style));
console.sendMessage(Component.text("╰────────────────────────────────────────────────────────────╯").style(plugin_style)); console.sendMessage(Component.text("╰────────────────────────────────────────────────────────────╯").style(plugin_style));
@ -82,6 +91,9 @@ public final class VillagerOptimizer extends JavaPlugin {
public static VillagerCache getCache() { public static VillagerCache getCache() {
return villagerCache; return villagerCache;
} }
public static ConsoleCommandSender getConsole() {
return console;
}
public static Logger getLog() { public static Logger getLog() {
return logger; return logger;
} }
@ -92,7 +104,8 @@ public final class VillagerOptimizer extends JavaPlugin {
return commandSender instanceof Player player ? getLang(player.locale()) : getLang(config.default_lang); return commandSender instanceof Player player ? getLang(player.locale()) : getLang(config.default_lang);
} }
public static LanguageCache getLang(String lang) { public static LanguageCache getLang(String lang) {
return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase()); if (!config.auto_lang) return languageCacheMap.get(config.default_lang.toString().toLowerCase());
return languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase()));
} }
public void reloadPlugin() { public void reloadPlugin() {
@ -115,7 +128,6 @@ public final class VillagerOptimizer extends JavaPlugin {
private void reloadLang(boolean startup) { private void reloadLang(boolean startup) {
languageCacheMap = new HashMap<>(); languageCacheMap = new HashMap<>();
ConsoleCommandSender console = getServer().getConsoleSender();
try { try {
File langDirectory = new File(getDataFolder() + File.separator + "lang"); File langDirectory = new File(getDataFolder() + File.separator + "lang");
Files.createDirectories(langDirectory.toPath()); Files.createDirectories(langDirectory.toPath());