diff --git a/dist/pom.xml b/dist/pom.xml index 6abfbaaef..35477d9f7 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -8,8 +8,8 @@ 3.6.0 quests-dist - jar - + pom + @@ -45,41 +45,6 @@ quests-main ${project.parent.version} - - me.blackvein.quests - quests-v1_13_R2 - ${project.parent.version} - - - me.blackvein.quests - quests-v1_13_R1 - ${project.parent.version} - - - me.blackvein.quests - quests-v1_12_R1 - ${project.parent.version} - - - me.blackvein.quests - quests-v1_11_R1 - ${project.parent.version} - - - me.blackvein.quests - quests-v1_10_R1 - ${project.parent.version} - - - me.blackvein.quests - quests-v1_9_R2 - ${project.parent.version} - - - me.blackvein.quests - quests-v1_9_R1 - ${project.parent.version} - me.blackvein.quests quests-v1_8_R3 diff --git a/dist/src/main/assembly/all-jar.xml b/dist/src/main/assembly/all-jar.xml index 15b34c372..e649416ff 100644 --- a/dist/src/main/assembly/all-jar.xml +++ b/dist/src/main/assembly/all-jar.xml @@ -1,7 +1,5 @@ - + all-jar jar diff --git a/lib/Citizens-2.0.24-b1591.jar b/lib/Citizens-2.0.24-b1591.jar new file mode 100644 index 000000000..4a1f15c44 Binary files /dev/null and b/lib/Citizens-2.0.24-b1591.jar differ diff --git a/lib/Heroes.jar b/lib/Heroes.jar new file mode 100644 index 000000000..c20e56649 Binary files /dev/null and b/lib/Heroes.jar differ diff --git a/lib/PlaceholderAPI-2.8.2.jar b/lib/PlaceholderAPI-2.8.2.jar new file mode 100644 index 000000000..8f7272284 Binary files /dev/null and b/lib/PlaceholderAPI-2.8.2.jar differ diff --git a/lib/Vault.jar b/lib/Vault.jar new file mode 100644 index 000000000..60aef0c67 Binary files /dev/null and b/lib/Vault.jar differ diff --git a/lib/craftbukkit-1.10.jar b/lib/craftbukkit-1.10.jar deleted file mode 100644 index c220d500f..000000000 Binary files a/lib/craftbukkit-1.10.jar and /dev/null differ diff --git a/lib/craftbukkit-1.11.jar b/lib/craftbukkit-1.11.jar deleted file mode 100644 index 5b012fb31..000000000 Binary files a/lib/craftbukkit-1.11.jar and /dev/null differ diff --git a/lib/craftbukkit-1.12.jar b/lib/craftbukkit-1.12.jar deleted file mode 100644 index a56265ca5..000000000 Binary files a/lib/craftbukkit-1.12.jar and /dev/null differ diff --git a/lib/craftbukkit-1.13.jar b/lib/craftbukkit-1.13.jar deleted file mode 100644 index c306c3920..000000000 Binary files a/lib/craftbukkit-1.13.jar and /dev/null differ diff --git a/lib/craftbukkit-1.7.10-R0.1.jar b/lib/craftbukkit-1.7.10-R0.1.jar deleted file mode 100644 index 02d4bc7fc..000000000 Binary files a/lib/craftbukkit-1.7.10-R0.1.jar and /dev/null differ diff --git a/lib/craftbukkit-1.7.2-R0.4.jar b/lib/craftbukkit-1.7.2-R0.4.jar deleted file mode 100644 index 024639cd9..000000000 Binary files a/lib/craftbukkit-1.7.2-R0.4.jar and /dev/null differ diff --git a/lib/craftbukkit-1.7.9-R0.3.jar b/lib/craftbukkit-1.7.9-R0.3.jar deleted file mode 100644 index 392cb0aa9..000000000 Binary files a/lib/craftbukkit-1.7.9-R0.3.jar and /dev/null differ diff --git a/lib/craftbukkit-1.8.3.jar b/lib/craftbukkit-1.8.3.jar deleted file mode 100644 index 80d7cb63a..000000000 Binary files a/lib/craftbukkit-1.8.3.jar and /dev/null differ diff --git a/lib/craftbukkit-1.8.6.jar b/lib/craftbukkit-1.8.6.jar deleted file mode 100644 index 88073293a..000000000 Binary files a/lib/craftbukkit-1.8.6.jar and /dev/null differ diff --git a/lib/craftbukkit-1.8.jar b/lib/craftbukkit-1.8.jar deleted file mode 100644 index 2b384aa08..000000000 Binary files a/lib/craftbukkit-1.8.jar and /dev/null differ diff --git a/lib/craftbukkit-1.9.2.jar b/lib/craftbukkit-1.9.2.jar deleted file mode 100644 index c3e09141a..000000000 Binary files a/lib/craftbukkit-1.9.2.jar and /dev/null differ diff --git a/lib/craftbukkit-1.9.4.jar b/lib/craftbukkit-1.9.4.jar deleted file mode 100644 index d80bcb065..000000000 Binary files a/lib/craftbukkit-1.9.4.jar and /dev/null differ diff --git a/lib/worldedit-bukkit-6.1.9.jar b/lib/worldedit-bukkit-6.1.9.jar new file mode 100644 index 000000000..fd5d0036f Binary files /dev/null and b/lib/worldedit-bukkit-6.1.9.jar differ diff --git a/lib/worldguard-bukkit-6.2.2.jar b/lib/worldguard-bukkit-6.2.2.jar new file mode 100644 index 000000000..2f615d493 Binary files /dev/null and b/lib/worldguard-bukkit-6.2.2.jar differ diff --git a/main/pom.xml b/main/pom.xml index 98d2f61a7..e9b266268 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -38,6 +38,7 @@ http://nexus.hc.to/content/repositories/pub_releases/ + jitpack.io https://jitpack.io diff --git a/main/src/main/java/me/blackvein/quests/NpcEffectThread.java b/main/src/main/java/me/blackvein/quests/NpcEffectThread.java index 1d21126a1..bd53ec3eb 100644 --- a/main/src/main/java/me/blackvein/quests/NpcEffectThread.java +++ b/main/src/main/java/me/blackvein/quests/NpcEffectThread.java @@ -18,16 +18,8 @@ import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import me.blackvein.quests.nms.v1_10_R1.particle.Eff_1_10_R1; -import me.blackvein.quests.nms.v1_11_R1.particle.Eff_1_11_R1; -import me.blackvein.quests.nms.v1_12_R1.particle.Eff_1_12_R1; -import me.blackvein.quests.nms.v1_13_R1.particle.Eff_1_13_R1; -import me.blackvein.quests.nms.v1_13_R2.particle.Eff_1_13_R2; -import me.blackvein.quests.nms.v1_8_R1.particle.Eff_1_8_R1; -import me.blackvein.quests.nms.v1_8_R2.particle.Eff_1_8_R2; -import me.blackvein.quests.nms.v1_8_R3.particle.Eff_1_8_R3; -import me.blackvein.quests.nms.v1_9_R1.particle.Eff_1_9_R1; -import me.blackvein.quests.nms.v1_9_R2.particle.Eff_1_9_R2; +import me.blackvein.quests.particle.ParticleProvider; + import net.citizensnpcs.api.npc.NPC; public class NpcEffectThread implements Runnable { @@ -67,947 +59,9 @@ public class NpcEffectThread implements Runnable { * @param effectType Value of EnumParticle such as NOTE or SMOKE */ public void showEffect(Player player, NPC npc, String effectType) { - try { - if (plugin.getDetectedBukkitVersion().contains("1.13.2") - || plugin.getDetectedBukkitVersion().contains("1.13.1")) { - showEffect_1_13_R2(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.13")) { - showEffect_1_13_R1(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.12")) { - showEffect_1_12_R1(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.11")) { - showEffect_1_11_R1(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.10")) { - showEffect_1_10_R1(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.9.4")) { - showEffect_1_9_R2(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.9")) { - showEffect_1_9_R1(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.8.9") - || plugin.getDetectedBukkitVersion().contains("1.8.8") - || plugin.getDetectedBukkitVersion().contains("1.8.7") - || plugin.getDetectedBukkitVersion().contains("1.8.6") - || plugin.getDetectedBukkitVersion().contains("1.8.5") - || plugin.getDetectedBukkitVersion().contains("1.8.4")) { - showEffect_1_8_R3(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.8.3")) { - showEffect_1_8_R2(player, npc, effectType); - } else if (plugin.getDetectedBukkitVersion().contains("1.8")) { - showEffect_1_8_R1(player, npc, effectType); - } - } catch (Exception e) { - plugin.getLogger().severe("Bukkit version detected as " + plugin.getDetectedBukkitVersion()); - e.printStackTrace(); - } - } - - private void showEffect_1_13_R2(Player player, NPC npc, String effectType) { Location eyeLoc = npc.getEntity().getLocation(); eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_13_R2.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_13_R2.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_13_R2.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_13_R2.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_13_R2.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_13_R2.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_13_R2.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_13_R2.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_13_R2.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_13_R2.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_13_R2.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_13_R2.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_13_R2.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_13_R1(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_13_R1.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_13_R1.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_13_R1.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_13_R1.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_13_R1.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_13_R1.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_13_R1.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_13_R1.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_13_R1.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_13_R1.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_13_R1.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_13_R1.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_13_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } + ParticleProvider.sendToPlayer(player, eyeLoc, effectType); } - private void showEffect_1_12_R1(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_12_R1.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_12_R1.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_12_R1.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_12_R1.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_12_R1.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_12_R1.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_12_R1.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_12_R1.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_12_R1.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_12_R1.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_12_R1.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_12_R1.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_12_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_11_R1(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_11_R1.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_11_R1.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_11_R1.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_11_R1.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_11_R1.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_11_R1.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_11_R1.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_11_R1.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_11_R1.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_11_R1.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_11_R1.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_11_R1.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_11_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_10_R1(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_10_R1.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_10_R1.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_10_R1.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_10_R1.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_10_R1.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_10_R1.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_10_R1.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_10_R1.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_10_R1.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_10_R1.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_10_R1.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_10_R1.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_10_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_9_R2(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_9_R2.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_9_R2.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_9_R2.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_9_R2.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_9_R2.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_9_R2.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_9_R2.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_9_R2.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_9_R2.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_9_R2.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_9_R2.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_9_R2.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_9_R2.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_9_R1(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_9_R1.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_9_R1.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_9_R1.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_9_R1.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_9_R1.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_9_R1.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_9_R1.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_9_R1.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_9_R1.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_9_R1.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_9_R1.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_9_R1.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_9_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_8_R3(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_8_R3.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_8_R3.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_8_R3.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_8_R3.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_8_R3.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R3.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_8_R3.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_8_R3.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_8_R3.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R3.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R3.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_8_R3.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_8_R3.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_8_R2(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_8_R2.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_8_R2.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_8_R2.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_8_R2.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_8_R2.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R2.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_8_R2.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_8_R2.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_8_R2.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R2.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R2.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_8_R2.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_8_R2.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } - - private void showEffect_1_8_R1(Player player, NPC npc, String effectType) { - Location eyeLoc = npc.getEntity().getLocation(); - eyeLoc.setY(eyeLoc.getY() + 1.5); - if (effectType.equalsIgnoreCase("enchant")) { - try { - Eff_1_8_R1.ENCHANTMENT_TABLE.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 10, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("crit")) { - try { - Eff_1_8_R1.CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("spell")) { - try { - Eff_1_8_R1.INSTANT_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("magiccrit")) { - try { - Eff_1_8_R1.MAGIC_CRIT.sendToPlayer(player, eyeLoc, 0, 0, 0, (float) 0.35, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("mobspell")) { - try { - Eff_1_8_R1.MOB_SPELL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("note")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R1.NOTE.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("portal")) { - try { - Eff_1_8_R1.PORTAL.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 5, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("dust")) { - try { - Location newLoc = new Location(player.getWorld(), eyeLoc.getX(), eyeLoc.getY() + (float) 0.5, eyeLoc.getZ()); - Eff_1_8_R1.RED_DUST.sendToPlayer(player, newLoc, 0, 0, 0, 1, 1, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("witch")) { - try { - Eff_1_8_R1.WITCH_MAGIC.sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("snowball")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R1.SNOWBALL_POOF.sendToPlayer(player, newLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("splash")) { - try { - Location old = eyeLoc; - Location newLoc = new Location(player.getWorld(), old.getX(), old.getY() + (float) 0.5, old.getZ()); - Eff_1_8_R1.SPLASH.sendToPlayer(player, newLoc, 0, 0, 0, 1, 4, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (effectType.equalsIgnoreCase("smoke")) { - try { - Eff_1_8_R1.TOWN_AURA.sendToPlayer(player, eyeLoc, 0, 1, 0, 1, 20, null); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Eff_1_8_R1.valueOf(effectType.toUpperCase()).sendToPlayer(player, eyeLoc, 0, 0, 0, 1, 3, null); - } catch (Exception e) { - plugin.getLogger().info(effectType + " is not a valid effect name!"); - } - } - } } \ No newline at end of file diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java index 55e51f691..9e096c443 100644 --- a/main/src/main/java/me/blackvein/quests/Quests.java +++ b/main/src/main/java/me/blackvein/quests/Quests.java @@ -2650,7 +2650,6 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener return hero.getHeroClass().getName().equalsIgnoreCase(primaryClass); } - @SuppressWarnings("deprecation") public boolean testSecondaryHeroesClass(String secondaryClass, UUID uuid) { Hero hero = getHero(uuid); return hero.getSecondClass().getName().equalsIgnoreCase(secondaryClass); diff --git a/main/src/main/java/me/blackvein/quests/particle/ParticleProvider.java b/main/src/main/java/me/blackvein/quests/particle/ParticleProvider.java new file mode 100644 index 000000000..9a637ccf2 --- /dev/null +++ b/main/src/main/java/me/blackvein/quests/particle/ParticleProvider.java @@ -0,0 +1,127 @@ +/******************************************************************************************************* + * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ****************************************************************************************************** */ +package me.blackvein.quests.particle; + +import java.util.Map; +import java.util.logging.Level; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Particle; +import org.bukkit.entity.Player; + +public abstract class ParticleProvider { + + private static ParticleProvider loaded; + + static { + try { + String packageName = ParticleProvider.class.getPackage().getName(); + String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; + if (internalsName.startsWith("v1_8_R")) { + loaded = (ParticleProvider) Class.forName(packageName + "." + internalsName).newInstance(); + } else { + loaded = new ParticleProvider_Bukkit(); + } + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | ClassCastException exception) { + Bukkit.getLogger().log(Level.SEVERE, "Quests could not find a valid implementation for this server version."); + } + } + + abstract Map getParticleMap(); + + abstract void spawnParticle(Player player, Location location, Object particle, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data); + + /** + * Sends the particle to the player. + * + * @param player + * The player to send the particle to. + * @param location + * The location to play the particle at. + * @param particleId + * The particle identifier. + * @param offsetX + * The offset of the particle in the X direction. + * @param offsetY + * The offset of the particle in the Y direction. + * @param offsetZ + * The offset of the particle in the Z direction. + * @param speed + * The speed that the particle effect will be played at. + * @param count + * The number of particles to send to the player. + * @param data + * An integer array needed for some particles, this is used for + * packets such as block crack or particle colour on redstone / + * firework particles. + */ + public static void sendToPlayer(Player player, Location location, String particleId, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) { + Object particle; + PreBuiltParticle pbp = PreBuiltParticle.fromIdentifier(particleId); + if (pbp != null) { + particle = loaded.getParticleMap().get(pbp); + } else { + try { + particle = Particle.valueOf(particleId); + } catch (IllegalArgumentException exception) { + return; // Fail silently + } + } + loaded.spawnParticle(player, location, particle, offsetX, offsetY, offsetZ, speed, count, data); + } + + /** + * Sends the particle to the player. + * + * @param player + * The player to send the particle to. + * @param location + * The location to play the particle at. + * @param particleId + * The particle identifier. + */ + public static void sendToPlayer(Player player, Location location, String particleId) { + PreBuiltParticle particle = PreBuiltParticle.fromIdentifier(particleId); + if (particle != null) { + Location pos = location.clone(); + if (particle.getVector() != null) { + pos.add(particle.getVector()); + } + sendToPlayer(player, location, particle); + } else { + try { + loaded.spawnParticle(player, location, Particle.valueOf(particleId), 0, 0, 0, 1, 3, null); + } catch (IllegalArgumentException exception) { + // Fail silently + } + } + } + + /** + * Sends the particle to the player. + * + * @param player + * The player to send the particle to. + * @param location + * The location to play the particle at. + * @param particle + * The pre-built particle. + */ + public static void sendToPlayer(Player player, Location location, PreBuiltParticle particle) { + Location pos = location.clone(); + if (particle.getVector() != null) { + pos.add(particle.getVector()); + } + loaded.spawnParticle(player, pos, loaded.getParticleMap().get(particle), particle.getOffsetX(), particle.getOffsetY(), particle.getOffsetZ(), particle.getSpeed(), particle.getCount(), null); + } + +} \ No newline at end of file diff --git a/main/src/main/java/me/blackvein/quests/particle/ParticleProvider_Bukkit.java b/main/src/main/java/me/blackvein/quests/particle/ParticleProvider_Bukkit.java new file mode 100644 index 000000000..0375147f8 --- /dev/null +++ b/main/src/main/java/me/blackvein/quests/particle/ParticleProvider_Bukkit.java @@ -0,0 +1,49 @@ +/******************************************************************************************************* + * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ****************************************************************************************************** */ +package me.blackvein.quests.particle; + +import java.util.HashMap; +import java.util.Map; +import org.bukkit.Location; +import org.bukkit.Particle; +import org.bukkit.entity.Player; + +class ParticleProvider_Bukkit extends ParticleProvider { + + private static Map PARTICLES = new HashMap<>(); + + static { + PARTICLES.put(PreBuiltParticle.ENCHANT, Particle.ENCHANTMENT_TABLE); + PARTICLES.put(PreBuiltParticle.CRIT, Particle.CRIT); + PARTICLES.put(PreBuiltParticle.SPELL, Particle.SPELL_INSTANT); + PARTICLES.put(PreBuiltParticle.MAGIC_CRIT, Particle.CRIT_MAGIC); + PARTICLES.put(PreBuiltParticle.MOB_SPELL, Particle.SPELL_MOB); + PARTICLES.put(PreBuiltParticle.NOTE, Particle.NOTE); + PARTICLES.put(PreBuiltParticle.PORTAL, Particle.PORTAL); + PARTICLES.put(PreBuiltParticle.DUST, Particle.REDSTONE); + PARTICLES.put(PreBuiltParticle.WITCH, Particle.SPELL_WITCH); + PARTICLES.put(PreBuiltParticle.SNOWBALL, Particle.SNOWBALL); + PARTICLES.put(PreBuiltParticle.SPLASH, Particle.WATER_SPLASH); + PARTICLES.put(PreBuiltParticle.SMOKE, Particle.TOWN_AURA); + } + + @Override + Map getParticleMap() { + return PARTICLES; + } + + @Override + void spawnParticle(Player player, Location location, Object particle, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) { + player.spawnParticle((Particle) particle, location, count, offsetX, offsetY, offsetZ, speed, data); + } + +} \ No newline at end of file diff --git a/main/src/main/java/me/blackvein/quests/particle/PreBuiltParticle.java b/main/src/main/java/me/blackvein/quests/particle/PreBuiltParticle.java new file mode 100644 index 000000000..2188be57d --- /dev/null +++ b/main/src/main/java/me/blackvein/quests/particle/PreBuiltParticle.java @@ -0,0 +1,101 @@ +/******************************************************************************************************* + * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ****************************************************************************************************** */ +package me.blackvein.quests.particle; + +import java.util.Map; +import java.util.stream.Stream; +import org.bukkit.util.Vector; + +public enum PreBuiltParticle { + + ENCHANT("enchant", 0, 1, 0, 1, 10), + CRIT("crit", 0, 0, 0, .35f, 3), + SPELL("spell", 0, 0, 0, 1, 3), + MAGIC_CRIT("magiccrit", 0, 0, 0, .35f, 3), + MOB_SPELL("mobspell", 0, 0, 0, 1, 3), + NOTE("note", 0, 0, 0, 1, 1, new Vector(0, .5, 0)), + PORTAL("portal", 0, 0, 0, 1, 5), + DUST("dust", 0, 0, 0, 1, 1, new Vector(0, .5, 0)), + WITCH("witch", 0, 0, 0, 1, 3), + SNOWBALL("snowball", 0, 0, 0, 1, 3), + SPLASH("splash", 0, 0, 0, 1, 4, new Vector(0, .5, 0)), + SMOKE("smoke", 0, 1, 0, 1, 20); + + private static Map FROM_IDENTIFIER; + + static { + Stream.of(values()).forEach(p -> FROM_IDENTIFIER.put(p.identifier, p)); + } + + private String identifier; + private float offsetX, offsetY, offsetZ, speed; + private int count; + private Vector vector; + + PreBuiltParticle(String identifier, float offsetX, float offsetY, float offsetZ, float speed, int count) { + this.identifier = identifier; + this.offsetX = offsetX; + this.offsetY = offsetY; + this.offsetZ = offsetZ; + this.speed = speed; + this.count = count; + } + + PreBuiltParticle(String identifier, float offsetX, float offsetY, float offsetZ, float speed, int count, Vector vector) { + this(identifier, offsetX, offsetY, offsetZ, speed, count); + this.vector = vector; + } + + public String getIdentifier() { + return identifier; + } + + public float getOffsetX() { + return offsetX; + } + + public float getOffsetY() { + return offsetY; + } + + public float getOffsetZ() { + return offsetZ; + } + + public float getSpeed() { + return speed; + } + + public int getCount() { + return count; + } + + /** + * Returns the vector applied to the default spawn location or null if the location isn't modified. + * + * @return the vector applied to the default spawn location or null if the location isn't modified + */ + public Vector getVector() { + return vector; + } + + /** + * Returns the PreBuiltParticle represented by the specified identifier. + * + * @param identifier the identifier + * @return the PreBuiltParticle represented by the specified identifier + */ + public static PreBuiltParticle fromIdentifier(String identifier) { + return FROM_IDENTIFIER.get(identifier); + } + +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index ace146d27..93c1e6bcb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,13 +21,6 @@ v1_8_R1 v1_8_R2 v1_8_R3 - v1_9_R1 - v1_9_R2 - v1_10_R1 - v1_11_R1 - v1_12_R1 - v1_13_R1 - v1_13_R2 dist diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml deleted file mode 100644 index c7def7ff4..000000000 --- a/v1_10_R1/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - me.blackvein.quests - quests-v1_10_R1 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar - - me.blackvein.quests - quests-parent - 3.6.0 - - - - UTF-8 - - - - - org.bukkit - craftbukkit - 1.10.2-R0.1-SNAPSHOT - provided - - - - - clean package install - ${basedir}/src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - - - \ No newline at end of file diff --git a/v1_10_R1/src/main/java/me/blackvein/quests/nms/v1_10_R1/particle/Eff_1_10_R1.java b/v1_10_R1/src/main/java/me/blackvein/quests/nms/v1_10_R1/particle/Eff_1_10_R1.java deleted file mode 100644 index ba005bd7a..000000000 --- a/v1_10_R1/src/main/java/me/blackvein/quests/nms/v1_10_R1/particle/Eff_1_10_R1.java +++ /dev/null @@ -1,129 +0,0 @@ -/******************************************************************************************************* - * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *******************************************************************************************************/ - -package me.blackvein.quests.nms.v1_10_R1.particle; - -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; - -/** - * This is the Eff_1_10_R1 Enum, it contains all valid effects that players can - * use with the 1.10 server version. - * - * @author FlyingPikachu - * @author GregZ_ - * @since 2.6.2 - * @version 3 - */ -public enum Eff_1_10_R1 { - - EXPLOSION(EnumParticle.EXPLOSION_NORMAL), - EXPLOSION_LARGE(EnumParticle.EXPLOSION_LARGE), - EXPLOSION_HUGE(EnumParticle.EXPLOSION_HUGE), - FIREWORKS_SPARK(EnumParticle.FIREWORKS_SPARK), - BUBBLE(EnumParticle.WATER_BUBBLE), - WAKE(EnumParticle.WATER_WAKE), - SPLASH(EnumParticle.WATER_SPLASH), - SUSPENDED(EnumParticle.SUSPENDED), - DEPTH_SUSPEND(EnumParticle.SUSPENDED_DEPTH), - CRIT(EnumParticle.CRIT), - MAGIC_CRIT(EnumParticle.CRIT_MAGIC), - SMOKE(EnumParticle.SMOKE_NORMAL), - LARGE_SMOKE(EnumParticle.SMOKE_LARGE), - SPELL(EnumParticle.SPELL), - INSTANT_SPELL(EnumParticle.SPELL_INSTANT), - MOB_SPELL(EnumParticle.SPELL_MOB), - MOB_SPELL_AMBIENT(EnumParticle.SPELL_MOB_AMBIENT), - WITCH_MAGIC(EnumParticle.SPELL_WITCH), - DRIP_WATER(EnumParticle.DRIP_WATER), - DRIP_LAVA(EnumParticle.DRIP_LAVA), - ANGRY_VILLAGER(EnumParticle.VILLAGER_ANGRY), - HAPPY_VILLAGER(EnumParticle.VILLAGER_HAPPY), - TOWN_AURA(EnumParticle.TOWN_AURA), - NOTE(EnumParticle.NOTE), - PORTAL(EnumParticle.PORTAL), - ENCHANTMENT_TABLE(EnumParticle.ENCHANTMENT_TABLE), - FLAME(EnumParticle.FLAME), - LAVA(EnumParticle.LAVA), - FOOTSTEP(EnumParticle.FOOTSTEP), - CLOUD(EnumParticle.CLOUD), - RED_DUST(EnumParticle.REDSTONE), - SNOWBALL_POOF(EnumParticle.SNOWBALL), - SNOW_SHOVEL(EnumParticle.SNOW_SHOVEL), - SLIME(EnumParticle.SLIME), - HEART(EnumParticle.HEART), - BARRIER(EnumParticle.BARRIER), - ICONCRACK_(EnumParticle.ITEM_CRACK), - BLOCKCRACK_(EnumParticle.BLOCK_CRACK), - BLOCKDUST_(EnumParticle.BLOCK_DUST), - DROPLET(EnumParticle.WATER_DROP), - TAKE(EnumParticle.ITEM_TAKE), - MOB_APPEARANCE(EnumParticle.MOB_APPEARANCE), - SWEEPING_DUST(EnumParticle.SWEEP_ATTACK), - DRAGON_BREATH(EnumParticle.DRAGON_BREATH), - ENDROD(EnumParticle.END_ROD), - DAMAGE_INDICATOR(EnumParticle.DAMAGE_INDICATOR), - FALLING_DUST(EnumParticle.FALLING_DUST); - - /** - * The NMS EnumParticle to be sent to the player. - */ - private final EnumParticle particleEnum; - - /** - * Create a new instance of the Eff_1_10_R1 enum with the given particle type - * to be sent. - * - * @param particleEnum - * The particle type to be sent to the player in the - * PacketPlayOutWorldParticles packet. - */ - Eff_1_10_R1(EnumParticle particleEnum) { - this.particleEnum = particleEnum; - } - - /** - * Send the given particle to the player via NMS. It should be noted that - * all particles have the range limit set to 256 due to the second variable - * in the packet constructor being false. - * - * @param player - * The player to send the particle to. - * @param location - * The location to play the particle at. - * @param offsetX - * The offset of the particle in the X direction. - * @param offsetY - * The offset of the particle in the Y direction. - * @param offsetZ - * The offset of the particle in the Z direction. - * @param speed - * The speed that the particle effect will be played at. - * @param count - * The number of particles to send to the player. - * @param data - * An integer array needed for some particles, this is used for - * packets such as block crack or particle colour on redstone / - * firework particles. - * @throws Exception - * A ReportedException may be thrown if the network manager - * fails to handle the packet. - */ - 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(particleEnum, false, (float) location.getX(), (float) location.getY(), (float) location.getZ(), offsetX, offsetY, offsetZ, speed, count, data); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); - } -} \ No newline at end of file diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml deleted file mode 100644 index 5f3dce41a..000000000 --- a/v1_11_R1/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - me.blackvein.quests - quests-v1_11_R1 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar - - me.blackvein.quests - quests-parent - 3.6.0 - - - - UTF-8 - - - - - org.bukkit - craftbukkit - 1.11.2-R0.1-SNAPSHOT - provided - - - - - clean package install - ${basedir}/src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - - - \ No newline at end of file diff --git a/v1_11_R1/src/main/java/me/blackvein/quests/nms/v1_11_R1/particle/Eff_1_11_R1.java b/v1_11_R1/src/main/java/me/blackvein/quests/nms/v1_11_R1/particle/Eff_1_11_R1.java deleted file mode 100644 index 686a8467e..000000000 --- a/v1_11_R1/src/main/java/me/blackvein/quests/nms/v1_11_R1/particle/Eff_1_11_R1.java +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************************************* - * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *******************************************************************************************************/ - -package me.blackvein.quests.nms.v1_11_R1.particle; - -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; - -/** - * This is the Eff_1_11_R1 Enum, it contains all valid effects that players can - * use with the 1.11 server version. - * - * @author FlyingPikachu - * @author GregZ_ - * @since 2.7.4 - * @version 3 - */ -public enum Eff_1_11_R1 { - - EXPLOSION(EnumParticle.EXPLOSION_NORMAL), - EXPLOSION_LARGE(EnumParticle.EXPLOSION_LARGE), - EXPLOSION_HUGE(EnumParticle.EXPLOSION_HUGE), - FIREWORKS_SPARK(EnumParticle.FIREWORKS_SPARK), - BUBBLE(EnumParticle.WATER_BUBBLE), - WAKE(EnumParticle.WATER_WAKE), - SPLASH(EnumParticle.WATER_SPLASH), - SUSPENDED(EnumParticle.SUSPENDED), - DEPTH_SUSPEND(EnumParticle.SUSPENDED_DEPTH), - CRIT(EnumParticle.CRIT), - MAGIC_CRIT(EnumParticle.CRIT_MAGIC), - SMOKE(EnumParticle.SMOKE_NORMAL), - LARGE_SMOKE(EnumParticle.SMOKE_LARGE), - SPELL(EnumParticle.SPELL), - INSTANT_SPELL(EnumParticle.SPELL_INSTANT), - MOB_SPELL(EnumParticle.SPELL_MOB), - MOB_SPELL_AMBIENT(EnumParticle.SPELL_MOB_AMBIENT), - WITCH_MAGIC(EnumParticle.SPELL_WITCH), - DRIP_WATER(EnumParticle.DRIP_WATER), - DRIP_LAVA(EnumParticle.DRIP_LAVA), - ANGRY_VILLAGER(EnumParticle.VILLAGER_ANGRY), - HAPPY_VILLAGER(EnumParticle.VILLAGER_HAPPY), - TOWN_AURA(EnumParticle.TOWN_AURA), - NOTE(EnumParticle.NOTE), - PORTAL(EnumParticle.PORTAL), - ENCHANTMENT_TABLE(EnumParticle.ENCHANTMENT_TABLE), - FLAME(EnumParticle.FLAME), - LAVA(EnumParticle.LAVA), - FOOTSTEP(EnumParticle.FOOTSTEP), - CLOUD(EnumParticle.CLOUD), - RED_DUST(EnumParticle.REDSTONE), - SNOWBALL_POOF(EnumParticle.SNOWBALL), - SNOW_SHOVEL(EnumParticle.SNOW_SHOVEL), - SLIME(EnumParticle.SLIME), - HEART(EnumParticle.HEART), - BARRIER(EnumParticle.BARRIER), - ICONCRACK_(EnumParticle.ITEM_CRACK), - BLOCKCRACK_(EnumParticle.BLOCK_CRACK), - BLOCKDUST_(EnumParticle.BLOCK_DUST), - DROPLET(EnumParticle.WATER_DROP), - TAKE(EnumParticle.ITEM_TAKE), - MOB_APPEARANCE(EnumParticle.MOB_APPEARANCE), - SWEEPING_DUST(EnumParticle.SWEEP_ATTACK), - DRAGON_BREATH(EnumParticle.DRAGON_BREATH), - ENDROD(EnumParticle.END_ROD), - DAMAGE_INDICATOR(EnumParticle.DAMAGE_INDICATOR), - FALLING_DUST(EnumParticle.FALLING_DUST), - SPIT(EnumParticle.SPIT), - TOTEM(EnumParticle.TOTEM); - - /** - * The NMS EnumParticle to be sent to the player. - */ - private final EnumParticle particleEnum; - - /** - * Create a new instance of the Eff_1_11_R1 enum with the given particle type - * to be sent. - * - * @param particleEnum - * The particle type to be sent to the player in the - * PacketPlayOutWorldParticles packet. - */ - Eff_1_11_R1(EnumParticle particleEnum) { - this.particleEnum = particleEnum; - } - - /** - * Send the given particle to the player via NMS. It should be noted that - * all particles have the range limit set to 256 due to the second variable - * in the packet constructor being false. - * - * @param player - * The player to send the particle to. - * @param location - * The location to play the particle at. - * @param offsetX - * The offset of the particle in the X direction. - * @param offsetY - * The offset of the particle in the Y direction. - * @param offsetZ - * The offset of the particle in the Z direction. - * @param speed - * The speed that the particle effect will be played at. - * @param count - * The number of particles to send to the player. - * @param data - * An integer array needed for some particles, this is used for - * packets such as block crack or particle colour on redstone / - * firework particles. - * @throws Exception - * A ReportedException may be thrown if the network manager - * fails to handle the packet. - */ - 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(particleEnum, false, (float) location.getX(), (float) location.getY(), (float) location.getZ(), offsetX, offsetY, offsetZ, speed, count, data); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); - } -} \ No newline at end of file diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml deleted file mode 100644 index 2088050fc..000000000 --- a/v1_12_R1/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - me.blackvein.quests - quests-v1_12_R1 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar - - me.blackvein.quests - quests-parent - 3.6.0 - - - - UTF-8 - - - - - org.bukkit - craftbukkit - 1.12.2-R0.1-SNAPSHOT - provided - - - - - clean package install - ${basedir}/src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - - - \ No newline at end of file diff --git a/v1_12_R1/src/main/java/me/blackvein/quests/nms/v1_12_R1/particle/Eff_1_12_R1.java b/v1_12_R1/src/main/java/me/blackvein/quests/nms/v1_12_R1/particle/Eff_1_12_R1.java deleted file mode 100644 index 1a65fda8d..000000000 --- a/v1_12_R1/src/main/java/me/blackvein/quests/nms/v1_12_R1/particle/Eff_1_12_R1.java +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************************************* - * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *******************************************************************************************************/ - -package me.blackvein.quests.nms.v1_12_R1.particle; - -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; - -/** - * This is the Eff_1_12_R1 Enum, it contains all valid effects that players can - * use with the 1.12 server version. - * - * @author FlyingPikachu - * @author GregZ_ - * @since 2.8.0 - * @version 3 - */ -public enum Eff_1_12_R1 { - - EXPLOSION(EnumParticle.EXPLOSION_NORMAL), - EXPLOSION_LARGE(EnumParticle.EXPLOSION_LARGE), - EXPLOSION_HUGE(EnumParticle.EXPLOSION_HUGE), - FIREWORKS_SPARK(EnumParticle.FIREWORKS_SPARK), - BUBBLE(EnumParticle.WATER_BUBBLE), - WAKE(EnumParticle.WATER_WAKE), - SPLASH(EnumParticle.WATER_SPLASH), - SUSPENDED(EnumParticle.SUSPENDED), - DEPTH_SUSPEND(EnumParticle.SUSPENDED_DEPTH), - CRIT(EnumParticle.CRIT), - MAGIC_CRIT(EnumParticle.CRIT_MAGIC), - SMOKE(EnumParticle.SMOKE_NORMAL), - LARGE_SMOKE(EnumParticle.SMOKE_LARGE), - SPELL(EnumParticle.SPELL), - INSTANT_SPELL(EnumParticle.SPELL_INSTANT), - MOB_SPELL(EnumParticle.SPELL_MOB), - MOB_SPELL_AMBIENT(EnumParticle.SPELL_MOB_AMBIENT), - WITCH_MAGIC(EnumParticle.SPELL_WITCH), - DRIP_WATER(EnumParticle.DRIP_WATER), - DRIP_LAVA(EnumParticle.DRIP_LAVA), - ANGRY_VILLAGER(EnumParticle.VILLAGER_ANGRY), - HAPPY_VILLAGER(EnumParticle.VILLAGER_HAPPY), - TOWN_AURA(EnumParticle.TOWN_AURA), - NOTE(EnumParticle.NOTE), - PORTAL(EnumParticle.PORTAL), - ENCHANTMENT_TABLE(EnumParticle.ENCHANTMENT_TABLE), - FLAME(EnumParticle.FLAME), - LAVA(EnumParticle.LAVA), - FOOTSTEP(EnumParticle.FOOTSTEP), - CLOUD(EnumParticle.CLOUD), - RED_DUST(EnumParticle.REDSTONE), - SNOWBALL_POOF(EnumParticle.SNOWBALL), - SNOW_SHOVEL(EnumParticle.SNOW_SHOVEL), - SLIME(EnumParticle.SLIME), - HEART(EnumParticle.HEART), - BARRIER(EnumParticle.BARRIER), - ICONCRACK_(EnumParticle.ITEM_CRACK), - BLOCKCRACK_(EnumParticle.BLOCK_CRACK), - BLOCKDUST_(EnumParticle.BLOCK_DUST), - DROPLET(EnumParticle.WATER_DROP), - TAKE(EnumParticle.ITEM_TAKE), - MOB_APPEARANCE(EnumParticle.MOB_APPEARANCE), - SWEEPING_DUST(EnumParticle.SWEEP_ATTACK), - DRAGON_BREATH(EnumParticle.DRAGON_BREATH), - ENDROD(EnumParticle.END_ROD), - DAMAGE_INDICATOR(EnumParticle.DAMAGE_INDICATOR), - FALLING_DUST(EnumParticle.FALLING_DUST), - SPIT(EnumParticle.SPIT), - TOTEM(EnumParticle.TOTEM); - - /** - * The NMS EnumParticle to be sent to the player. - */ - private final EnumParticle particleEnum; - - /** - * Create a new instance of the Eff_1_12_R1 enum with the given particle type - * to be sent. - * - * @param particleEnum - * The particle type to be sent to the player in the - * PacketPlayOutWorldParticles packet. - */ - Eff_1_12_R1(EnumParticle particleEnum) { - this.particleEnum = particleEnum; - } - - /** - * Send the given particle to the player via NMS. It should be noted that - * all particles have the range limit set to 256 due to the second variable - * in the packet constructor being false. - * - * @param player - * The player to send the particle to. - * @param location - * The location to play the particle at. - * @param offsetX - * The offset of the particle in the X direction. - * @param offsetY - * The offset of the particle in the Y direction. - * @param offsetZ - * The offset of the particle in the Z direction. - * @param speed - * The speed that the particle effect will be played at. - * @param count - * The number of particles to send to the player. - * @param data - * An integer array needed for some particles, this is used for - * packets such as block crack or particle colour on redstone / - * firework particles. - * @throws Exception - * A ReportedException may be thrown if the network manager - * fails to handle the packet. - */ - 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(particleEnum, false, (float) location.getX(), (float) location.getY(), (float) location.getZ(), offsetX, offsetY, offsetZ, speed, count, data); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); - } -} \ No newline at end of file diff --git a/v1_13_R1/pom.xml b/v1_13_R1/pom.xml deleted file mode 100644 index 782adfd69..000000000 --- a/v1_13_R1/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - me.blackvein.quests - quests-v1_13_R1 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar - - me.blackvein.quests - quests-parent - 3.6.0 - - - - UTF-8 - - - - - org.bukkit - craftbukkit - 1.13-R0.1-SNAPSHOT - provided - - - - - clean package install - ${basedir}/src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - - - \ No newline at end of file diff --git a/v1_13_R1/src/main/java/me/blackvein/quests/nms/v1_13_R1/particle/Eff_1_13_R1.java b/v1_13_R1/src/main/java/me/blackvein/quests/nms/v1_13_R1/particle/Eff_1_13_R1.java deleted file mode 100644 index ff7e86f77..000000000 --- a/v1_13_R1/src/main/java/me/blackvein/quests/nms/v1_13_R1/particle/Eff_1_13_R1.java +++ /dev/null @@ -1,121 +0,0 @@ -package me.blackvein.quests.nms.v1_13_R1.particle; - -import org.bukkit.Location; -import org.bukkit.Particle; -import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; - -/** - * This is the Eff_1_13_R1 Enum, it contains all valid effects that players can - * use with the 1.13 server version. - * - * @author FlyingPikachu - * @author GregZ_ - * @since 3.3.5 - * @version 3 - */ - -public enum Eff_1_13_R1 { - - EXPLOSION(Particle.EXPLOSION_NORMAL), - EXPLOSION_LARGE(Particle.EXPLOSION_LARGE), - EXPLOSION_HUGE(Particle.EXPLOSION_HUGE), - FIREWORKS_SPARK(Particle.FIREWORKS_SPARK), - BUBBLE(Particle.WATER_BUBBLE), - WAKE(Particle.WATER_WAKE), - SPLASH(Particle.WATER_SPLASH), - SUSPENDED(Particle.SUSPENDED), - DEPTH_SUSPEND(Particle.SUSPENDED_DEPTH), - CRIT(Particle.CRIT), - MAGIC_CRIT(Particle.CRIT_MAGIC), - SMOKE(Particle.SMOKE_NORMAL), - LARGE_SMOKE(Particle.SMOKE_LARGE), - SPELL(Particle.SPELL), - INSTANT_SPELL(Particle.SPELL_INSTANT), - MOB_SPELL(Particle.SPELL_MOB), - MOB_SPELL_AMBIENT(Particle.SPELL_MOB_AMBIENT), - WITCH_MAGIC(Particle.SPELL_WITCH), - DRIP_WATER(Particle.DRIP_WATER), - DRIP_LAVA(Particle.DRIP_LAVA), - ANGRY_VILLAGER(Particle.VILLAGER_ANGRY), - HAPPY_VILLAGER(Particle.VILLAGER_HAPPY), - TOWN_AURA(Particle.TOWN_AURA), - NOTE(Particle.NOTE), - PORTAL(Particle.PORTAL), - ENCHANTMENT_TABLE(Particle.ENCHANTMENT_TABLE), - FLAME(Particle.FLAME), - LAVA(Particle.LAVA), - CLOUD(Particle.CLOUD), - RED_DUST(Particle.REDSTONE), - SNOWBALL_POOF(Particle.SNOWBALL), - SNOW_SHOVEL(Particle.SNOW_SHOVEL), - SLIME(Particle.SLIME), - HEART(Particle.HEART), - BARRIER(Particle.BARRIER), - ICONCRACK_(Particle.ITEM_CRACK), - BLOCKCRACK_(Particle.BLOCK_CRACK), - BLOCKDUST_(Particle.BLOCK_DUST), - DROPLET(Particle.WATER_DROP), - MOB_APPEARANCE(Particle.MOB_APPEARANCE), - SWEEPING_DUST(Particle.SWEEP_ATTACK), - DRAGON_BREATH(Particle.DRAGON_BREATH), - ENDROD(Particle.END_ROD), - DAMAGE_INDICATOR(Particle.DAMAGE_INDICATOR), - FALLING_DUST(Particle.FALLING_DUST), - SPIT(Particle.SPIT), - TOTEM(Particle.TOTEM), - BUBBLE_COLUMN_UP(Particle.BUBBLE_COLUMN_UP), - BUBBLE_POP(Particle.BUBBLE_POP), - CURRENT_DOWN(Particle.CURRENT_DOWN), - SQUID_INK(Particle.SQUID_INK), - NAUTILUS(Particle.NAUTILUS), - DOLPHIN(Particle.DOLPHIN); - - /** - * The NMS Particle to be sent to the player. - */ - private final Particle particleEnum; - - /** - * Create a new instance of the Eff_1_13_R1 enum with the given particle type - * to be sent. - * - * @param particleEnum - * The particle type to be sent to the player in the - * PacketPlayOutWorldParticles packet. - */ - Eff_1_13_R1(Particle particleEnum) { - this.particleEnum = particleEnum; - } - - /** - * Send the given particle to the player via NMS. It should be noted that - * all particles have the range limit set to 256 due to the second variable - * in the packet constructor being false. - * - * @param player - * The player to send the particle to. - * @param location - * The location to play the particle at. - * @param offsetX - * The offset of the particle in the X direction. - * @param offsetY - * The offset of the particle in the Y direction. - * @param offsetZ - * The offset of the particle in the Z direction. - * @param speed - * The speed that the particle effect will be played at. - * @param count - * The number of particles to send to the player. - * @param data - * An integer array needed for some particles, this is used for - * packets such as block crack or particle colour on redstone / - * firework particles. - * @throws Exception - * A ReportedException may be thrown if the network manager - * fails to handle the packet. - */ - public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception { - ((CraftPlayer) player).spawnParticle(particleEnum, location, count, offsetX, offsetY, offsetZ, speed, data); - } -} diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml deleted file mode 100644 index 64d34c443..000000000 --- a/v1_13_R2/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - 4.0.0 - - me.blackvein.quests - quests-parent - 3.6.0 - - quests-v1_13_R2 - - - UTF-8 - - - - - org.bukkit - craftbukkit - 1.13.2-R0.1-SNAPSHOT - provided - - - - - clean package install - ${basedir}/src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - - - \ No newline at end of file diff --git a/v1_13_R2/src/main/java/me/blackvein/quests/nms/v1_13_R2/particle/Eff_1_13_R2.java b/v1_13_R2/src/main/java/me/blackvein/quests/nms/v1_13_R2/particle/Eff_1_13_R2.java deleted file mode 100644 index ee26dd7f1..000000000 --- a/v1_13_R2/src/main/java/me/blackvein/quests/nms/v1_13_R2/particle/Eff_1_13_R2.java +++ /dev/null @@ -1,120 +0,0 @@ -package me.blackvein.quests.nms.v1_13_R2.particle; - -import org.bukkit.Location; -import org.bukkit.Particle; -import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer; -import org.bukkit.entity.Player; - -/** - * This is the Eff_1_13_R2 Enum, it contains all valid effects that players can - * use with the 1.13.2 server version. - * - * @author FlyingPikachu - * @since 3.4.1 - * @version 3 - */ - -public enum Eff_1_13_R2 { - - EXPLOSION(Particle.EXPLOSION_NORMAL), - EXPLOSION_LARGE(Particle.EXPLOSION_LARGE), - EXPLOSION_HUGE(Particle.EXPLOSION_HUGE), - FIREWORKS_SPARK(Particle.FIREWORKS_SPARK), - BUBBLE(Particle.WATER_BUBBLE), - WAKE(Particle.WATER_WAKE), - SPLASH(Particle.WATER_SPLASH), - SUSPENDED(Particle.SUSPENDED), - DEPTH_SUSPEND(Particle.SUSPENDED_DEPTH), - CRIT(Particle.CRIT), - MAGIC_CRIT(Particle.CRIT_MAGIC), - SMOKE(Particle.SMOKE_NORMAL), - LARGE_SMOKE(Particle.SMOKE_LARGE), - SPELL(Particle.SPELL), - INSTANT_SPELL(Particle.SPELL_INSTANT), - MOB_SPELL(Particle.SPELL_MOB), - MOB_SPELL_AMBIENT(Particle.SPELL_MOB_AMBIENT), - WITCH_MAGIC(Particle.SPELL_WITCH), - DRIP_WATER(Particle.DRIP_WATER), - DRIP_LAVA(Particle.DRIP_LAVA), - ANGRY_VILLAGER(Particle.VILLAGER_ANGRY), - HAPPY_VILLAGER(Particle.VILLAGER_HAPPY), - TOWN_AURA(Particle.TOWN_AURA), - NOTE(Particle.NOTE), - PORTAL(Particle.PORTAL), - ENCHANTMENT_TABLE(Particle.ENCHANTMENT_TABLE), - FLAME(Particle.FLAME), - LAVA(Particle.LAVA), - CLOUD(Particle.CLOUD), - RED_DUST(Particle.REDSTONE), - SNOWBALL_POOF(Particle.SNOWBALL), - SNOW_SHOVEL(Particle.SNOW_SHOVEL), - SLIME(Particle.SLIME), - HEART(Particle.HEART), - BARRIER(Particle.BARRIER), - ICONCRACK_(Particle.ITEM_CRACK), - BLOCKCRACK_(Particle.BLOCK_CRACK), - BLOCKDUST_(Particle.BLOCK_DUST), - DROPLET(Particle.WATER_DROP), - MOB_APPEARANCE(Particle.MOB_APPEARANCE), - SWEEPING_DUST(Particle.SWEEP_ATTACK), - DRAGON_BREATH(Particle.DRAGON_BREATH), - ENDROD(Particle.END_ROD), - DAMAGE_INDICATOR(Particle.DAMAGE_INDICATOR), - FALLING_DUST(Particle.FALLING_DUST), - SPIT(Particle.SPIT), - TOTEM(Particle.TOTEM), - BUBBLE_COLUMN_UP(Particle.BUBBLE_COLUMN_UP), - BUBBLE_POP(Particle.BUBBLE_POP), - CURRENT_DOWN(Particle.CURRENT_DOWN), - SQUID_INK(Particle.SQUID_INK), - NAUTILUS(Particle.NAUTILUS), - DOLPHIN(Particle.DOLPHIN); - - /** - * The NMS Particle to be sent to the player. - */ - private final Particle particleEnum; - - /** - * Create a new instance of the Eff_1_13_R2 enum with the given particle type - * to be sent. - * - * @param particleEnum - * The particle type to be sent to the player in the - * PacketPlayOutWorldParticles packet. - */ - Eff_1_13_R2(Particle particleEnum) { - this.particleEnum = particleEnum; - } - - /** - * Send the given particle to the player via NMS. It should be noted that - * all particles have the range limit set to 256 due to the second variable - * in the packet constructor being false. - * - * @param player - * The player to send the particle to. - * @param location - * The location to play the particle at. - * @param offsetX - * The offset of the particle in the X direction. - * @param offsetY - * The offset of the particle in the Y direction. - * @param offsetZ - * The offset of the particle in the Z direction. - * @param speed - * The speed that the particle effect will be played at. - * @param count - * The number of particles to send to the player. - * @param data - * An integer array needed for some particles, this is used for - * packets such as block crack or particle colour on redstone / - * firework particles. - * @throws Exception - * A ReportedException may be thrown if the network manager - * fails to handle the packet. - */ - public void sendToPlayer(Player player, Location location, float offsetX, float offsetY, float offsetZ, float speed, int count, int[] data) throws Exception { - ((CraftPlayer) player).spawnParticle(particleEnum, location, count, offsetX, offsetY, offsetZ, speed, data); - } -} diff --git a/v1_8_R1/pom.xml b/v1_8_R1/pom.xml index 5a32f38e4..333897d37 100644 --- a/v1_8_R1/pom.xml +++ b/v1_8_R1/pom.xml @@ -1,11 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.blackvein.quests quests-v1_8_R1 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar me.blackvein.quests quests-parent @@ -23,6 +19,12 @@ 1.8-R0.1-SNAPSHOT provided + + me.blackvein.quests + quests-main + ${project.parent.version} + compile + diff --git a/v1_8_R2/pom.xml b/v1_8_R2/pom.xml index 7729ecdb9..f2751ebea 100644 --- a/v1_8_R2/pom.xml +++ b/v1_8_R2/pom.xml @@ -1,11 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.blackvein.quests quests-v1_8_R2 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar me.blackvein.quests quests-parent @@ -23,6 +19,12 @@ 1.8.3-R0.1-SNAPSHOT provided + + me.blackvein.quests + quests-main + ${project.parent.version} + compile + diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index 68d1166f6..aef06126b 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -1,11 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.blackvein.quests quests-v1_8_R3 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar me.blackvein.quests quests-parent @@ -23,6 +19,12 @@ 1.8.8-R0.1-SNAPSHOT provided + + me.blackvein.quests + quests-main + ${project.parent.version} + compile + diff --git a/v1_9_R1/pom.xml b/v1_9_R1/pom.xml deleted file mode 100644 index c3f2793d1..000000000 --- a/v1_9_R1/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - me.blackvein.quests - quests-v1_9_R1 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar - - me.blackvein.quests - quests-parent - 3.6.0 - - - - UTF-8 - - - - - org.bukkit - craftbukkit - 1.9.2-R0.1-SNAPSHOT - provided - - - - - clean package install - ${basedir}/src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - - - \ No newline at end of file diff --git a/v1_9_R1/src/main/java/me/blackvein/quests/nms/v1_9_R1/particle/Eff_1_9_R1.java b/v1_9_R1/src/main/java/me/blackvein/quests/nms/v1_9_R1/particle/Eff_1_9_R1.java deleted file mode 100644 index 688be6ed5..000000000 --- a/v1_9_R1/src/main/java/me/blackvein/quests/nms/v1_9_R1/particle/Eff_1_9_R1.java +++ /dev/null @@ -1,129 +0,0 @@ -/******************************************************************************************************* - * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *******************************************************************************************************/ - -package me.blackvein.quests.nms.v1_9_R1.particle; - -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; - -/** - * This is the Eff_1_9_R1 Enum, it contains all valid effects that players can - * use with the 1.9 server version. - * - * @author FlyingPikachu - * @author woutwoot - * @author GregZ_ - * @since 2.6.0 - * @version 5 - */ -public enum Eff_1_9_R1 { - - EXPLOSION(EnumParticle.EXPLOSION_NORMAL), - EXPLOSION_LARGE(EnumParticle.EXPLOSION_LARGE), - EXPLOSION_HUGE(EnumParticle.EXPLOSION_HUGE), - FIREWORKS_SPARK(EnumParticle.FIREWORKS_SPARK), - BUBBLE(EnumParticle.WATER_BUBBLE), - WAKE(EnumParticle.WATER_WAKE), - SPLASH(EnumParticle.WATER_SPLASH), - SUSPENDED(EnumParticle.SUSPENDED), - DEPTH_SUSPEND(EnumParticle.SUSPENDED_DEPTH), - CRIT(EnumParticle.CRIT), - MAGIC_CRIT(EnumParticle.CRIT_MAGIC), - SMOKE(EnumParticle.SMOKE_NORMAL), - LARGE_SMOKE(EnumParticle.SMOKE_LARGE), - SPELL(EnumParticle.SPELL), - INSTANT_SPELL(EnumParticle.SPELL_INSTANT), - MOB_SPELL(EnumParticle.SPELL_MOB), - MOB_SPELL_AMBIENT(EnumParticle.SPELL_MOB_AMBIENT), - WITCH_MAGIC(EnumParticle.SPELL_WITCH), - DRIP_WATER(EnumParticle.DRIP_WATER), - DRIP_LAVA(EnumParticle.DRIP_LAVA), - ANGRY_VILLAGER(EnumParticle.VILLAGER_ANGRY), - HAPPY_VILLAGER(EnumParticle.VILLAGER_HAPPY), - TOWN_AURA(EnumParticle.TOWN_AURA), - NOTE(EnumParticle.NOTE), - PORTAL(EnumParticle.PORTAL), - ENCHANTMENT_TABLE(EnumParticle.ENCHANTMENT_TABLE), - FLAME(EnumParticle.FLAME), - LAVA(EnumParticle.LAVA), - FOOTSTEP(EnumParticle.FOOTSTEP), - CLOUD(EnumParticle.CLOUD), - RED_DUST(EnumParticle.REDSTONE), - SNOWBALL_POOF(EnumParticle.SNOWBALL), - SNOW_SHOVEL(EnumParticle.SNOW_SHOVEL), - SLIME(EnumParticle.SLIME), - HEART(EnumParticle.HEART), - BARRIER(EnumParticle.BARRIER), - ICONCRACK_(EnumParticle.ITEM_CRACK), - BLOCKCRACK_(EnumParticle.BLOCK_CRACK), - BLOCKDUST_(EnumParticle.BLOCK_DUST), - DROPLET(EnumParticle.WATER_DROP), - TAKE(EnumParticle.ITEM_TAKE), - MOB_APPEARANCE(EnumParticle.MOB_APPEARANCE), - SWEEPING_DUST(EnumParticle.SWEEP_ATTACK), - DRAGON_BREATH(EnumParticle.DRAGON_BREATH), - ENDROD(EnumParticle.END_ROD), - DAMAGE_INDICATOR(EnumParticle.DAMAGE_INDICATOR),; - - /** - * The NMS EnumParticle to be sent to the player. - */ - private final EnumParticle particleEnum; - - /** - * Create a new instance of the Eff_1_9_R1 enum with the given particle type - * to be sent. - * - * @param particleEnum - * The particle type to be sent to the player in the - * PacketPlayOutWorldParticles packet. - */ - Eff_1_9_R1(EnumParticle particleEnum) { - this.particleEnum = particleEnum; - } - - /** - * Send the given particle to the player via NMS. It should be noted that - * all particles have the range limit set to 256 due to the second variable - * in the packet constructor being false. - * - * @param player - * The player to send the particle to. - * @param location - * The location to play the particle at. - * @param offsetX - * The offset of the particle in the X direction. - * @param offsetY - * The offset of the particle in the Y direction. - * @param offsetZ - * The offset of the particle in the Z direction. - * @param speed - * The speed that the particle effect will be played at. - * @param count - * The number of particles to send to the player. - * @param data - * An integer array needed for some particles, this is used for - * packets such as block crack or particle colour on redstone / - * firework particles. - * @throws Exception - * A ReportedException may be thrown if the network manager - * fails to handle the packet. - */ - 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(particleEnum, false, (float) location.getX(), (float) location.getY(), (float) location.getZ(), offsetX, offsetY, offsetZ, speed, count, data); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); - } -} \ No newline at end of file diff --git a/v1_9_R2/pom.xml b/v1_9_R2/pom.xml deleted file mode 100644 index 251f4ece1..000000000 --- a/v1_9_R2/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - me.blackvein.quests - quests-v1_9_R2 - 3.6.0 - https://github.com/FlyingPikachu/Quests/ - jar - - me.blackvein.quests - quests-parent - 3.6.0 - - - - UTF-8 - - - - - org.bukkit - craftbukkit - 1.9.4-R0.1-SNAPSHOT - provided - - - - - clean package install - ${basedir}/src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - - - \ No newline at end of file diff --git a/v1_9_R2/src/main/java/me/blackvein/quests/nms/v1_9_R2/particle/Eff_1_9_R2.java b/v1_9_R2/src/main/java/me/blackvein/quests/nms/v1_9_R2/particle/Eff_1_9_R2.java deleted file mode 100644 index bdab717f4..000000000 --- a/v1_9_R2/src/main/java/me/blackvein/quests/nms/v1_9_R2/particle/Eff_1_9_R2.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************************************* - * Continued by FlyingPikachu/HappyPikachu with permission from _Blackvein_. All rights reserved. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *******************************************************************************************************/ - -package me.blackvein.quests.nms.v1_9_R2.particle; - -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; - -/** - * This is the Eff_1_9_R2 Enum, it contains all valid effects that players can - * use with the 1.9.4 server version. - * - * @author FlyingPikachu - * @author GregZ_ - * @since 2.6.1 - * @version 4 - */ -public enum Eff_1_9_R2 { - - EXPLOSION(EnumParticle.EXPLOSION_NORMAL), - EXPLOSION_LARGE(EnumParticle.EXPLOSION_LARGE), - EXPLOSION_HUGE(EnumParticle.EXPLOSION_HUGE), - FIREWORKS_SPARK(EnumParticle.FIREWORKS_SPARK), - BUBBLE(EnumParticle.WATER_BUBBLE), - WAKE(EnumParticle.WATER_WAKE), - SPLASH(EnumParticle.WATER_SPLASH), - SUSPENDED(EnumParticle.SUSPENDED), - DEPTH_SUSPEND(EnumParticle.SUSPENDED_DEPTH), - CRIT(EnumParticle.CRIT), - MAGIC_CRIT(EnumParticle.CRIT_MAGIC), - SMOKE(EnumParticle.SMOKE_NORMAL), - LARGE_SMOKE(EnumParticle.SMOKE_LARGE), - SPELL(EnumParticle.SPELL), - INSTANT_SPELL(EnumParticle.SPELL_INSTANT), - MOB_SPELL(EnumParticle.SPELL_MOB), - MOB_SPELL_AMBIENT(EnumParticle.SPELL_MOB_AMBIENT), - WITCH_MAGIC(EnumParticle.SPELL_WITCH), - DRIP_WATER(EnumParticle.DRIP_WATER), - DRIP_LAVA(EnumParticle.DRIP_LAVA), - ANGRY_VILLAGER(EnumParticle.VILLAGER_ANGRY), - HAPPY_VILLAGER(EnumParticle.VILLAGER_HAPPY), - TOWN_AURA(EnumParticle.TOWN_AURA), - NOTE(EnumParticle.NOTE), - PORTAL(EnumParticle.PORTAL), - ENCHANTMENT_TABLE(EnumParticle.ENCHANTMENT_TABLE), - FLAME(EnumParticle.FLAME), - LAVA(EnumParticle.LAVA), - FOOTSTEP(EnumParticle.FOOTSTEP), - CLOUD(EnumParticle.CLOUD), - RED_DUST(EnumParticle.REDSTONE), - SNOWBALL_POOF(EnumParticle.SNOWBALL), - SNOW_SHOVEL(EnumParticle.SNOW_SHOVEL), - SLIME(EnumParticle.SLIME), - HEART(EnumParticle.HEART), - BARRIER(EnumParticle.BARRIER), - ICONCRACK_(EnumParticle.ITEM_CRACK), - BLOCKCRACK_(EnumParticle.BLOCK_CRACK), - BLOCKDUST_(EnumParticle.BLOCK_DUST), - DROPLET(EnumParticle.WATER_DROP), - TAKE(EnumParticle.ITEM_TAKE), - MOB_APPEARANCE(EnumParticle.MOB_APPEARANCE), - SWEEPING_DUST(EnumParticle.SWEEP_ATTACK), - DRAGON_BREATH(EnumParticle.DRAGON_BREATH), - ENDROD(EnumParticle.END_ROD), - DAMAGE_INDICATOR(EnumParticle.DAMAGE_INDICATOR),; - - /** - * The NMS EnumParticle to be sent to the player. - */ - private final EnumParticle particleEnum; - - /** - * Create a new instance of the Eff_1_9_R2 enum with the given particle type - * to be sent. - * - * @param particleEnum - * The particle type to be sent to the player in the - * PacketPlayOutWorldParticles packet. - */ - Eff_1_9_R2(EnumParticle particleEnum) { - this.particleEnum = particleEnum; - } - - /** - * Send the given particle to the player via NMS. It should be noted that - * all particles have the range limit set to 256 due to the second variable - * in the packet constructor being false. - * - * @param player - * The player to send the particle to. - * @param location - * The location to play the particle at. - * @param offsetX - * The offset of the particle in the X direction. - * @param offsetY - * The offset of the particle in the Y direction. - * @param offsetZ - * The offset of the particle in the Z direction. - * @param speed - * The speed that the particle effect will be played at. - * @param count - * The number of particles to send to the player. - * @param data - * An integer array needed for some particles, this is used for - * packets such as block crack or particle colour on redstone / - * firework particles. - * @throws Exception - * A ReportedException may be thrown if the network manager - * fails to handle the packet. - */ - 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(particleEnum, false, (float) location.getX(), (float) location.getY(), (float) location.getZ(), offsetX, offsetY, offsetZ, speed, count, data); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); - } -} \ No newline at end of file