Upstream
/
HolographicDisplays
mirror of https://github.com/filoghost/HolographicDisplays.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enable colors and custom placeholders inside animations

This commit is contained in:
filoghost 2021-12-31 12:35:19 +01:00
parent 243bf9ea0a
commit a1d3eb5e26
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/config/ConfigManager.java
View File

@ -5,6 +5,7 @@
*/ */
package me.filoghost.holographicdisplays.plugin.config; package me.filoghost.holographicdisplays.plugin.config;
import me.filoghost.fcommons.collection.CollectionUtils;
import me.filoghost.fcommons.config.BaseConfigManager; import me.filoghost.fcommons.config.BaseConfigManager;
import me.filoghost.fcommons.config.Config; import me.filoghost.fcommons.config.Config;
import me.filoghost.fcommons.config.ConfigErrors; import me.filoghost.fcommons.config.ConfigErrors;
@ -17,6 +18,7 @@ import me.filoghost.fcommons.config.exception.ConfigValueException;
import me.filoghost.fcommons.config.mapped.MappedConfigLoader; import me.filoghost.fcommons.config.mapped.MappedConfigLoader;
import me.filoghost.fcommons.logging.ErrorCollector; import me.filoghost.fcommons.logging.ErrorCollector;
import me.filoghost.fcommons.logging.Log; import me.filoghost.fcommons.logging.Log;
import me.filoghost.holographicdisplays.plugin.format.DisplayFormat;
import me.filoghost.holographicdisplays.plugin.internal.hologram.InternalHologramManager; import me.filoghost.holographicdisplays.plugin.internal.hologram.InternalHologramManager;
import me.filoghost.holographicdisplays.plugin.internal.placeholder.AnimationPlaceholder; import me.filoghost.holographicdisplays.plugin.internal.placeholder.AnimationPlaceholder;
import me.filoghost.holographicdisplays.plugin.internal.placeholder.AnimationPlaceholderFactory; import me.filoghost.holographicdisplays.plugin.internal.placeholder.AnimationPlaceholderFactory;
@ -97,10 +99,7 @@ public class ConfigManager extends BaseConfigManager {
animationFiles.filter(this::isYamlFile).forEach(file -> { animationFiles.filter(this::isYamlFile).forEach(file -> {
try { try {
String fileName = file.getFileName().toString(); String fileName = file.getFileName().toString();
AnimationConfig animationConfig = loadAnimation(file); AnimationPlaceholder animationPlaceholder = loadAnimationPlaceholder(file);
AnimationPlaceholder animationPlaceholder = new AnimationPlaceholder(
animationConfig.getIntervalTicks(),
animationConfig.getFrames());
animationsByFileName.put(fileName, animationPlaceholder); animationsByFileName.put(fileName, animationPlaceholder);
} catch (ConfigException e) { } catch (ConfigException e) {
logConfigException(errorCollector, file, e); logConfigException(errorCollector, file, e);
@ -114,9 +113,12 @@ public class ConfigManager extends BaseConfigManager {
return new AnimationPlaceholderFactory(animationsByFileName); return new AnimationPlaceholderFactory(animationsByFileName);
} }
private AnimationConfig loadAnimation(Path animationFile) throws ConfigLoadException, ConfigValueException { private AnimationPlaceholder loadAnimationPlaceholder(Path animationFile) throws ConfigLoadException, ConfigValueException {
FileConfig animationFileConfig = getConfigLoader(animationFile).load(); AnimationConfig animationConfig = new AnimationConfig(getConfigLoader(animationFile).load());
return new AnimationConfig(animationFileConfig); return new AnimationPlaceholder(
animationConfig.getIntervalTicks(),
CollectionUtils.toArrayList(animationConfig.getFrames(), DisplayFormat::apply)
);
} }
public void reloadStaticReplacements(ErrorCollector errorCollector) { public void reloadStaticReplacements(ErrorCollector errorCollector) {