feat: Extract "color" from "argb-color"

Author: JasperLorelai

core/src/main/java/com/nisovin/magicspells/spelleffects/effecttypes/ParticlesEffect.java

@@ -32,7 +32,9 @@ public class ParticlesEffect extends SpellEffect {
 
 	protected ConfigData<Particle> particle;
 
+	protected ConfigData<Color> rgbColor;
 	protected ConfigData<Color> argbColor;
+
 	protected ConfigData<Material> material;
 	protected ConfigData<BlockData> blockData;
 	protected ConfigData<DustOptions> dustOptions;
@@ -70,7 +72,9 @@ public class ParticlesEffect extends SpellEffect {
 	public void loadFromConfig(ConfigurationSection config) {
 		particle = ConfigDataUtil.getParticle(config, "particle-name", Particle.POOF);
 
-		argbColor = ConfigDataUtil.getARGBColor(config, "argb-color", null);
+		rgbColor = ConfigDataUtil.getColor(config, "color", null);
+		argbColor = ConfigDataUtil.getARGBColor(config, "argb-color", null).orDefault(rgbColor);
+
 		material = ConfigDataUtil.getMaterial(config, "material", null);
 		blockData = ConfigDataUtil.getBlockData(config, "material", null);
 		dustOptions = ConfigDataUtil.getDustOptions(config, "color", "size", new DustOptions(Color.RED, 1));
@@ -154,6 +158,12 @@ public Runnable playEffectLocation(Location location, SpellData data) {
 	protected Object getParticleData(@NotNull Particle particle, @Nullable Entity entity, @NotNull Location location, @NotNull SpellData data) {
 		Class<?> type = particle.getDataType();
 
+		if (type == Color.class) {
+			return particle == Particle.ENTITY_EFFECT ?
+				argbColor.get(data) :
+				rgbColor.get(data);
+		}
+
 		if (type == ItemStack.class) {
 			Material material = this.material.get(data);
 			return material == null ? null : new ItemStack(material);
@@ -216,7 +226,6 @@ protected Object getParticleData(@NotNull Particle particle, @Nullable Entity en
 		if (type == DustOptions.class) return dustOptions.get(data);
 		if (type == Particle.Spell.class) return spellOptions.get(data);
 		if (type == DustTransition.class) return dustTransition.get(data);
-		if (type == Color.class) return argbColor.get(data);
 
 		return switch (particle) {
 			case SHRIEK -> shriekDelay.get(data);

core/src/main/java/com/nisovin/magicspells/spells/targeted/ParticleCloudSpell.java

@@ -32,7 +32,9 @@ public class ParticleCloudSpell extends TargetedSpell implements TargetedLocatio
 
 	private final ConfigData<Component> customName;
 
-	private final ConfigData<Color> color;
+	private final ConfigData<Color> rgbColor;
+	private final ConfigData<Color> argbColor;
+
 	private final ConfigData<ItemStack> item;
 	private final ConfigData<BlockData> blockData;
 	private final ConfigData<DustOptions> dustOptions;
@@ -104,8 +106,8 @@ public ParticleCloudSpell(MagicConfig config, String spellName) {
 		sculkChargeRotation = getConfigDataFloat("sculk-charge-rotation", 0);
 
 		ConfigData<Integer> colorInt = getConfigDataInt("color", 0xFF0000);
-		color = ConfigDataUtil.getARGBColor(config.getMainConfig(), internalKey + "argb-color", null)
-				.orDefault(data -> Color.fromRGB(colorInt.get(data)));
+		rgbColor = getConfigDataColor("color", null).orDefault(data -> Color.fromRGB(colorInt.get(data)));
+		argbColor = ConfigDataUtil.getARGBColor(config.getMainConfig(), internalKey + "argb-color", null).orDefault(rgbColor);
 
 		waitTime = getConfigDataInt("wait-time-ticks", 10);
 		ticksDuration = getConfigDataInt("duration-ticks", 3 * TimeUtil.TICKS_PER_SECOND);
@@ -199,13 +201,18 @@ private CastResult spawnCloud(SpellData data) {
 	private Object getParticleData(@NotNull Particle particle, @NotNull SpellData data) {
 		Class<?> type = particle.getDataType();
 
-		if (type == Color.class) return color.get(data);
 		if (type == ItemStack.class) return item.get(data);
 		if (type == BlockData.class) return blockData.get(data);
 		if (type == DustOptions.class) return dustOptions.get(data);
 		if (type == Particle.Spell.class) return spellOptions.get(data);
 		if (type == DustTransition.class) return dustTransition.get(data);
 
+		if (type == Color.class) {
+			return particle == Particle.ENTITY_EFFECT ?
+				argbColor.get(data) :
+				rgbColor.get(data);
+		}
+
 		return switch (particle) {
 			case SHRIEK -> shriekDelay.get(data);
 			case DRAGON_BREATH -> dragonBreathPower.get(data);