TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2025-07-08 14:57:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix "random" data not parsing in preset_groups.yml

Browse source
This commit is contained in:
Esophose 2019-12-28 18:28:38 -07:00
parent c0c9ef48ce
commit 909e00ba70
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/dev/esophose/playerparticles/locale/SimplifiedChineseLocale.java
View file

@ -219,7 +219,7 @@ public class SimplifiedChineseLocale implements Locale {
this.put("fixed-invalid-command", "&c你输入了无效的子指令!"); this.put("fixed-invalid-command", "&c你输入了无效的子指令!");
this.put("#25", "Plugin Update Message"); this.put("#25", "Plugin Update Message");
this.put("update-available", "&e有新版本更新：(&b%new%&e)!你使用的版本为&bv%current%&e。 https://songoda.com/marketplace/product/32"); this.put("update-available", "&e有新版本更新：(&b%new%&e)!你使用的版本为&bv%current%&e。 https://www.spigotmc.org/resources/playerparticles.40261/");
this.put("#26", "GUI Messages"); this.put("#26", "GUI Messages");
this.put("gui-disabled", "&c服务器管理员已关闭菜单!"); this.put("gui-disabled", "&c服务器管理员已关闭菜单!");

4
src/main/java/dev/esophose/playerparticles/manager/ParticleGroupPresetManager.java
View file

@ -120,6 +120,8 @@ public class ParticleGroupPresetManager extends Manager {
if (effect == ParticleEffect.NOTE) { if (effect == ParticleEffect.NOTE) {
if (args[0].equalsIgnoreCase("rainbow")) { if (args[0].equalsIgnoreCase("rainbow")) {
noteColorData = new NoteColor(99); noteColorData = new NoteColor(99);
} else if (args[0].equalsIgnoreCase("random")) {
noteColorData = new NoteColor(98);
} else { } else {
int note; int note;
try { try {
@ -139,6 +141,8 @@ public class ParticleGroupPresetManager extends Manager {
} else { } else {
if (args[0].equalsIgnoreCase("rainbow")) { if (args[0].equalsIgnoreCase("rainbow")) {
colorData = new OrdinaryColor(999, 999, 999); colorData = new OrdinaryColor(999, 999, 999);
} else if (args[0].equalsIgnoreCase("random")) {
colorData = new OrdinaryColor(998, 998, 998);
} else { } else {
int r, g, b; int r, g, b;

5
src/main/java/dev/esophose/playerparticles/styles/ParticleStyleWings.java
View file

@ -16,8 +16,9 @@ public class ParticleStyleWings implements ParticleStyle {
List<PParticle> particles = new ArrayList<>(); List<PParticle> particles = new ArrayList<>();
if (spawnTimer == 0) { if (spawnTimer == 0) {
for (double t = 0; t < Math.PI * 2; t += Math.PI / 48) { for (double t = 0; t < Math.PI * 2; t += Math.PI / 48) {
double x = Math.sin(t) * (Math.pow(Math.E, Math.cos(t)) - 2 * Math.cos(t * 4) - Math.pow(Math.sin(t / 12), 5)) / 2; double offset = (Math.pow(Math.E, Math.cos(t)) - 2 * Math.cos(t * 4) - Math.pow(Math.sin(t / 12), 5)) / 2;
double y = Math.cos(t) * (Math.pow(Math.E, Math.cos(t)) - 2 * Math.cos(t * 4) - Math.pow(Math.sin(t / 12), 5)) / 2; double x = Math.sin(t) * offset;
double y = Math.cos(t) * offset;
Vector v = VectorUtils.rotateAroundAxisY(new Vector(x, y, -0.3), -Math.toRadians(location.getYaw())); Vector v = VectorUtils.rotateAroundAxisY(new Vector(x, y, -0.3), -Math.toRadians(location.getYaw()));
particles.add(new PParticle(location.clone().add(v.getX(), v.getY(), v.getZ()))); particles.add(new PParticle(location.clone().add(v.getX(), v.getY(), v.getZ())));
} }