TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-30 02:37:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Load the embed message as default

Browse Source
This commit is contained in:
games647
2016-06-14 17:02:12 +02:00
parent 8abbb8f07c
commit d90e3fdb44
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
View File

@ -1,9 +1,11 @@
package com.github.games647.fastlogin.bukkit; package com.github.games647.fastlogin.bukkit;
import com.github.games647.fastlogin.core.FastLoginCore; import com.github.games647.fastlogin.core.FastLoginCore;
import com.google.common.base.Charsets;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.io.File; import java.io.File;
import java.io.InputStreamReader;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -44,6 +46,11 @@ public class BukkitCore extends FastLoginCore {
File messageFile = new File(plugin.getDataFolder(), "messages.yml"); File messageFile = new File(plugin.getDataFolder(), "messages.yml");
YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile); YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile);
InputStreamReader defaultReader = new InputStreamReader(plugin.getResource("messages.yml"), Charsets.UTF_8);
YamlConfiguration defaults = YamlConfiguration.loadConfiguration(defaultReader);
messageConfig.setDefaults(defaults);
for (String key : messageConfig.getKeys(false)) { for (String key : messageConfig.getKeys(false)) {
String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key)); String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
if (!message.isEmpty()) { if (!message.isEmpty()) {

8
bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
View File

@ -49,9 +49,13 @@ public class BungeeCore extends FastLoginCore {
public void loadMessages() { public void loadMessages() {
try { try {
saveDefaultFile("messages.yml"); saveDefaultFile("messages.yml");
Configuration defaults = ConfigurationProvider.getProvider(YamlConfiguration.class)
.load(getClass().getResourceAsStream("/messages.yml"));
File messageFile = new File(getDataFolder(), "messages.yml"); File messageFile = new File(getDataFolder(), "messages.yml");
Configuration messageConfig = ConfigurationProvider.getProvider(YamlConfiguration.class).load(messageFile); Configuration messageConfig = ConfigurationProvider.getProvider(YamlConfiguration.class)
.load(messageFile, defaults);
for (String key : messageConfig.getKeys()) { for (String key : messageConfig.getKeys()) {
String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key)); String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
if (!message.isEmpty()) { if (!message.isEmpty()) {