From e87beeced4b22ea98923086a6ca942d66adfe956 Mon Sep 17 00:00:00 2001 From: Esophose Date: Sat, 13 Jun 2020 14:30:47 -0600 Subject: [PATCH] Update particle spawner --- .../particles/version/VersionMapping16.java | 2 + .../nms/v1_15_R1/ParticleHandlerImpl.java | 2 +- Plugin/build.gradle | 2 +- .../styles/ParticleStyleThick.java | 2 +- changelog.txt | 47 ++++++++++++++++++- 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/Particles/Wrapper/src/main/java/dev/esophose/playerparticles/particles/version/VersionMapping16.java b/Particles/Wrapper/src/main/java/dev/esophose/playerparticles/particles/version/VersionMapping16.java index c270733..fd11863 100644 --- a/Particles/Wrapper/src/main/java/dev/esophose/playerparticles/particles/version/VersionMapping16.java +++ b/Particles/Wrapper/src/main/java/dev/esophose/playerparticles/particles/version/VersionMapping16.java @@ -80,6 +80,8 @@ public class VersionMapping16 extends VersionMapping { this.put(67, ParticleEffect.DRIPPING_OBSIDIAN_TEAR); this.put(68, ParticleEffect.FALLING_OBSIDIAN_TEAR); this.put(69, ParticleEffect.LANDING_OBSIDIAN_TEAR); + this.put(70, ParticleEffect.REVERSE_PORTAL); + this.put(71, ParticleEffect.WHITE_ASH); }}; } diff --git a/Particles/v1_15_R1/src/main/java/dev/esophose/playerparticles/nms/v1_15_R1/ParticleHandlerImpl.java b/Particles/v1_15_R1/src/main/java/dev/esophose/playerparticles/nms/v1_15_R1/ParticleHandlerImpl.java index 7c6ea73..11bcfd3 100644 --- a/Particles/v1_15_R1/src/main/java/dev/esophose/playerparticles/nms/v1_15_R1/ParticleHandlerImpl.java +++ b/Particles/v1_15_R1/src/main/java/dev/esophose/playerparticles/nms/v1_15_R1/ParticleHandlerImpl.java @@ -71,7 +71,7 @@ public class ParticleHandlerImpl extends ParticleHandler { try { for (Player player : players) { - protocolManager.sendWirePacket(player, 0x24, bytes); + protocolManager.sendWirePacket(player, 0x23, bytes); } } catch (Exception ex) { ex.printStackTrace(); diff --git a/Plugin/build.gradle b/Plugin/build.gradle index 64cb87b..144277b 100644 --- a/Plugin/build.gradle +++ b/Plugin/build.gradle @@ -20,7 +20,7 @@ dependencies { shadow 'org.jetbrains:annotations:16.0.2' shadow 'me.clip:placeholderapi:2.10.4' shadow 'org.xerial:sqlite-jdbc:3.23.1' - shadow 'com.comphenix.protocol:ProtocolLib:4.5.0' + shadow 'com.comphenix.protocol:ProtocolLib:4.5.1' shadow 'com.googlecode.json-simple:json-simple:1.1.1' // Dependencies that will be shaded into the jar diff --git a/Plugin/src/main/java/dev/esophose/playerparticles/styles/ParticleStyleThick.java b/Plugin/src/main/java/dev/esophose/playerparticles/styles/ParticleStyleThick.java index 02cb74a..c95ba36 100644 --- a/Plugin/src/main/java/dev/esophose/playerparticles/styles/ParticleStyleThick.java +++ b/Plugin/src/main/java/dev/esophose/playerparticles/styles/ParticleStyleThick.java @@ -38,7 +38,7 @@ public class ParticleStyleThick extends DefaultParticleStyle { @Override protected void setDefaultSettings(CommentedFileConfiguration config) { - this.setIfNotExists("multiplier", 1, "The multiplier for the number of particles to spawn", "This style uses the same spawning as the 'normal' style"); + this.setIfNotExists("multiplier", 3, "The multiplier for the number of particles to spawn", "This style uses the same spawning as the 'normal' style"); } @Override diff --git a/changelog.txt b/changelog.txt index 333accd..72be7e7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,51 @@ +=== v7.13 === ++ Added particles for Minecraft 1.16 ++ Added getVersion() method to API +=== v7.12 === ++ Added WorldGuard region support ++ Added permission 'playerparticles.worldguard.bypass' ++ Added placeholder %playerparticles_is_in_allowed_region% +* Fixed empty player list bug with versions older than 1.9 +=== v7.11 === ++ Added support for Spigot 1.8.8 and 1.7.10. I make no guarantees this will work perfectly. +* The plugin will now disable and print an error message on startup if the server is running CraftBukkit +* Removed deprecated API +* Other API-breaking changes (Moved the color data classes to a different package) +* Removed the version number from generating in new config.yml files +=== v7.10 === ++ Added command '/pp reset ' to be able to reset the particles of an offline player + - Permission: 'playerparticles.reset.others' ++ Added permissions for maximum particles, groups, and fixed effects (values in the config are now the lower bounds) + - playerparticles.particles.max. + - playerparticles.groups.max. + - playerparticles.fixed.max. +* The 'swords' style now lets you edit what is considered a sword in its settings file +* Fixed wooden swords not being counted with the 'swords' style in 1.13+ +* Fixed the 'fishing' style causing particles to spawn for users who don't even have it applied +* Fixed effect permissions being registered with the server even if they aren't supported +=== v7.9 === ++ Added options DISPLAY_NORMAL and DISPLAY_OVERHEAD to toggle-on-move ++ Added setting in each style setting file for can-toggle-on-combat +* Fixed performance issues with toggle-on-move setting +* Fixed possible concurrency deadlock with arrows and fishing styles +=== v7.8 === ++ Added style 'fishing' +* Moved GUI icon settings from the config.yml to the effects/ and styles/ files. You will need to set these again. +* Fixed the messages-enabled setting not working at all +* Changed toggle-on-move to have three different setting values (DISPLAY_MOVE, HIDE, NONE) +* Changed how particle styles are registered, deprecated old API methods for style registration +=== v7.7 === +* Fixed an error with the style 'blockplace' +=== v7.6 === ++ Added style 'teleport' (Thanks HexedHero) +* Fixed being able to take items out of GUI when opened from a separate GUI plugin +* Fixed a possible ConcurrentModificationException +* Fixed a missing message in de_DE === v7.5 === + Added style 'trail' -* Adjusted the 'normal' style a bit (also includes thick, and move) ++ Added settings for MySQL table prefix and connection pool size +* Fixed preset groups loaded with '/pp group load' not saving correctly +* Fixed possible database connection loss for MySQL === v7.4 === * Fixed '/pp fixed teleport' not working due to async event issues * Fixed issue with a fixed celebration effect while vanished