TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Updated to MC v1.9 (#579)

Browse source 
* Update to MC v1.9

* Added MC version into /pk v

* Changed Spigot.jar in lib folder
This commit is contained in:
Sobki 2016-09-27 09:14:57 +10:00 committed by Christopher Martin
parent 749669e84c
commit d566e3664b
15 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
lib/spigot-1.8.7.jar → lib/spigot-1.9.4.jar
View file

Binary file not shown.

2
src/com/projectkorra/projectkorra/ability/AirAbility.java
View file

@ -119,7 +119,7 @@ public abstract class AirAbility extends ElementalAbility {
*/ */
public static void playAirbendingSound(Location loc) { public static void playAirbendingSound(Location loc) {
if (getConfig().getBoolean("Properties.Air.PlaySound")) { if (getConfig().getBoolean("Properties.Air.PlaySound")) {
loc.getWorld().playSound(loc, Sound.CREEPER_HISS, 1, 5); loc.getWorld().playSound(loc, Sound.ENTITY_CREEPER_HURT, 1, 5);
} }
} }

2
src/com/projectkorra/projectkorra/ability/AvatarAbility.java
View file

@ -28,7 +28,7 @@ public abstract class AvatarAbility extends ElementalAbility {
} }
public static void playAvatarSound(Location loc) { public static void playAvatarSound(Location loc) {
loc.getWorld().playSound(loc, Sound.ANVIL_LAND, 1, 10); loc.getWorld().playSound(loc, Sound.BLOCK_ANVIL_LAND, 1, 10);
} }
/**Determines whether the ability requires the user to be an avatar in order to be able /**Determines whether the ability requires the user to be an avatar in order to be able

4
src/com/projectkorra/projectkorra/ability/EarthAbility.java
View file

@ -497,13 +497,13 @@ public abstract class EarthAbility extends ElementalAbility {
public static void playMetalbendingSound(Location loc) { public static void playMetalbendingSound(Location loc) {
if (getConfig().getBoolean("Properties.Earth.PlaySound")) { if (getConfig().getBoolean("Properties.Earth.PlaySound")) {
loc.getWorld().playSound(loc, Sound.IRONGOLEM_HIT, 1, 10); loc.getWorld().playSound(loc, Sound.ENTITY_IRONGOLEM_HURT, 1, 10);
} }
} }
public static void playSandBendingSound(Location loc) { public static void playSandBendingSound(Location loc) {
if (getConfig().getBoolean("Properties.Earth.PlaySound")) { if (getConfig().getBoolean("Properties.Earth.PlaySound")) {
loc.getWorld().playSound(loc, Sound.DIG_SAND, 1.5f, 5); loc.getWorld().playSound(loc, Sound.BLOCK_SAND_BREAK, 1.5f, 5);
} }
} }

4
src/com/projectkorra/projectkorra/ability/FireAbility.java
View file

@ -152,7 +152,7 @@ public abstract class FireAbility extends ElementalAbility {
public static void playCombustionSound(Location loc) { public static void playCombustionSound(Location loc) {
if (getConfig().getBoolean("Properties.Fire.PlaySound")) { if (getConfig().getBoolean("Properties.Fire.PlaySound")) {
loc.getWorld().playSound(loc, Sound.FIREWORK_BLAST, 1, -1); loc.getWorld().playSound(loc, Sound.ENTITY_FIREWORK_BLAST, 1, -1);
} }
} }
@ -162,7 +162,7 @@ public abstract class FireAbility extends ElementalAbility {
public static void playFirebendingSound(Location loc) { public static void playFirebendingSound(Location loc) {
if (getConfig().getBoolean("Properties.Fire.PlaySound")) { if (getConfig().getBoolean("Properties.Fire.PlaySound")) {
loc.getWorld().playSound(loc, Sound.FIRE, 1, 10); loc.getWorld().playSound(loc, Sound.BLOCK_FIRE_AMBIENT, 1, 10);
} }
} }

6
src/com/projectkorra/projectkorra/ability/WaterAbility.java
View file

@ -284,19 +284,19 @@ public abstract class WaterAbility extends ElementalAbility {
public static void playIcebendingSound(Location loc) { public static void playIcebendingSound(Location loc) {
if (getConfig().getBoolean("Properties.Water.PlaySound")) { if (getConfig().getBoolean("Properties.Water.PlaySound")) {
loc.getWorld().playSound(loc, Sound.FIRE_IGNITE, 2, 10); loc.getWorld().playSound(loc, Sound.ITEM_FLINTANDSTEEL_USE, 2, 10);
} }
} }
public static void playPlantbendingSound(Location loc) { public static void playPlantbendingSound(Location loc) {
if (getConfig().getBoolean("Properties.Water.PlaySound")) { if (getConfig().getBoolean("Properties.Water.PlaySound")) {
loc.getWorld().playSound(loc, Sound.STEP_GRASS, 1, 10); loc.getWorld().playSound(loc, Sound.BLOCK_GRASS_STEP, 1, 10);
} }
} }
public static void playWaterbendingSound(Location loc) { public static void playWaterbendingSound(Location loc) {
if (getConfig().getBoolean("Properties.Water.PlaySound")) { if (getConfig().getBoolean("Properties.Water.PlaySound")) {
loc.getWorld().playSound(loc, Sound.WATER, 1, 10); loc.getWorld().playSound(loc, Sound.BLOCK_WATER_AMBIENT, 1, 10);
} }
} }

4
src/com/projectkorra/projectkorra/airbending/AirBlast.java
View file

@ -299,10 +299,10 @@ public class AirBlast extends AirAbility {
if (block.getData() < 4) { if (block.getData() < 4) {
block.setData((byte) (block.getData() + 4)); block.setData((byte) (block.getData() + 4));
block.getWorld().playSound(block.getLocation(), Sound.DOOR_CLOSE, 10, 1); block.getWorld().playSound(block.getLocation(), Sound.BLOCK_WOODEN_DOOR_CLOSE, 10, 1);
} else { } else {
block.setData((byte) (block.getData() - 4)); block.setData((byte) (block.getData() - 4));
block.getWorld().playSound(block.getLocation(), Sound.DOOR_OPEN, 10, 1); block.getWorld().playSound(block.getLocation(), Sound.BLOCK_WOODEN_DOOR_OPEN, 10, 1);
} }
} }
if ((block.getType() == Material.LEVER) && !affectedLevers.contains(block) && canFlickLevers) { if ((block.getType() == Material.LEVER) && !affectedLevers.contains(block) && canFlickLevers) {

2
src/com/projectkorra/projectkorra/command/VersionCommand.java
View file

@ -24,7 +24,7 @@ public class VersionCommand extends PKCommand {
return; return;
} }
sender.sendMessage(ChatColor.GREEN + "Core Version: " + ChatColor.RED + ProjectKorra.plugin.getDescription().getVersion()); sender.sendMessage(ChatColor.GREEN + "Core Version: " + ChatColor.RED + ProjectKorra.plugin.getDescription().getVersion() + " (MC 1.9)");
if (GeneralMethods.hasRPG()) { if (GeneralMethods.hasRPG()) {
sender.sendMessage(ChatColor.GREEN + "RPG Version: " + ChatColor.RED + GeneralMethods.getRPG().getDescription().getVersion()); sender.sendMessage(ChatColor.GREEN + "RPG Version: " + ChatColor.RED + GeneralMethods.getRPG().getDescription().getVersion());
} }

2
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -262,7 +262,7 @@ public class ConfigManager {
config.addDefault("Abilities.Water.Surge.Description", "This ability has two distinct features. If you sneak to select a source block, you can then click in a direction and a large wave will be launched in that direction. If you sneak again while the wave is en route, the wave will freeze the next target it hits. If, instead, you click to select a source block, you can hold sneak to form a wall of water at your cursor location. Click to shift between a water wall and an ice wall. Release sneak to dissipate it."); config.addDefault("Abilities.Water.Surge.Description", "This ability has two distinct features. If you sneak to select a source block, you can then click in a direction and a large wave will be launched in that direction. If you sneak again while the wave is en route, the wave will freeze the next target it hits. If, instead, you click to select a source block, you can hold sneak to form a wall of water at your cursor location. Click to shift between a water wall and an ice wall. Release sneak to dissipate it.");
config.addDefault("Abilities.Water.Torrent.Description", "Torrent is one of the strongest moves in a waterbender's arsenal. To use, first click a source block to select it; then hold shift to begin streaming the water around you. Water flowing around you this way will damage and knock back nearby enemies and projectiles. If you release shift during this, you will create a large wave that expands outwards from you, launching anything in its path back. Instead, if you click you release the water and channel it to flow towards your cursor. Anything caught in the blast will be tossed about violently and take damage. Finally, if you click again when the water is torrenting, it will freeze the area around it when it is obstructed."); config.addDefault("Abilities.Water.Torrent.Description", "Torrent is one of the strongest moves in a waterbender's arsenal. To use, first click a source block to select it; then hold shift to begin streaming the water around you. Water flowing around you this way will damage and knock back nearby enemies and projectiles. If you release shift during this, you will create a large wave that expands outwards from you, launching anything in its path back. Instead, if you click you release the water and channel it to flow towards your cursor. Anything caught in the blast will be tossed about violently and take damage. Finally, if you click again when the water is torrenting, it will freeze the area around it when it is obstructed.");
config.addDefault("Abilities.Water.Torrent.DeathMessage", "{victim} was taken down by {attacker}'s {ability}"); config.addDefault("Abilities.Water.Torrent.DeathMessage", "{victim} was taken down by {attacker}'s {ability}");
config.addDefault("Abilities.Water.WaterArms.Description", "One of the most diverse moves in a Waterbender's arsenal, this move creates tendrils " + "of water from the players arms to emulate their actual arms. Each water arms mode will be binded to a slot, switch slots to change mode. " + "To deactive the arms, hold Sneak and Double Left-Click." + "\nPull - Use your Arms to pull blocks, items, mobs or even players towards you!" + "\nPunch - An offensive attack, harming players or mobs!" + "\nGrapple - Scale walls and speed across battlefields, using your Arms as a grappling hook!" + "\nGrab - Grab an entity with your arm, and swing them about!" + "\nFreeze - Use your Arms to fire small blasts of ice in any direction!" + "\nSpear - Throw your Arms in any direction, freezing whatever it hits!"); config.addDefault("Abilities.Water.WaterArms.Description", "One of the most diverse moves in a Waterbender's arsenal, this move creates tendrils " + "of water from the players arms to emulate their actual arms. Each water arms mode will be bound to a slot, switch slots to change mode. " + "To deactive the arms, hold Sneak and Double Left-Click." + "\nPull - Use your Arms to pull blocks, items, mobs or even players towards you!" + "\nPunch - An offensive attack, harming players or mobs!" + "\nGrapple - Scale walls and speed across battlefields, using your Arms as a grappling hook!" + "\nGrab - Grab an entity with your arm, and swing them about!" + "\nFreeze - Use your Arms to fire small blasts of ice in any direction!" + "\nSpear - Throw your Arms in any direction, freezing whatever it hits!");
config.addDefault("Abilities.Water.WaterArms.SneakMessage", "Active Ability:"); config.addDefault("Abilities.Water.WaterArms.SneakMessage", "Active Ability:");
config.addDefault("Abilities.Water.WaterArms.Punch.Description", "{victim} was too slow for {attacker}'s {ability}"); config.addDefault("Abilities.Water.WaterArms.Punch.Description", "{victim} was too slow for {attacker}'s {ability}");
config.addDefault("Abilities.Water.WaterArms.Freeze.Description", "{victim} was frozen by {attacker}'s {ability}"); config.addDefault("Abilities.Water.WaterArms.Freeze.Description", "{victim} was frozen by {attacker}'s {ability}");

4
src/com/projectkorra/projectkorra/earthbending/EarthPassive.java
View file

@ -118,10 +118,10 @@ public class EarthPassive {
if (block.getData() < 4) { if (block.getData() < 4) {
block.setData((byte) (block.getData() + 4)); block.setData((byte) (block.getData() + 4));
block.getWorld().playSound(block.getLocation(), Sound.DOOR_CLOSE, 10, 1); block.getWorld().playSound(block.getLocation(), Sound.BLOCK_IRON_DOOR_CLOSE, 10, 1);
} else { } else {
block.setData((byte) (block.getData() - 4)); block.setData((byte) (block.getData() - 4));
block.getWorld().playSound(block.getLocation(), Sound.DOOR_OPEN, 10, 1); block.getWorld().playSound(block.getLocation(), Sound.BLOCK_IRON_DOOR_OPEN, 10, 1);
} }
bPlayer.addCooldown("MetalPassive", 200); bPlayer.addCooldown("MetalPassive", 200);

2
src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java
View file

@ -180,7 +180,7 @@ public class FireBlastCharged extends FireAbility {
DamageHandler.damageEntity(entity, damage, this); DamageHandler.damageEntity(entity, damage, this);
} }
} }
location.getWorld().playSound(location, Sound.EXPLODE, 5, 1); location.getWorld().playSound(location, Sound.ENTITY_GENERIC_EXPLODE, 5, 1);
ParticleEffect.EXPLOSION_HUGE.display(new Vector(0, 0, 0), 0, location, 256); ParticleEffect.EXPLOSION_HUGE.display(new Vector(0, 0, 0), 0, location, 256);
} }
} }

16
src/com/projectkorra/projectkorra/firebending/FireCombo.java
View file

@ -176,7 +176,7 @@ public class FireCombo extends FireAbility implements ComboAbility {
if (GeneralMethods.isRegionProtectedFromBuild(player, "Blaze", entity.getLocation())) { if (GeneralMethods.isRegionProtectedFromBuild(player, "Blaze", entity.getLocation())) {
return; return;
} }
entity.getLocation().getWorld().playSound(entity.getLocation(), Sound.VILLAGER_HIT, 0.3f, 0.3f); entity.getLocation().getWorld().playSound(entity.getLocation(), Sound.ENTITY_VILLAGER_HURT, 0.3f, 0.3f);
if (ability.equalsIgnoreCase("FireKick")) { if (ability.equalsIgnoreCase("FireKick")) {
if (!affectedEntities.contains(entity)) { if (!affectedEntities.contains(entity)) {
@ -244,8 +244,8 @@ public class FireCombo extends FireAbility implements ComboAbility {
Vector eyeDir = player.getEyeLocation().getDirection().normalize().multiply(range); Vector eyeDir = player.getEyeLocation().getDirection().normalize().multiply(range);
destination = player.getEyeLocation().add(eyeDir); destination = player.getEyeLocation().add(eyeDir);
player.getWorld().playSound(player.getLocation(), Sound.HORSE_JUMP, 0.5f, 0f); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_HORSE_JUMP, 0.5f, 0f);
player.getWorld().playSound(player.getLocation(), Sound.FIZZ, 0.5f, 1f); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 0.5f, 1f);
for (int i = -30; i <= 30; i += 5) { for (int i = -30; i <= 30; i += 5) {
Vector vec = GeneralMethods.getDirection(player.getLocation(), destination.clone()); Vector vec = GeneralMethods.getDirection(player.getLocation(), destination.clone());
vec = GeneralMethods.rotateXZ(vec, i); vec = GeneralMethods.rotateXZ(vec, i);
@ -259,7 +259,7 @@ public class FireCombo extends FireAbility implements ComboAbility {
} }
fs.runTaskTimer(ProjectKorra.plugin, 0, 1L); fs.runTaskTimer(ProjectKorra.plugin, 0, 1L);
tasks.add(fs); tasks.add(fs);
player.getWorld().playSound(player.getLocation(), Sound.FIRE_IGNITE, 0.5f, 1f); player.getWorld().playSound(player.getLocation(), Sound.ITEM_FLINTANDSTEEL_USE, 0.5f, 1f);
} }
location = tasks.get(0).getLocation(); location = tasks.get(0).getLocation();
for (FireComboStream stream : tasks) { for (FireComboStream stream : tasks) {
@ -281,7 +281,7 @@ public class FireCombo extends FireAbility implements ComboAbility {
} }
bPlayer.addCooldown("FireSpin", cooldown); bPlayer.addCooldown("FireSpin", cooldown);
destination = player.getEyeLocation().add(range, 0, range); destination = player.getEyeLocation().add(range, 0, range);
player.getWorld().playSound(player.getLocation(), Sound.FIZZ, 0.5f, 0.5f); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 0.5f, 0.5f);
for (int i = 0; i <= 360; i += 5) { for (int i = 0; i <= 360; i += 5) {
Vector vec = GeneralMethods.getDirection(player.getLocation(), destination.clone()); Vector vec = GeneralMethods.getDirection(player.getLocation(), destination.clone());
@ -328,7 +328,7 @@ public class FireCombo extends FireAbility implements ComboAbility {
firstTime = false; firstTime = false;
float spread = 0F; float spread = 0F;
ParticleEffect.LARGE_EXPLODE.display(player.getLocation(), spread, spread, spread, 0, 1); ParticleEffect.LARGE_EXPLODE.display(player.getLocation(), spread, spread, spread, 0, 1);
player.getWorld().playSound(player.getLocation(), Sound.EXPLODE, 15, 0F); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 15, 0F);
} }
FireJet fj = getAbility(player, FireJet.class); FireJet fj = getAbility(player, FireJet.class);
fj.setSpeed(speed); fj.setSpeed(speed);
@ -370,7 +370,7 @@ public class FireCombo extends FireAbility implements ComboAbility {
fs.runTaskTimer(ProjectKorra.plugin, 0, 1L); fs.runTaskTimer(ProjectKorra.plugin, 0, 1L);
tasks.add(fs); tasks.add(fs);
if (progressCounter % 4 == 0) { if (progressCounter % 4 == 0) {
player.getWorld().playSound(player.getLocation(), Sound.FIZZ, 1, 0F); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 1, 0F);
} }
} }
} else if (ability.equalsIgnoreCase("FireWheel")) { } else if (ability.equalsIgnoreCase("FireWheel")) {
@ -421,7 +421,7 @@ public class FireCombo extends FireAbility implements ComboAbility {
} }
location = location.add(direction.clone().multiply(speed)); location = location.add(direction.clone().multiply(speed));
location.getWorld().playSound(location, Sound.FIRE, 1, 1); location.getWorld().playSound(location, Sound.BLOCK_FIRE_AMBIENT, 1, 1);
if (GeneralMethods.blockAbilities(player, BLOCKABLE_ABILITIES, location, 2)) { if (GeneralMethods.blockAbilities(player, BLOCKABLE_ABILITIES, location, 2)) {
remove(); remove();
return; return;

8
src/com/projectkorra/projectkorra/firebending/Lightning.java
View file

@ -122,8 +122,8 @@ public class Lightning extends LightningAbility {
* @param lent The LivingEntity that is being damaged * @param lent The LivingEntity that is being damaged
*/ */
public void electrocute(LivingEntity lent) { public void electrocute(LivingEntity lent) {
lent.getWorld().playSound(lent.getLocation(), Sound.CREEPER_HISS, 1, 0); lent.getWorld().playSound(lent.getLocation(), Sound.ENTITY_CREEPER_HURT, 1, 0);
player.getWorld().playSound(player.getLocation(), Sound.CREEPER_HISS, 1, 0); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_HURT, 1, 0);
DamageHandler.damageEntity(lent, damage, this); DamageHandler.damageEntity(lent, damage, this);
if (Math.random() < stunChance) { if (Math.random() < stunChance) {
@ -532,8 +532,8 @@ public class Lightning extends LightningAbility {
affectedEntities.add(entity); affectedEntities.add(entity);
LivingEntity lent = (LivingEntity) entity; LivingEntity lent = (LivingEntity) entity;
if (lent instanceof Player) { if (lent instanceof Player) {
lent.getWorld().playSound(lent.getLocation(), Sound.CREEPER_HISS, 1, 0); lent.getWorld().playSound(lent.getLocation(), Sound.ENTITY_CREEPER_HURT, 1, 0);
player.getWorld().playSound(player.getLocation(), Sound.CREEPER_HISS, 1, 0); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_HURT, 1, 0);
Player p = (Player) lent; Player p = (Player) lent;
Lightning light = getAbility(p, Lightning.class); Lightning light = getAbility(p, Lightning.class);
if (light != null && light.state == State.START) { if (light != null && light.state == State.START) {

2
src/com/projectkorra/projectkorra/waterbending/IceBlast.java
View file

@ -306,7 +306,7 @@ public class IceBlast extends IceAbility {
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), 2f, location, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), 2f, location, 257.0D);
ParticleEffect.SNOW_SHOVEL.display(location, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0, 2); ParticleEffect.SNOW_SHOVEL.display(location, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0, 2);
} }
location.getWorld().playSound(location, Sound.GLASS, 5, 1.3f); location.getWorld().playSound(location, Sound.BLOCK_GLASS_BREAK, 5, 1.3f);
} }
@Override @Override