Safe Upgrade from Effectlib 5.9 -> 6.x+

Temporary

Author: ShinyDeagle

src/com/nisovin/magicspells/spelleffects/ParticleLineEffect.java

@@ -27,8 +27,11 @@ public void loadFromString(String string) {
 			if (data.length >= 8) color = ColorUtil.getColorFromHexString(data[7]);
 		}
 		EffectPackage pkg = ParticleNameUtil.findEffectPackage(name);
-		data = pkg.data;
-		effect = pkg.effect;
+		canRender = pkg.canRender();
+		if (canRender) {
+			data = pkg.data;
+			effect = pkg.effect;
+		}
 	}
 
 	@Override

src/com/nisovin/magicspells/spelleffects/ParticlesEffect.java

@@ -163,6 +163,8 @@ public class ParticlesEffect extends SpellEffect {
 	Color color = null;
 	ParticleData data = null;
 
+	boolean canRender;
+
 	@Override
 	public void loadFromString(String string) {
 		if (string != null && !string.isEmpty()) {
@@ -179,8 +181,11 @@ public void loadFromString(String string) {
 			if (data.length >= 7) color = ColorUtil.getColorFromHexString(data[6]);
 		}
 		EffectPackage pkg = ParticleNameUtil.findEffectPackage(name);
-		this.data = pkg.data;
-		this.effect = pkg.effect;
+		canRender = pkg.canRender();
+		if (canRender) {
+			data = pkg.data;
+			effect = pkg.effect;
+		}
 	}
 
 	@Override
@@ -198,14 +203,17 @@ public void loadFromConfig(ConfigurationSection config) {
 		renderDistance = config.getInt("render-distance", renderDistance);
 		color = ColorUtil.getColorFromHexString(config.getString("color", null));
 		EffectPackage pkg = ParticleNameUtil.findEffectPackage(name);
-		data = pkg.data;
-		effect = pkg.effect;
+		canRender = pkg.canRender();
+		if (canRender) {
+			data = pkg.data;
+			effect = pkg.effect;
+		}
 	}
 
 	@Override
 	public Runnable playEffectLocation(Location location) {
 		//ParticleData data, Location center, Color color, double range, float offsetX, float offsetY, float offsetZ, float speed, int amount
-		effect.display(data, location.clone().add(0, yOffset, 0), color, renderDistance, xSpread, ySpread, zSpread, speed, count);
+		if (canRender) effect.display(data, location.clone().add(0, yOffset, 0), color, renderDistance, xSpread, ySpread, zSpread, speed, count);
 		//MagicSpells.getVolatileCodeHandler().playParticleEffect(location, name, xSpread, ySpread, zSpread, speed, count, renderDistance, yOffset);
 		return null;
 	}

src/com/nisovin/magicspells/spells/instant/ParticleProjectileSpell.java

@@ -107,6 +107,8 @@ public class ParticleProjectileSpell extends InstantSpell implements TargetedLoc
 	ParticleEffect effect;
 	ParticleData data;
 
+	boolean canRender;
+
 	public ParticleProjectileSpell(MagicConfig config, String spellName) {
 		super(config, spellName);
 
@@ -191,8 +193,11 @@ public ParticleProjectileSpell(MagicConfig config, String spellName) {
 		this.durationSpellName = getConfigString("spell-on-duration-end", defaultSpellName);
 
 		EffectPackage pkg = ParticleNameUtil.findEffectPackage(this.particleName);
-		this.effect = pkg.effect;
-		this.data = pkg.data;
+		canRender = pkg.canRender();
+		if (canRender) {
+			data = pkg.data;
+			effect = pkg.effect;
+		}
 	}
 
 	@Override
@@ -375,7 +380,7 @@ public void run() {
 			if (projectileHorizGravity != 0 || projectileVertGravity != 0) this.currentLocation.setDirection(currentVelocity);
 
 			// Show particle
-			effect.display(data, this.currentLocation, null, renderDistance, particleXSpread, particleYSpread, particleZSpread, particleSpeed, particleCount);
+			if (canRender) effect.display(data, this.currentLocation, null, renderDistance, particleXSpread, particleYSpread, particleZSpread, particleSpeed, particleCount);
 
 			// Play effects
 			if (specialEffectInterval > 0 && this.counter % specialEffectInterval == 0) playSpellEffects(EffectPosition.SPECIAL, this.currentLocation);

src/com/nisovin/magicspells/spells/targeted/HomingMissileSpell.java

@@ -74,6 +74,8 @@ public class HomingMissileSpell extends TargetedSpell implements TargetedEntityS
 
 	int intermediateSpecialEffects = 0;
 
+	boolean canRender;
+
 	public HomingMissileSpell(MagicConfig config, String spellName) {
 		super(config, spellName);
 
@@ -116,9 +118,12 @@ public HomingMissileSpell(MagicConfig config, String spellName) {
 		intermediateSpecialEffects = getConfigInt("intermediate-special-effect-locations", 0);
 		if (intermediateSpecialEffects < 0) intermediateSpecialEffects = 0;
 
-		EffectPackage pkg = ParticleNameUtil.findEffectPackage(particleName);
-		effect = pkg.effect;
-		data = pkg.data;
+		EffectPackage pkg = ParticleNameUtil.findEffectPackage(this.particleName);
+		canRender = pkg.canRender();
+		if (canRender) {
+			data = pkg.data;
+			effect = pkg.effect;
+		}
 	}
 
 	@Override
@@ -336,7 +341,7 @@ private void playIntermediateEffectLocations(Location old, Vector movement) {
 
 		private void playMissileEffect(Location loc) {
 			// Show particle
-			if (useParticles) {
+			if (useParticles && canRender) {
 				//MagicSpells.getVolatileCodeHandler().playParticleEffect(currentLocation, particleName, particleHorizontalSpread, particleVerticalSpread, particleSpeed, particleCount, renderDistance, 0F);
 
 				effect.display(data, loc, null, renderDistance, particleHorizontalSpread, particleVerticalSpread, particleHorizontalSpread, particleSpeed, particleCount);

src/com/nisovin/magicspells/spells/targeted/OrbitSpell.java

@@ -77,6 +77,8 @@ public class OrbitSpell extends TargetedSpell implements TargetedEntitySpell {
 	ParticleEffect effect;
 	ParticleData data;
 
+	boolean canRender;
+
 	public OrbitSpell(MagicConfig config, String spellName) {
 		super(config, spellName);
 
@@ -114,9 +116,12 @@ public OrbitSpell(MagicConfig config, String spellName) {
 		stopOnHitEntity = getConfigBoolean("stop-on-hit-entity", false);
 		stopOnHitGround = getConfigBoolean("stop-on-hit-ground", false);
 		//TODO add color config
-		EffectPackage pkg = ParticleNameUtil.findEffectPackage(particleName);
-		effect = pkg.effect;
-		data = pkg.data;
+		EffectPackage pkg = ParticleNameUtil.findEffectPackage(this.particleName);
+		canRender = pkg.canRender();
+		if (canRender) {
+			data = pkg.data;
+			effect = pkg.effect;
+		}
 
 		groundSpellName = getConfigString("spell-on-hit-ground", "");
 		entitySpellName = getConfigString("spell-on-hit-entity", "");
@@ -250,7 +255,7 @@ public void run() {
 			//MagicSpells.getVolatileCodeHandler().playParticleEffect(loc, particleName, particleHorizontalSpread, particleVerticalSpread, particleSpeed, particleCount, renderDistance, 0F);
 
 			playSpellEffects(EffectPosition.SPECIAL, loc);
-			effect.display(data, loc, particleColor, renderDistance, particleHorizontalSpread, particleVerticalSpread, particleHorizontalSpread, particleSpeed, particleCount);
+			if (canRender) effect.display(data, loc, particleColor, renderDistance, particleHorizontalSpread, particleVerticalSpread, particleHorizontalSpread, particleSpeed, particleCount);
 
 			// Cast the spell at the location if it isn't null
 			if (orbitSpell != null) orbitSpell.castAtLocation(caster, loc, power);

src/com/nisovin/magicspells/util/EffectPackage.java

@@ -7,10 +7,27 @@ public class EffectPackage {
 
 	public ParticleEffect effect;
 	public ParticleData data;
-	
+
+	/**
+	 * Whether or not the particle effect should be rendered
+	 */
+	public boolean render;
+
+	/**
+	 * An empty effect package with render set to false.
+	 */
+	public EffectPackage() {
+		this.render = false;
+	}
+
 	public EffectPackage(ParticleEffect effect, ParticleData data) {
 		this.effect = effect;
 		this.data = data;
+		this.render = true;
+	}
+
+	public boolean canRender() {
+		return this.render;
 	}
 
 }

src/com/nisovin/magicspells/util/ParticleNameUtil.java

@@ -22,6 +22,7 @@ public static EffectPackage findEffectPackage(String name) {
 		ParticleData data = null;
 		ParticleEffect effect = null;
 		String[] splits = name.split("_");
+		if (splits[0].equalsIgnoreCase("take")) return new EffectPackage();
 		effect = ParticleEffect.fromName(splits[0]);
 
 		if (splits.length > 1) {