TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2024-12-28 10:24:15 +00:00
Code Issues Projects Releases Wiki Activity

Alphabetize and fix registering event-based styles

Browse source
This commit is contained in:
Esophose 2020-04-15 04:08:44 -06:00
parent ecf5162ed4
commit b2a5aa2eab
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/dev/esophose/playerparticles/manager/ParticleStyleManager.java
View file

@ -6,6 +6,7 @@ import dev.esophose.playerparticles.styles.DefaultStyles;
import dev.esophose.playerparticles.styles.ParticleStyle;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
@ -38,15 +39,17 @@ public class ParticleStyleManager extends Manager {
Bukkit.getPluginManager().callEvent(event);
Collection<ParticleStyle> eventStyles = event.getRegisteredEventStyles().values();
for (ParticleStyle style : event.getRegisteredStyles().values()) {
try {
if (style == null) {
throw new IllegalArgumentException("Tried to register a null style");
}
List<ParticleStyle> styles = new ArrayList<>(event.getRegisteredStyles().values());
styles.addAll(eventStyles);
styles.sort(Comparator.comparing(ParticleStyle::getName));
if (style.getInternalName() == null || style.getInternalName().trim().equals("")) {
for (ParticleStyle style : styles) {
try {
if (style == null)
throw new IllegalArgumentException("Tried to register a null style");
if (style.getInternalName() == null || style.getInternalName().trim().isEmpty())
throw new IllegalArgumentException("Tried to register a style with a null or empty name: '" + style.getInternalName() + "'");
}
for (ParticleStyle testAgainst : this.styles) {
if (testAgainst.equals(style)) {