diff --git a/README.md b/README.md index fb3f1ee..660183a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ ![ParticleHats](https://i.imgur.com/0DVAyL4.png) -# ParticleHats -ParticleHats is a cosmetic particle plugin designed to be highly customizable. +# Cosmetics-OG + +Cosmetics-OG is a soft fork of ParticleHats, a cosmetic particle plugin designed to be highly customizable. It is maintained for [TrueOG Network](https://true-og.net/). diff --git a/changelog.txt b/changelog.txt index b5d9e40..17b2392 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,12 @@ -OG-1.0: +OG-0.9.1: + +Merged changes from upstream (ParticleHats 4.4.1): + +- Added missing CHERRY_LEAVES particle. +- Removed experimental cherry particles that were replaced by the CHERRY_LEAVES particle +- Updated en_US.lang with missing particle description + +OG-0.9: - Removed unbuildable dependencies - Restructured project root diff --git a/pom.xml b/pom.xml index 9be4d95..b1bca35 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mediusecho ParticleHats - 4.4.0 + 4.4.1 ParticleHats src diff --git a/src/com/mediusecho/particlehats/ParticleHats.java b/src/com/mediusecho/particlehats/ParticleHats.java index a9b15aa..f61066e 100644 --- a/src/com/mediusecho/particlehats/ParticleHats.java +++ b/src/com/mediusecho/particlehats/ParticleHats.java @@ -88,7 +88,7 @@ public class ParticleHats extends JavaPlugin { private YamlConfiguration lang; // Update en_US.lang version as well. - private final double LANG_VERSION = 1.11; + private final double LANG_VERSION = 1.12; private ConcurrentHashMap entityState; diff --git a/src/com/mediusecho/particlehats/locale/Message.java b/src/com/mediusecho/particlehats/locale/Message.java index 365e482..d003627 100644 --- a/src/com/mediusecho/particlehats/locale/Message.java +++ b/src/com/mediusecho/particlehats/locale/Message.java @@ -391,12 +391,8 @@ public enum Message { PARTICLE_SCULK_CHARGE_POP_DESCRIPTION, PARTICLE_SHRIEK_NAME, PARTICLE_SHRIEK_DESCRIPTION, - PARTICLE_DRIPPING_CHERRY_LEAVES_NAME, - PARTICLE_DRIPPING_CHERRY_LEAVES_DESCRIPTION, - PARTICLE_FALLING_CHERRY_LEAVES_NAME, - PARTICLE_FALLING_CHERRY_LEAVES_DESCRIPTION, - PARTICLE_LANDING_CHERRY_LEAVES_NAME, - PARTICLE_LANDING_CHERRY_LEAVES_DESCRIPTION, + PARTICLE_CHERRY_LEAVES_NAME, + PARTICLE_CHERRY_LEAVES_DESCRIPTION, /** * Location diff --git a/src/com/mediusecho/particlehats/particles/ParticleEffect.java b/src/com/mediusecho/particlehats/particles/ParticleEffect.java index 96526aa..82c9fb2 100644 --- a/src/com/mediusecho/particlehats/particles/ParticleEffect.java +++ b/src/com/mediusecho/particlehats/particles/ParticleEffect.java @@ -118,9 +118,7 @@ public enum ParticleEffect { SCULK_CHARGE (98, -1, 19, CompatibleMaterial.SCULK_SENSOR, ParticleProperty.FLOAT), SCULK_CHARGE_POP (99, -1, 19, CompatibleMaterial.SCULK_VEIN), SHRIEK (100, -1, 19, CompatibleMaterial.SCULK_SHRIEKER, ParticleProperty.INTEGER), - DRIPPING_CHERRY_LEAVES(101, -1, 19.4, CompatibleMaterial.CHERRY_LEAVES), - FALLING_CHERRY_LEAVES(102, -1, 19.4, CompatibleMaterial.CHERRY_LOG), - LANDING_CHERRY_LEAVES(103, -1, 19.4, CompatibleMaterial.CHERRY_WOOD), + CHERRY_LEAVES(101, -1, 20, CompatibleMaterial.CHERRY_LEAVES), ; private static final Map particleNames = new HashMap(); diff --git a/src/lang/en_US.lang b/src/lang/en_US.lang index 9486e40..21b4202 100644 --- a/src/lang/en_US.lang +++ b/src/lang/en_US.lang @@ -16,7 +16,7 @@ # # ############################################################################# -version: 1.11 +version: 1.12 # Called if there was an issue retrieving a message unknown: "&cUnknown Message" @@ -515,12 +515,8 @@ particle_sculk_charge_pop_name: "&bSculk Charge Pop" particle_sculk_charge_pop_description: "" particle_shriek_name: "&bShriek" particle_shriek_description: "" -particle_dripping_cherry_leaves_name: "&bDripping Cherry Leaves" -particle_dripping_cherry_leaves_description: "" -particle_falling_cherry_leaves_name: "&bFalling Cherry Leaves" -particle_falling_cherry_leaves_description: "" -particle_landing_cherry_leaves_name: "&bLanding Cherry Leaves" -particle_landing_cherry_leaves_description: "" +particle_cherry_leaves_name: "&bCherry Leaves" +particle_cherry_leaves_description: "" ########################## # Locations # diff --git a/src/plugin.yml b/src/plugin.yml index 0b9d0dc..8bf1adf 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: ParticleHats main: com.mediusecho.particlehats.ParticleHats -version: 4.4.0 +version: 4.4.1 api-version: 1.13 author: MediusEcho softdepend: [Vault, SuperVanish, PremiumVanish, PlayerPoints, TokenManager]