From 6fb18325f15e09a0ac437a1d88b266bb5b8d78f6 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 28 Aug 2020 20:57:25 +0100 Subject: [PATCH] Removed StringUtils class Added random note particle color --- Plugin/pom.xml | 1 - .../ecoenchants/enchantments/Artifact.java | 10 +++++++++- .../com/willfp/ecoenchants/util/StringUtils.java | 16 ---------------- 3 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java diff --git a/Plugin/pom.xml b/Plugin/pom.xml index aeb76a10..82c53cc0 100644 --- a/Plugin/pom.xml +++ b/Plugin/pom.xml @@ -10,7 +10,6 @@ 4.1.0-pre11 - plugin jar diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java index 9486694d..8ea0459d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java @@ -131,11 +131,19 @@ public abstract class Artifact extends EcoEnchant { int ticks = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "particle-tick-delay"); + int noteColor = 0; + AtomicDouble color = new AtomicDouble(0); + if(particle.equals(Particle.NOTE)) { + noteColor = Rand.randInt(0, 24); + color.set((double) noteColor/24); + } + final double finalColor = color.get(); + new BukkitRunnable() { @Override public void run() { if(entity.isOnGround() || entity.isInBlock() || entity.isDead()) this.cancel(); - entity.getLocation().getWorld().spawnParticle(particle, entity.getLocation(), 1, 0, 0, 0, 0, extra, true); + entity.getLocation().getWorld().spawnParticle(particle, entity.getLocation(), 1, 0, 0, 0, finalColor, extra, true); } }.runTaskTimer(Main.getInstance(), 4, ticks); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java deleted file mode 100644 index 48554125..00000000 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.willfp.ecoenchants.util; - -public class StringUtils { - public static String rot13(String input) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < input.length(); i++) { - char c = input.charAt(i); - if (c >= 'a' && c <= 'm') c += 13; - else if (c >= 'A' && c <= 'M') c += 13; - else if (c >= 'n' && c <= 'z') c -= 13; - else if (c >= 'N' && c <= 'Z') c -= 13; - sb.append(c); - } - return sb.toString(); - } -}