Skip to content

Commit

Permalink
Bees/German
Browse files Browse the repository at this point in the history
  • Loading branch information
Esophose committed Dec 11, 2019
1 parent 6b6d5d7 commit a47d87c
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 9 deletions.
13 changes: 13 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
== UPDATING WILL DELETE YOUR CONFIG.YML ==
* Create a backup of your config.yml if you wish to import all your old settings!
=== v6.6 ===
+ Added support for Minecraft 1.15
+ Added 1.15 effects: 'dripping_honey', 'falling_honey', 'falling_nectar', and 'landing_honey'
+ Added new lang file de_DE.lang (German)
* Fixed an issue where the 'arrows' style wouldn't load properly with preset groups
* Fixed an issue where shooting an arrow into a portal would throw errors
=== v6.5 ===
+ Added Russian translation file ru_RU.lang
+ Added slightly better vanish plugin support
* Players no longer need an effect permission to open the GUI when gui-presets-only is true in the config.yml
* Fixed error with the celebration style
* Fixed error with the arrows style in 1.14+
* Fixed '/pp reload' not being allowed from console
=== v6.4 ===
+ Added support for Minecraft 1.14
+ Added 1.14 effects: 'campfire_cosy_smoke', 'campfire_signal_smoke', 'composter', 'falling_lava', 'falling_water', 'landing_lava', 'sneeze'
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esophose.playerparticles</groupId>
<artifactId>PlayerParticles</artifactId>
<version>6.5</version>
<version>6.6</version>
<name>PlayerParticles</name>
<url>https://github.com/Esophose/PlayerParticles</url>
<description>Display particles around your player and blocks using customized styles and data!</description>
Expand Down Expand Up @@ -110,7 +110,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.14.3-R0.1-SNAPSHOT</version>
<version>1.15-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions src/com/esophose/playerparticles/manager/LangManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ private static YamlConfiguration configureLangFile(boolean resetLangFiles) {
defaultLangFileNames.add("fr_FR.lang");
defaultLangFileNames.add("vi_VN.lang");
defaultLangFileNames.add("ru_RU.lang");
defaultLangFileNames.add("de_DE.lang");

targetLangFile.getParentFile().mkdir(); // Make sure the directory always exists

Expand Down
15 changes: 8 additions & 7 deletions src/com/esophose/playerparticles/particles/ParticleEffect.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.esophose.playerparticles.particles;

import com.esophose.playerparticles.manager.ParticleManager;
import com.esophose.playerparticles.manager.SettingManager.PSetting;
import com.esophose.playerparticles.styles.api.PParticle;
import com.esophose.playerparticles.util.NMSUtil;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.ArrayList;
Expand All @@ -8,20 +12,13 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import com.esophose.playerparticles.util.NMSUtil;
import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;

import com.esophose.playerparticles.manager.ParticleManager;
import com.esophose.playerparticles.manager.SettingManager.PSetting;
import com.esophose.playerparticles.styles.api.PParticle;
import org.bukkit.metadata.MetadataValue;

@SuppressWarnings("deprecation")
Expand All @@ -44,6 +41,7 @@ public enum ParticleEffect {
DAMAGE_INDICATOR("DAMAGE_INDICATOR", "DAMAGE_INDICATOR"),
DOLPHIN("DOLPHIN", null),
DRAGON_BREATH("DRAGON_BREATH", "DRAGON_BREATH"),
DRIPPING_HONEY("DRIPPING_HONEY", null),
DRIPPING_LAVA("DRIP_LAVA", "DRIP_LAVA"),
DRIPPING_WATER("DRIP_WATER", "DRIP_WATER"),
DUST("REDSTONE", "REDSTONE", ParticleProperty.COLORABLE),
Expand All @@ -55,7 +53,9 @@ public enum ParticleEffect {
EXPLOSION("EXPLOSION_LARGE", "EXPLOSION_LARGE"),
EXPLOSION_EMITTER("EXPLOSION_HUGE", "EXPLOSION_HUGE"),
FALLING_DUST("FALLING_DUST", "FALLING_DUST", ParticleProperty.REQUIRES_MATERIAL_DATA),
FALLING_HONEY("FALLING_HONEY", null),
FALLING_LAVA("FALLING_LAVA", null),
FALLING_NECTAR("FALLING_NECTAR", null),
FALLING_WATER("FALLING_WATER", null),
FIREWORK("FIREWORKS_SPARK", "FIREWORKS_SPARK"),
FISHING("WATER_WAKE", "WATER_WAKE"),
Expand All @@ -68,6 +68,7 @@ public enum ParticleEffect {
ITEM("ITEM_CRACK", "ITEM_CRACK", ParticleProperty.REQUIRES_MATERIAL_DATA),
ITEM_SLIME("SLIME", "SLIME"),
ITEM_SNOWBALL("SNOWBALL", "SNOWBALL"),
LANDING_HONEY("LANDING_HONEY", null),
LANDING_LAVA("LANDING_LAVA", null),
LARGE_SMOKE("SMOKE_LARGE", "SMOKE_LARGE"),
LAVA("LAVA", "LAVA"),
Expand Down
8 changes: 8 additions & 0 deletions src/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ gui-icon:
dragon_breath:
- DRAGON_BREATH
- DRAGONS_BREATH
dripping_honey:
- BEE_NEST
dripping_lava:
- LAVA_BUCKET
dripping_water:
Expand All @@ -261,8 +263,12 @@ gui-icon:
- TNT
falling_dust:
- SAND
falling_honey:
- HONEY_BOTTLE
falling_lava:
- RED_DYE
falling_nectar:
- HONEYCOMB
falling_water:
- BLUE_DYE
firework:
Expand Down Expand Up @@ -292,6 +298,8 @@ gui-icon:
large_smoke:
- COBWEB
- WEB
landing_honey:
- HONEY_BLOCK
landing_lava:
- ORANGE_DYE
lava:
Expand Down

0 comments on commit a47d87c

Please sign in to comment.