Add TILE_DUST to the particle API

This commit is contained in:
Thinkofdeath 2014-01-19 22:15:25 +00:00
parent 12b6f06e81
commit 6c36e5eff0

View File

@ -1,11 +1,11 @@
From 7f98711883db3a28f9f26a6be66b66c2d46a9d06 Mon Sep 17 00:00:00 2001
From 4c7701d9ccb11b2412671090f39bfe9eaeee1103 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
index 2474a2d..3b71c11 100644
index 2474a2d..9964203 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
@@ -5,6 +5,7 @@ import java.util.Map;
@ -16,7 +16,7 @@ index 2474a2d..3b71c11 100644
import org.bukkit.potion.Potion;
/**
@@ -79,27 +80,178 @@ public enum Effect {
@@ -79,27 +80,183 @@ public enum Effect {
/**
* The flames seen on a mobspawner; a visual effect.
*/
@ -155,7 +155,12 @@ index 2474a2d..3b71c11 100644
+ * The particles generated while breaking a block.
+ * This particle requires a Material and data value so that the client can select the correct texture.
+ */
+ TILE_BREAK("blockcrack", Type.PARTICLE, MaterialData.class);
+ TILE_BREAK("blockcrack", Type.PARTICLE, MaterialData.class),
+ /**
+ * The particles generated while sprinting a block
+ * This particle requires a Material and data value so that the client can select the correct texture.
+ */
+ TILE_DUST("blockdust", Type.PARTICLE, MaterialData.class);
private final int id;
private final Type type;
@ -199,7 +204,7 @@ index 2474a2d..3b71c11 100644
* @deprecated Magic value
*/
@Deprecated
@@ -108,6 +260,15 @@ public enum Effect {
@@ -108,6 +265,15 @@ public enum Effect {
}
/**
@ -215,7 +220,7 @@ index 2474a2d..3b71c11 100644
* @return The type of the effect.
*/
public Type getType() {
@@ -115,8 +276,7 @@ public enum Effect {
@@ -115,8 +281,7 @@ public enum Effect {
}
/**
@ -225,7 +230,7 @@ index 2474a2d..3b71c11 100644
*/
public Class<?> getData() {
return this.data;
@@ -136,12 +296,32 @@ public enum Effect {
@@ -136,12 +301,32 @@ public enum Effect {
static {
for (Effect effect : values()) {