diff --git a/pom.xml b/pom.xml
index a962bd5e8..cedb8c52e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
me.blackvein.quests
quests
- 2.8.2-02
+ 2.8.2-03
quests
https://github.com/FlyingPikachu/Quests/
jar
diff --git a/src/main/java/me/blackvein/particles/Eff_1_10_R1.java b/src/main/java/me/blackvein/particles/Eff_1_10_R1.java
index f60485c19..acb2f7386 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_10_R1.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_10_R1.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_10_R1.EnumParticle;
-import net.minecraft.server.v1_10_R1.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_10_R1.EnumParticle;
+import net.minecraft.server.v1_10_R1.PacketPlayOutWorldParticles;
+
public enum Eff_1_10_R1 {
@@ -67,17 +66,17 @@ public enum Eff_1_10_R1 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_11_R1.java b/src/main/java/me/blackvein/particles/Eff_1_11_R1.java
index 6ec18d916..78c68befa 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_11_R1.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_11_R1.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_11_R1.EnumParticle;
-import net.minecraft.server.v1_11_R1.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_11_R1.EnumParticle;
+import net.minecraft.server.v1_11_R1.PacketPlayOutWorldParticles;
+
public enum Eff_1_11_R1 {
@@ -69,17 +68,17 @@ public enum Eff_1_11_R1 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_12_R1.java b/src/main/java/me/blackvein/particles/Eff_1_12_R1.java
index edd8bf195..6f4b60c74 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_12_R1.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_12_R1.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_12_R1.EnumParticle;
-import net.minecraft.server.v1_12_R1.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_12_R1.EnumParticle;
+import net.minecraft.server.v1_12_R1.PacketPlayOutWorldParticles;
+
public enum Eff_1_12_R1 {
@@ -69,17 +68,17 @@ public enum Eff_1_12_R1 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_7_R3.java b/src/main/java/me/blackvein/particles/Eff_1_7_R3.java
index cca83f067..4ff0a2e2d 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_7_R3.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_7_R3.java
@@ -1,12 +1,11 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_7_R3.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_7_R3.PacketPlayOutWorldParticles;
+
public enum Eff_1_7_R3 {
HUGE_EXPLOSION("hugeexplosion"),
@@ -52,16 +51,15 @@ public enum Eff_1_7_R3 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleName);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleName,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_7_R4.java b/src/main/java/me/blackvein/particles/Eff_1_7_R4.java
index afc01f1fb..c8d368daa 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_7_R4.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_7_R4.java
@@ -1,12 +1,11 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_7_R4.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_7_R4.PacketPlayOutWorldParticles;
+
public enum Eff_1_7_R4 {
HUGE_EXPLOSION("hugeexplosion"),
@@ -52,16 +51,15 @@ public enum Eff_1_7_R4 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleName);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleName,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_8_R1.java b/src/main/java/me/blackvein/particles/Eff_1_8_R1.java
index c07521a4d..36720353c 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_8_R1.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_8_R1.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_8_R1.EnumParticle;
-import net.minecraft.server.v1_8_R1.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_8_R1.EnumParticle;
+import net.minecraft.server.v1_8_R1.PacketPlayOutWorldParticles;
+
public enum Eff_1_8_R1 {
EXPLOSION(EnumParticle.EXPLOSION_NORMAL),
@@ -60,17 +59,17 @@ public enum Eff_1_8_R1 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_8_R2.java b/src/main/java/me/blackvein/particles/Eff_1_8_R2.java
index 0d48e019f..8bf1c5e2d 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_8_R2.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_8_R2.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_8_R2.EnumParticle;
-import net.minecraft.server.v1_8_R2.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_8_R2.EnumParticle;
+import net.minecraft.server.v1_8_R2.PacketPlayOutWorldParticles;
+
public enum Eff_1_8_R2 {
EXPLOSION(EnumParticle.EXPLOSION_NORMAL),
@@ -60,17 +59,17 @@ public enum Eff_1_8_R2 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_8_R3.java b/src/main/java/me/blackvein/particles/Eff_1_8_R3.java
index 6ed29fbe3..28c75bfde 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_8_R3.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_8_R3.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_8_R3.EnumParticle;
-import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_8_R3.EnumParticle;
+import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
+
public enum Eff_1_8_R3 {
EXPLOSION(EnumParticle.EXPLOSION_NORMAL),
@@ -60,17 +59,17 @@ public enum Eff_1_8_R3 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_9_R1.java b/src/main/java/me/blackvein/particles/Eff_1_9_R1.java
index 97b3658ca..10cccde94 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_9_R1.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_9_R1.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_9_R1.EnumParticle;
-import net.minecraft.server.v1_9_R1.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_9_R1.EnumParticle;
+import net.minecraft.server.v1_9_R1.PacketPlayOutWorldParticles;
+
public enum Eff_1_9_R1 {
EXPLOSION(EnumParticle.EXPLOSION_NORMAL),
@@ -64,17 +63,17 @@ public enum Eff_1_9_R1 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/particles/Eff_1_9_R2.java b/src/main/java/me/blackvein/particles/Eff_1_9_R2.java
index ce8e4ab0a..db55891cd 100644
--- a/src/main/java/me/blackvein/particles/Eff_1_9_R2.java
+++ b/src/main/java/me/blackvein/particles/Eff_1_9_R2.java
@@ -1,13 +1,12 @@
package me.blackvein.particles;
-import me.blackvein.quests.util.ReflectionUtil;
-import net.minecraft.server.v1_9_R2.EnumParticle;
-import net.minecraft.server.v1_9_R2.PacketPlayOutWorldParticles;
-
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
+import net.minecraft.server.v1_9_R2.EnumParticle;
+import net.minecraft.server.v1_9_R2.PacketPlayOutWorldParticles;
+
public enum Eff_1_9_R2 {
EXPLOSION(EnumParticle.EXPLOSION_NORMAL),
@@ -64,17 +63,17 @@ public enum Eff_1_9_R2 {
}
public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception {
- PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles();
- ReflectionUtil.setValue(packet, "a", particleEnum);
- ReflectionUtil.setValue(packet, "b", (float) location.getX());
- ReflectionUtil.setValue(packet, "c", (float) location.getY());
- ReflectionUtil.setValue(packet, "d", (float) location.getZ());
- ReflectionUtil.setValue(packet, "e", offsetX);
- ReflectionUtil.setValue(packet, "f", offsetY);
- ReflectionUtil.setValue(packet, "g", offsetZ);
- ReflectionUtil.setValue(packet, "h", speed);
- ReflectionUtil.setValue(packet, "i", count);
- ReflectionUtil.setValue(packet, "k", data);
+ PacketPlayOutWorldParticles packet = new PacketPlayOutWorldParticles(particleEnum,
+ false,
+ (float) location.getX(),
+ (float) location.getY(),
+ (float) location.getZ(),
+ offsetX,
+ offsetY,
+ offsetZ,
+ speed,
+ count,
+ data);
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
}
diff --git a/src/main/java/me/blackvein/quests/util/ReflectionUtil.java b/src/main/java/me/blackvein/quests/util/ReflectionUtil.java
deleted file mode 100644
index 01511945c..000000000
--- a/src/main/java/me/blackvein/quests/util/ReflectionUtil.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.blackvein.quests.util;
-
-import java.lang.reflect.Field;
-
-public class ReflectionUtil {
-
- public static void setValue(Object instance, String fieldName, Object value) throws Exception {
- Field field = instance.getClass().getDeclaredField(fieldName);
- field.setAccessible(true);
- field.set(instance, value);
- }
-
- public static Object getValue(Object instance, String fieldName) throws Exception {
- Field field = instance.getClass().getDeclaredField(fieldName);
- field.setAccessible(true);
- return field.get(instance);
- }
-}
\ No newline at end of file