players) throws ParticleVersionException, ParticleDataException {
- if (!this.isSupported()) {
- throw new ParticleVersionException("This particle effect is not supported by your server version");
- }
- if (!this.requiresData) {
- throw new ParticleDataException("This particle effect does not require additional data");
- }
- new ParticlePacket(this, direction, speed, isLongDistance(center, players), data).sendTo(center, players);
- }
-
- /**
- * Represents the particle data for effects like
- * {@link ParticleEffect#ITEM_CRACK}, {@link ParticleEffect#BLOCK_CRACK} and
- * {@link ParticleEffect#BLOCK_DUST}
- *
- * This class is part of the ParticleEffect Library and follows the
- * same usage conditions
- *
- * @author DarkBlade12
- * @since 1.6
- */
- public static abstract class ParticleData {
- private final Material material;
- private final byte data;
- private int[] packetData;
-
- /**
- * Construct a new particle data
- *
- * @param material Material of the item/block
- * @param data Data value of the item/block
- */
- public ParticleData(final Material material, final byte data) {
- this.material = material;
- this.data = data;
- this.packetData = new int[] { material.getId(), data };
- }
-
- /**
- * Returns the material of this data
- *
- * @return The material
- */
- public Material getMaterial() {
- return this.material;
- }
-
- /**
- * Returns the data value of this data
- *
- * @return The data value
- */
- public byte getData() {
- return this.data;
- }
-
- /**
- * Returns the data as an int array for packet construction
- *
- * @return The data for the packet
- */
- public int[] getPacketData() {
- return this.packetData;
- }
-
- /**
- * Returns the data as a string for pre 1.8 versions
- *
- * @return The data string for the packet
- */
- public String getPacketDataString() {
- return "_" + this.packetData[0] + "_" + this.packetData[1];
- }
-
- /**
- * Sets the packet data. Should be an integer array. For ITEM_CRACK and
- * BLOCK_DUST, it should be [id, meta] but for BLOCK_CRACK it should be
- * [id + (meta * 4096)]
- *
- * @param data The packet data.
- */
- public void setPacketData(final int[] data) {
- this.packetData = data;
- }
- }
-
- /**
- * Represents the item data for the {@link ParticleEffect#ITEM_CRACK} effect
- *
- * This class is part of the ParticleEffect Library and follows the
- * same usage conditions.
- *
- * @author DarkBlade12
- * @since 1.6
- */
- public static final class ItemData extends ParticleData {
- /**
- * Construct a new item data.
- *
- * @param material Material of the item
- * @param data Data value of the item
- * @see ParticleData#ParticleData(Material, byte)
- */
- public ItemData(final Material material, final byte data) {
- super(material, data);
- }
- }
-
- /**
- * Represents the block data for the {@link ParticleEffect#BLOCK_CRACK} and
- * {@link ParticleEffect#BLOCK_DUST} effects
- *
- * This class is part of the ParticleEffect Library and follows the
- * same usage conditions
- *
- * @author DarkBlade12
- * @since 1.6
- */
- public static final class BlockData extends ParticleData {
- /**
- * Construct a new block data
- *
- * @param material Material of the block
- * @param data Data value of the block
- * @throws IllegalArgumentException If the material is not a block
- * @see ParticleData#ParticleData(Material, byte)
- */
- public BlockData(final Material material, final byte data) throws IllegalArgumentException {
- super(material, data);
- if (!material.isBlock()) {
- throw new IllegalArgumentException("The material is not a block");
- }
-
- this.setPacketData(new int[] { material.getId() + (data * 4096) });
- }
- }
-
- /**
- * Represents a runtime exception that is thrown if the displayed particle
- * effect requires data and has none or vice-versa
- *
- * This class is part of the ParticleEffect Library and follows the
- * same usage conditions
- *
- * @author DarkBlade12
- * @since 1.6
- */
- private static final class ParticleDataException extends RuntimeException {
- private static final long serialVersionUID = 3203085387160737484L;
-
- /**
- * Construct a new particle data exception
- *
- * @param message Message that will be logged
- * @param cause Cause of the exception
- */
- public ParticleDataException(final String message) {
- super(message);
- }
- }
-
- /**
- * Represents a runtime exception that is thrown if the displayed particle
- * effect requires a newer version
- *
- * This class is part of the ParticleEffect Library and follows the
- * same usage conditions
- *
- * @author DarkBlade12
- * @since 1.6
- */
- private static final class ParticleVersionException extends RuntimeException {
- private static final long serialVersionUID = 3203085387160737484L;
-
- /**
- * Construct a new particle version exception
- *
- * @param message Message that will be logged
- * @param cause Cause of the exception
- */
- public ParticleVersionException(final String message) {
- super(message);
- }
- }
-
- /**
- * Represents a particle effect packet with all attributes which is used for
- * sending packets to the players
- *
- * This class is part of the ParticleEffect Library and follows the
- * same usage conditions
- *
- * @author DarkBlade12
- * @since 1.5
- */
- public static final class ParticlePacket {
- private static int version;
- private static Class enumParticle;
- private static Constructor packetConstructor;
- private static Method getHandle;
- private static Field playerConnection;
- private static Method sendPacket;
- private static boolean initialized;
- private final ParticleEffect effect;
- private final float offsetX;
- private final float offsetY;
- private final float offsetZ;
- private final float speed;
- private final int amount;
- private final boolean longDistance;
- private final ParticleData data;
- private Object packet;
-
- /**
- * Construct a new particle packet
- *
- * @param effect Particle effect
- * @param offsetX Maximum distance particles can fly away from the
- * center on the x-axis
- * @param offsetY Maximum distance particles can fly away from the
- * center on the y-axis
- * @param offsetZ Maximum distance particles can fly away from the
- * center on the z-axis
- * @param speed Display speed of the particles
- * @param amount Amount of particles
- * @param longDistance Indicates whether the maximum distance is
- * increased from 256 to 65536
- * @param data Data of the effect
- * @throws IllegalArgumentException If the speed is lower than 0 or the
- * amount is lower than 1
- * @see #initialize()
- */
- public ParticlePacket(final ParticleEffect effect, final float offsetX, final float offsetY, final float offsetZ, final float speed, final int amount, final boolean longDistance, final ParticleData data) throws IllegalArgumentException {
- initialize();
- if (speed < 0) {
- throw new IllegalArgumentException("The speed is lower than 0");
- }
- this.effect = effect;
- this.offsetX = offsetX;
- this.offsetY = offsetY;
- this.offsetZ = offsetZ;
- this.speed = speed;
- this.amount = amount;
- this.longDistance = longDistance;
- this.data = data;
- }
-
- /**
- * Construct a new particle packet of a single particle flying into a
- * determined direction
- *
- * @param effect Particle effect
- * @param direction Direction of the particle
- * @param speed Display speed of the particle
- * @param longDistance Indicates whether the maximum distance is
- * increased from 256 to 65536
- * @param data Data of the effect
- * @throws IllegalArgumentException If the speed is lower than 0
- * @see #initialize()
- */
- public ParticlePacket(final ParticleEffect effect, final Vector direction, final float speed, final boolean longDistance, final ParticleData data) throws IllegalArgumentException {
- initialize();
- if (speed < 0) {
- throw new IllegalArgumentException("The speed is lower than 0");
- }
- this.effect = effect;
- this.offsetX = (float) direction.getX();
- this.offsetY = (float) direction.getY();
- this.offsetZ = (float) direction.getZ();
- this.speed = speed;
- this.amount = 0;
- this.longDistance = longDistance;
- this.data = data;
- }
-
- /**
- * Initializes {@link #packetConstructor}, {@link #getHandle},
- * {@link #playerConnection} and {@link #sendPacket} and sets
- * {@link #initialized} to true if it succeeds
- *
- * Note: These fields only have to be initialized once, so it
- * will return if {@link #initialized} is already set to
- * true
- *
- * @throws VersionIncompatibleException if your bukkit version is not
- * supported by this library
- */
- public static void initialize() throws VersionIncompatibleException {
- if (initialized) {
- return;
- }
- try {
- version = Integer.parseInt(PackageType.getServerVersion().split("_")[1]);
- if (version > 7) {
- enumParticle = PackageType.MINECRAFT_SERVER.getClass("EnumParticle");
- }
- final Class packetClass = PackageType.MINECRAFT_SERVER.getClass(version < 7 ? "Packet63WorldParticles" : "PacketPlayOutWorldParticles");
- packetConstructor = ReflectionHandler.getConstructor(packetClass);
- getHandle = ReflectionHandler.getMethod("CraftPlayer", PackageType.CRAFTBUKKIT_ENTITY, "getHandle");
- playerConnection = ReflectionHandler.getField("EntityPlayer", PackageType.MINECRAFT_SERVER, false, "playerConnection");
- sendPacket = ReflectionHandler.getMethod(playerConnection.getType(), "sendPacket", PackageType.MINECRAFT_SERVER.getClass("Packet"));
- }
- catch (final Exception exception) {
- throw new VersionIncompatibleException("Your current bukkit version seems to be incompatible with this library", exception);
- }
- initialized = true;
- }
-
- /**
- * Returns the version of your server (1.x)
- *
- * @return The version number
- */
- public static int getVersion() {
- return version;
- }
-
- /**
- * Determine if {@link #packetConstructor}, {@link #getHandle},
- * {@link #playerConnection} and {@link #sendPacket} are initialized
- *
- * @return Whether these fields are initialized or not
- * @see #initialize()
- */
- public static boolean isInitialized() {
- return initialized;
- }
-
- /**
- * Sends the packet to a single player and caches it
- *
- * @param center Center location of the effect
- * @param player Receiver of the packet
- * @throws PacketInstantiationException if instantion fails due to an
- * unknown error
- * @throws PacketSendingException if sending fails due to an unknown
- * error
- */
- public void sendTo(final Location center, final Player player) throws PacketInstantiationException, PacketSendingException {
- if (this.packet == null) {
- try {
- this.packet = packetConstructor.newInstance();
- Object id;
- if (version < 8) {
- id = this.effect.getName();
- if (this.data != null) {
- id += this.data.getPacketDataString();
- }
- } else {
- id = enumParticle.getEnumConstants()[this.effect.getId()];
- }
- ReflectionHandler.setValue(this.packet, true, "a", id);
- ReflectionHandler.setValue(this.packet, true, "b", (float) center.getX());
- ReflectionHandler.setValue(this.packet, true, "c", (float) center.getY());
- ReflectionHandler.setValue(this.packet, true, "d", (float) center.getZ());
- ReflectionHandler.setValue(this.packet, true, "e", this.offsetX);
- ReflectionHandler.setValue(this.packet, true, "f", this.offsetY);
- ReflectionHandler.setValue(this.packet, true, "g", this.offsetZ);
- ReflectionHandler.setValue(this.packet, true, "h", this.speed);
- ReflectionHandler.setValue(this.packet, true, "i", this.amount);
- if (version > 7) {
- ReflectionHandler.setValue(this.packet, true, "j", this.longDistance);
- ReflectionHandler.setValue(this.packet, true, "k", this.data == null ? new int[0] : this.data.getPacketData());
- }
- }
- catch (final Exception exception) {
- throw new PacketInstantiationException("Packet instantiation failed", exception);
- }
- }
- try {
- sendPacket.invoke(playerConnection.get(getHandle.invoke(player)), this.packet);
- }
- catch (final Exception exception) {
- throw new PacketSendingException("Failed to send the packet to player '" + player.getName() + "'", exception);
- }
- }
-
- /**
- * Sends the packet to all players in the list
- *
- * @param center Center location of the effect
- * @param players Receivers of the packet
- * @throws IllegalArgumentException If the player list is empty
- * @see #sendTo(Location center, Player player)
- */
- public void sendTo(final Location center, final List players) throws IllegalArgumentException {
- if (players.isEmpty()) {
- throw new IllegalArgumentException("The player list is empty");
- }
- for (final Player player : players) {
- this.sendTo(center, player);
- }
- }
-
- /**
- * Sends the packet to all players in a certain range
- *
- * @param center Center location of the effect
- * @param range Range in which players will receive the packet (Maximum
- * range for particles is usually 16, but it can differ for
- * some types)
- * @throws IllegalArgumentException If the range is lower than 1
- * @see #sendTo(Location center, Player player)
- */
- public void sendTo(final Location center, final double range) throws IllegalArgumentException {
- if (range < 1) {
- throw new IllegalArgumentException("The range is lower than 1");
- }
-
- final double squared = range * range;
- for (final Player player : Bukkit.getOnlinePlayers()) {
- if (player.getWorld() != center.getWorld() || player.getLocation().distanceSquared(center) > squared) {
- continue;
- }
- this.sendTo(center, player);
- }
- }
-
- /**
- * Represents a runtime exception that is thrown if a bukkit version is
- * not compatible with this library
- *
- * This class is part of the ParticleEffect Library and follows
- * the same usage conditions
- *
- * @author DarkBlade12
- * @since 1.5
- */
- private static final class VersionIncompatibleException extends RuntimeException {
- private static final long serialVersionUID = 3203085387160737484L;
-
- /**
- * Construct a new version incompatible exception
- *
- * @param message Message that will be logged
- * @param cause Cause of the exception
- */
- public VersionIncompatibleException(final String message, final Throwable cause) {
- super(message, cause);
- }
- }
-
- /**
- * Represents a runtime exception that is thrown if packet instantiation
- * fails
- *
- * This class is part of the ParticleEffect Library and follows
- * the same usage conditions
- *
- * @author DarkBlade12
- * @since 1.4
- */
- private static final class PacketInstantiationException extends RuntimeException {
- private static final long serialVersionUID = 3203085387160737484L;
-
- /**
- * Construct a new packet instantiation exception
- *
- * @param message Message that will be logged
- * @param cause Cause of the exception
- */
- public PacketInstantiationException(final String message, final Throwable cause) {
- super(message, cause);
- }
- }
-
- /**
- * Represents a runtime exception that is thrown if packet sending fails
- *
- * This class is part of the ParticleEffect Library and follows
- * the same usage conditions
- *
- * @author DarkBlade12
- * @since 1.4
- */
- private static final class PacketSendingException extends RuntimeException {
- private static final long serialVersionUID = 3203085387160737484L;
-
- /**
- * Construct a new packet sending exception
- *
- * @param message Message that will be logged
- * @param cause Cause of the exception
- */
- public PacketSendingException(final String message, final Throwable cause) {
- super(message, cause);
- }
+ public void display(Location loc, int amount, double offsetX, double offsetY, double offsetZ, double extra, Object data) {
+ if (dataClass.isAssignableFrom(Void.class) || data == null || !dataClass.isAssignableFrom(data.getClass())) {
+ display(loc, amount, offsetX, offsetY, offsetZ, extra);
+ } else {
+ loc.getWorld().spawnParticle(particle, loc, amount, offsetX, offsetY, offsetZ, extra, data, true);
}
}
}
diff --git a/src/com/projectkorra/projectkorra/util/PassiveHandler.java b/src/com/projectkorra/projectkorra/util/PassiveHandler.java
index 443308a6..636ec584 100644
--- a/src/com/projectkorra/projectkorra/util/PassiveHandler.java
+++ b/src/com/projectkorra/projectkorra/util/PassiveHandler.java
@@ -34,7 +34,10 @@ public class PassiveHandler {
}
public static void checkExhaustionPassives(final Player player) {
- if (!CoreAbility.getAbility(AirSaturation.class).isEnabled() && !CoreAbility.getAbility(ChiSaturation.class).isEnabled()) {
+ CoreAbility airsat = CoreAbility.getAbility(AirSaturation.class);
+ CoreAbility chisat = CoreAbility.getAbility(ChiSaturation.class);
+
+ if ((airsat == null || !airsat.isEnabled()) && (chisat == null || !chisat.isEnabled())) {
return;
}
@@ -55,11 +58,11 @@ public class PassiveHandler {
return;
}
- if (!PassiveManager.hasPassive(player, CoreAbility.getAbility(AirSaturation.class))) {
+ if (!PassiveManager.hasPassive(player, airsat)) {
air = 0;
}
- if (!PassiveManager.hasPassive(player, CoreAbility.getAbility(ChiSaturation.class))) {
+ if (!PassiveManager.hasPassive(player, chisat)) {
chi = 0;
}
diff --git a/src/com/projectkorra/projectkorra/util/ReflectionHandler.java b/src/com/projectkorra/projectkorra/util/ReflectionHandler.java
index 04f7d261..d83c87a9 100644
--- a/src/com/projectkorra/projectkorra/util/ReflectionHandler.java
+++ b/src/com/projectkorra/projectkorra/util/ReflectionHandler.java
@@ -30,8 +30,7 @@ import org.bukkit.Bukkit;
*/
public final class ReflectionHandler {
// Prevent accidental construction.
- private ReflectionHandler() {
- }
+ private ReflectionHandler() {}
/**
* Returns the constructor of a given class with the given parameter types
diff --git a/src/com/projectkorra/projectkorra/util/RevertChecker.java b/src/com/projectkorra/projectkorra/util/RevertChecker.java
index d238272d..df122483 100644
--- a/src/com/projectkorra/projectkorra/util/RevertChecker.java
+++ b/src/com/projectkorra/projectkorra/util/RevertChecker.java
@@ -1,13 +1,13 @@
package com.projectkorra.projectkorra.util;
-import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
-import org.bukkit.Chunk;
import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.configuration.file.FileConfiguration;
@@ -17,6 +17,8 @@ import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.configuration.ConfigManager;
+import io.papermc.lib.PaperLib;
+
public class RevertChecker implements Runnable {
private final ProjectKorra plugin;
@@ -34,19 +36,19 @@ public class RevertChecker implements Runnable {
public static void revertAirBlocks() {
for (final int ID : airRevertQueue.keySet()) {
- EarthAbility.revertAirBlock(ID);
+ PaperLib.getChunkAtAsync(EarthAbility.getTempAirLocations().get(ID).getState().getBlock().getLocation()).thenAccept(result -> EarthAbility.revertAirBlock(ID));
RevertChecker.airRevertQueue.remove(ID);
}
}
public static void revertEarthBlocks() {
for (final Block block : earthRevertQueue.keySet()) {
- EarthAbility.revertBlock(block);
+ PaperLib.getChunkAtAsync(block.getLocation()).thenAccept(result -> EarthAbility.revertBlock(block));
earthRevertQueue.remove(block);
}
}
- private Future> returnFuture;
+ private Future>> returnFuture;
private void addToAirRevertQueue(final int i) {
if (!airRevertQueue.containsKey(i)) {
@@ -72,50 +74,51 @@ public class RevertChecker implements Runnable {
try {
this.returnFuture = this.plugin.getServer().getScheduler().callSyncMethod(this.plugin, new getOccupiedChunks(this.plugin.getServer()));
- final ArrayList chunks = this.returnFuture.get();
+ final Set> chunks = this.returnFuture.get();
- final Map earth = new HashMap();
- earth.putAll(EarthAbility.getMovedEarth());
+ final Map earth = new HashMap<>(EarthAbility.getMovedEarth());
for (final Block block : earth.keySet()) {
if (earthRevertQueue.containsKey(block)) {
continue;
}
- boolean remove = true;
+
final Information info = earth.get(block);
- if (this.time < info.getTime() + config.getLong("Properties.Earth.RevertCheckTime") || (chunks.contains(block.getChunk()) && safeRevert)) {
- remove = false;
- }
- if (remove) {
+
+ final Map chunkcoord = new HashMap<>();
+ chunkcoord.put("x", block.getX() >> 4);
+ chunkcoord.put("z", block.getZ() >> 4);
+
+ if (this.time > (info.getTime() + config.getLong("Properties.Earth.RevertCheckTime")) && !(chunks.contains(chunkcoord) && safeRevert)) {
this.addToRevertQueue(block);
}
}
- final Map air = new HashMap();
- air.putAll(EarthAbility.getTempAirLocations());
+ final Map air = new HashMap<>(EarthAbility.getTempAirLocations());
for (final Integer i : air.keySet()) {
if (airRevertQueue.containsKey(i)) {
continue;
}
- boolean remove = true;
+
final Information info = air.get(i);
final Block block = info.getBlock();
- if (this.time < info.getTime() + config.getLong("Properties.Earth.RevertCheckTime") || (chunks.contains(block.getChunk()) && safeRevert)) {
- remove = false;
- }
- if (remove) {
+
+ final Map chunkcoord = new HashMap<>();
+ chunkcoord.put("x", block.getX() >> 4);
+ chunkcoord.put("z", block.getZ() >> 4);
+
+ if (this.time > (info.getTime() + config.getLong("Properties.Earth.RevertCheckTime")) && !(chunks.contains(chunkcoord) && safeRevert)) {
this.addToAirRevertQueue(i);
}
}
- }
- catch (final Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
}
- private class getOccupiedChunks implements Callable> {
+ private class getOccupiedChunks implements Callable>> {
private final Server server;
public getOccupiedChunks(final Server server) {
@@ -123,16 +126,17 @@ public class RevertChecker implements Runnable {
}
@Override
- public ArrayList call() throws Exception {
-
- final ArrayList chunks = new ArrayList();
+ public Set> call() {
+ final Set> chunks = new HashSet<>();
for (final Player player : this.server.getOnlinePlayers()) {
- final Chunk chunk = player.getLocation().getChunk();
- if (!chunks.contains(chunk)) {
- chunks.add(chunk);
- }
+ final Map chunkcoord = new HashMap<>();
+ chunkcoord.put("x", player.getLocation().getBlockX() >> 4);
+ chunkcoord.put("z", player.getLocation().getBlockZ() >> 4);
+
+ chunks.add(chunkcoord);
}
+
return chunks;
}
diff --git a/src/com/projectkorra/projectkorra/util/StatisticsManager.java b/src/com/projectkorra/projectkorra/util/StatisticsManager.java
index b01d5840..baeb77fd 100644
--- a/src/com/projectkorra/projectkorra/util/StatisticsManager.java
+++ b/src/com/projectkorra/projectkorra/util/StatisticsManager.java
@@ -11,13 +11,14 @@ import java.util.UUID;
import org.bukkit.entity.Player;
+import com.projectkorra.projectkorra.Manager;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.storage.DBConnection;
import com.projectkorra.projectkorra.storage.MySQL;
import com.projectkorra.projectkorra.storage.SQLite;
-public class StatisticsManager implements Runnable {
+public class StatisticsManager extends Manager implements Runnable {
/**
* HashMap which contains all current statistic values (Map STORAGE = new HashSet<>();
private final int INTERVAL = 5;
- public StatisticsManager() {
+ private StatisticsManager() {}
+
+ @Override
+ public void onActivate() {
if (!ProjectKorra.isStatisticsEnabled()) {
ProjectKorra.plugin.getServer().getScheduler().scheduleSyncRepeatingTask(ProjectKorra.plugin, this, 20 * this.INTERVAL, 20 * this.INTERVAL);
}
@@ -86,8 +90,7 @@ public class StatisticsManager implements Runnable {
if (!rs.next()) {
DBConnection.sql.modifyQuery("INSERT INTO pk_statKeys (statName) VALUES ('" + statName + "')", false);
}
- }
- catch (final SQLException e) {
+ } catch (final SQLException e) {
e.printStackTrace();
}
}
@@ -99,8 +102,7 @@ public class StatisticsManager implements Runnable {
this.KEYS_BY_NAME.put(rs.getString("statName"), rs.getInt("id"));
this.KEYS_BY_ID.put(rs.getInt("id"), rs.getString("statName"));
}
- }
- catch (final SQLException e) {
+ } catch (final SQLException e) {
e.printStackTrace();
}
}
@@ -113,8 +115,7 @@ public class StatisticsManager implements Runnable {
this.STATISTICS.get(uuid).put(rs.getInt("statId"), rs.getLong("statValue"));
this.DELTA.get(uuid).put(rs.getInt("statId"), 0L);
}
- }
- catch (final SQLException e) {
+ } catch (final SQLException e) {
e.printStackTrace();
}
}
@@ -133,8 +134,7 @@ public class StatisticsManager implements Runnable {
} else {
DBConnection.sql.modifyQuery("UPDATE pk_stats SET statValue = statValue + " + statValue + " WHERE uuid = '" + uuid.toString() + "' AND statId = " + statId + ";", async);
}
- }
- catch (final SQLException e) {
+ } catch (final SQLException e) {
e.printStackTrace();
}
}
@@ -157,8 +157,7 @@ public class StatisticsManager implements Runnable {
if (rs.next()) {
return rs.getLong("statValue");
}
- }
- catch (final SQLException e) {
+ } catch (final SQLException e) {
e.printStackTrace();
}
return 0;
@@ -187,8 +186,7 @@ public class StatisticsManager implements Runnable {
final long statValue = rs.getLong("statValue");
map.put(statId, statValue);
}
- }
- catch (final SQLException e) {
+ } catch (final SQLException e) {
e.printStackTrace();
}
return map;
diff --git a/src/com/projectkorra/projectkorra/util/StatisticsMethods.java b/src/com/projectkorra/projectkorra/util/StatisticsMethods.java
index cebf7458..8e026e15 100644
--- a/src/com/projectkorra/projectkorra/util/StatisticsMethods.java
+++ b/src/com/projectkorra/projectkorra/util/StatisticsMethods.java
@@ -7,6 +7,7 @@ import java.util.UUID;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
+import com.projectkorra.projectkorra.Manager;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.storage.DBConnection;
@@ -32,7 +33,7 @@ public class StatisticsMethods {
return 0;
}
final int statId = getId(statistic.getStatisticName(ability));
- return ProjectKorra.statistics.getStatisticCurrent(uuid, statId);
+ return Manager.getManager(StatisticsManager.class).getStatisticCurrent(uuid, statId);
}
/**
@@ -52,7 +53,7 @@ public class StatisticsMethods {
return;
}
final int statId = getId(statistic.getStatisticName(ability));
- ProjectKorra.statistics.addStatistic(uuid, statId, statDelta);
+ Manager.getManager(StatisticsManager.class).addStatistic(uuid, statId, statDelta);
}
/**
@@ -73,7 +74,7 @@ public class StatisticsMethods {
return 0;
}
long totalValue = 0;
- for (final int statId : ProjectKorra.statistics.getStatisticsMap(uuid).keySet()) {
+ for (final int statId : Manager.getManager(StatisticsManager.class).getStatisticsMap(uuid).keySet()) {
final String abilName = getAbilityName(statId);
final CoreAbility ability = CoreAbility.getAbility(abilName);
if (ability == null) {
@@ -107,7 +108,7 @@ public class StatisticsMethods {
return 0;
}
long totalValue = 0;
- for (final int statId : ProjectKorra.statistics.getStatisticsMap(uuid).keySet()) {
+ for (final int statId : Manager.getManager(StatisticsManager.class).getStatisticsMap(uuid).keySet()) {
final String abilName = getAbilityName(statId);
final CoreAbility ability = CoreAbility.getAbility(abilName);
if (ability == null) {
@@ -169,19 +170,18 @@ public class StatisticsMethods {
if (!ProjectKorra.isStatisticsEnabled()) {
return 0;
}
- if (!ProjectKorra.statistics.getKeysByName().containsKey(statName)) {
+ if (!Manager.getManager(StatisticsManager.class).getKeysByName().containsKey(statName)) {
DBConnection.sql.modifyQuery("INSERT INTO pk_statKeys (statName) VALUES ('" + statName + "')", false);
try (ResultSet rs = DBConnection.sql.readQuery("SELECT * FROM pk_statKeys WHERE statName = '" + statName + "'")) {
if (rs.next()) {
- ProjectKorra.statistics.getKeysByName().put(rs.getString("statName"), rs.getInt("id"));
- ProjectKorra.statistics.getKeysById().put(rs.getInt("id"), rs.getString("statName"));
+ Manager.getManager(StatisticsManager.class).getKeysByName().put(rs.getString("statName"), rs.getInt("id"));
+ Manager.getManager(StatisticsManager.class).getKeysById().put(rs.getInt("id"), rs.getString("statName"));
}
- }
- catch (final SQLException e) {
+ } catch (final SQLException e) {
e.printStackTrace();
}
}
- return ProjectKorra.statistics.getKeysByName().containsKey(statName) ? ProjectKorra.statistics.getKeysByName().get(statName) : -1;
+ return Manager.getManager(StatisticsManager.class).getKeysByName().containsKey(statName) ? Manager.getManager(StatisticsManager.class).getKeysByName().get(statName) : -1;
}
/**
@@ -196,10 +196,10 @@ public class StatisticsMethods {
if (!ProjectKorra.isStatisticsEnabled()) {
return "";
}
- if (!ProjectKorra.statistics.getKeysById().containsKey(id)) {
+ if (!Manager.getManager(StatisticsManager.class).getKeysById().containsKey(id)) {
return "";
}
- final String statName = ProjectKorra.statistics.getKeysById().get(id);
+ final String statName = Manager.getManager(StatisticsManager.class).getKeysById().get(id);
final String[] split = statName.split("_");
if (split.length < 2) {
return "";
diff --git a/src/com/projectkorra/projectkorra/util/TempArmor.java b/src/com/projectkorra/projectkorra/util/TempArmor.java
index c192e064..beae12cb 100644
--- a/src/com/projectkorra/projectkorra/util/TempArmor.java
+++ b/src/com/projectkorra/projectkorra/util/TempArmor.java
@@ -2,13 +2,15 @@ package com.projectkorra.projectkorra.util;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.PriorityQueue;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.inventory.ItemStack;
@@ -86,16 +88,11 @@ public class TempArmor {
if (!INSTANCES.containsKey(entity)) {
ORIGINAL.put(entity, this.oldArmor);
- final PriorityQueue queue = new PriorityQueue<>(10, new Comparator() {
-
- @Override
- public int compare(final TempArmor a, final TempArmor b) {
- final long current = System.currentTimeMillis();
- final long remainingA = a.getStartTime() + a.getDuration() - current;
- final long remainingB = b.getStartTime() + b.getDuration() - current;
- return (int) (remainingA - remainingB);
- }
-
+ final PriorityQueue queue = new PriorityQueue<>(10, (a, b) -> {
+ final long current = System.currentTimeMillis();
+ final long remainingA = a.getStartTime() + a.getDuration() - current;
+ final long remainingB = b.getStartTime() + b.getDuration() - current;
+ return (int) (remainingA - remainingB);
});
INSTANCES.put(entity, queue);
@@ -118,7 +115,7 @@ public class TempArmor {
for (final ItemStack drop : drops) {
boolean match = false;
for (final ItemStack armorPiece : this.newArmor) {
- if (armorPiece.isSimilar(drop)) {
+ if (armorPiece != null && armorPiece.isSimilar(drop)) {
match = true;
break;
}
@@ -208,10 +205,6 @@ public class TempArmor {
* TempArmor instance was started, if the display queue is empty.
*/
public void revert() {
- if (this.removeAbilOnForceRevert && this.ability != null && !this.ability.isRemoved()) {
- this.ability.remove();
- }
-
final PriorityQueue queue = INSTANCES.get(this.entity);
if (queue.contains(this)) {
@@ -231,6 +224,10 @@ public class TempArmor {
INSTANCES.remove(this.entity);
ORIGINAL.remove(this.entity);
}
+
+ if (this.removeAbilOnForceRevert && this.ability != null && !this.ability.isRemoved()) {
+ this.ability.remove();
+ }
}
public static void cleanup() {
@@ -290,4 +287,9 @@ public class TempArmor {
}
return new ArrayList<>(INSTANCES.get(entity));
}
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+ }
}
diff --git a/src/com/projectkorra/projectkorra/util/TempArmorStand.java b/src/com/projectkorra/projectkorra/util/TempArmorStand.java
index 8b433725..516e682f 100644
--- a/src/com/projectkorra/projectkorra/util/TempArmorStand.java
+++ b/src/com/projectkorra/projectkorra/util/TempArmorStand.java
@@ -11,7 +11,7 @@ import com.projectkorra.projectkorra.ProjectKorra;
/**
* Object to represent an ArmorStand that is not used for normal functionality
- *
+ *
* @author Simplicitee
*
*/
diff --git a/src/com/projectkorra/projectkorra/util/TempBlock.java b/src/com/projectkorra/projectkorra/util/TempBlock.java
index 2b838e61..077c31f6 100644
--- a/src/com/projectkorra/projectkorra/util/TempBlock.java
+++ b/src/com/projectkorra/projectkorra/util/TempBlock.java
@@ -10,15 +10,19 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
+import org.bukkit.block.Container;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Levelled;
import org.bukkit.scheduler.BukkitRunnable;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
-public class TempBlock {
+import io.papermc.lib.PaperLib;
+public class TempBlock {
public static Map instances = new ConcurrentHashMap();
- public static final PriorityQueue REVERT_QUEUE = new PriorityQueue<>(100, new Comparator() {
+ public static final PriorityQueue REVERT_QUEUE = new PriorityQueue(100, new Comparator() {
@Override
public int compare(final TempBlock t1, final TempBlock t2) {
return (int) (t1.revertTime - t2.revertTime);
@@ -26,31 +30,39 @@ public class TempBlock {
});
private final Block block;
- private byte newdata;
+ private BlockData newdata;
private BlockState state;
private long revertTime;
private boolean inRevertQueue;
private RevertTask revertTask = null;
- public TempBlock(final Block block, final Material newtype, final byte newdata) {
+ public TempBlock(final Block block, final Material newtype) {
+ this(block, newtype.createBlockData());
+ }
+
+ @Deprecated
+ public TempBlock(final Block block, final Material newtype, final BlockData newdata) {
+ this(block, newdata);
+ }
+
+ public TempBlock(final Block block, final BlockData newdata) {
this.block = block;
this.newdata = newdata;
if (instances.containsKey(block)) {
final TempBlock temp = instances.get(block);
- if (newtype != temp.block.getType()) {
- temp.block.setType(newtype);
- }
- if (newdata != temp.block.getData()) {
- temp.block.setData(newdata);
+ if (!newdata.equals(temp.block.getBlockData())) {
+ temp.block.setBlockData(newdata, GeneralMethods.isLightEmitting(newdata.getMaterial()));
temp.newdata = newdata;
}
this.state = temp.state;
instances.put(block, temp);
} else {
this.state = block.getState();
+ if (this.state instanceof Container || this.state.getType() == Material.JUKEBOX) {
+ return;
+ }
instances.put(block, this);
- block.setType(newtype);
- block.setData(newdata);
+ block.setBlockData(newdata, GeneralMethods.isLightEmitting(newdata.getMaterial()));
}
if (this.state.getType() == Material.FIRE) {
this.state.setType(Material.AIR);
@@ -65,7 +77,7 @@ public class TempBlock {
}
public static boolean isTempBlock(final Block block) {
- return block != null ? instances.containsKey(block) : false;
+ return block != null && instances.containsKey(block);
}
public static boolean isTouchingTempBlock(final Block block) {
@@ -83,11 +95,16 @@ public class TempBlock {
revertBlock(block, Material.AIR);
}
for (final TempBlock tempblock : REVERT_QUEUE) {
- tempblock.revertBlock();
+ tempblock.state.update(true, GeneralMethods.isLightEmitting(tempblock.state.getType()));
+ if (tempblock.revertTask != null) {
+ tempblock.revertTask.run();
+ }
}
+ REVERT_QUEUE.clear();
}
public static void removeBlock(final Block block) {
+ REVERT_QUEUE.remove(instances.get(block));
instances.remove(block);
}
@@ -95,14 +112,24 @@ public class TempBlock {
if (instances.containsKey(block)) {
instances.get(block).revertBlock();
} else {
- if ((defaulttype == Material.LAVA || defaulttype == Material.STATIONARY_LAVA) && GeneralMethods.isAdjacentToThreeOrMoreSources(block)) {
- block.setType(Material.LAVA);
- block.setData((byte) 0x0);
- } else if ((defaulttype == Material.WATER || defaulttype == Material.STATIONARY_WATER) && GeneralMethods.isAdjacentToThreeOrMoreSources(block)) {
- block.setType(Material.WATER);
- block.setData((byte) 0x0);
+ if ((defaulttype == Material.LAVA) && GeneralMethods.isAdjacentToThreeOrMoreSources(block, true)) {
+ final BlockData data = Material.LAVA.createBlockData();
+
+ if (data instanceof Levelled) {
+ ((Levelled) data).setLevel(0);
+ }
+
+ block.setBlockData(data, GeneralMethods.isLightEmitting(data.getMaterial()));
+ } else if ((defaulttype == Material.WATER) && GeneralMethods.isAdjacentToThreeOrMoreSources(block)) {
+ final BlockData data = Material.WATER.createBlockData();
+
+ if (data instanceof Levelled) {
+ ((Levelled) data).setLevel(0);
+ }
+
+ block.setBlockData(data, GeneralMethods.isLightEmitting(data.getMaterial()));
} else {
- block.setType(defaulttype);
+ block.setType(defaulttype, GeneralMethods.isLightEmitting(defaulttype));
}
}
}
@@ -111,6 +138,10 @@ public class TempBlock {
return this.block;
}
+ public BlockData getBlockData() {
+ return this.newdata;
+ }
+
public Location getLocation() {
return this.block.getLocation();
}
@@ -141,11 +172,9 @@ public class TempBlock {
}
public void revertBlock() {
- this.state.update(true);
+ PaperLib.getChunkAtAsync(this.block.getLocation()).thenAccept(result -> this.state.update(true, GeneralMethods.isLightEmitting(this.state.getType())));
instances.remove(this.block);
- if (REVERT_QUEUE.contains(this)) {
- REVERT_QUEUE.remove(this);
- }
+ REVERT_QUEUE.remove(this);
if (this.revertTask != null) {
this.revertTask.run();
}
@@ -156,13 +185,17 @@ public class TempBlock {
}
public void setType(final Material material) {
- this.setType(material, this.newdata);
+ this.setType(material.createBlockData());
}
- public void setType(final Material material, final byte data) {
+ @Deprecated
+ public void setType(final Material material, final BlockData data) {
+ this.setType(data);
+ }
+
+ public void setType(final BlockData data) {
this.newdata = data;
- this.block.setType(material);
- this.block.setData(data);
+ this.block.setBlockData(data, GeneralMethods.isLightEmitting(data.getMaterial()));
}
public static void startReversion() {
diff --git a/src/com/projectkorra/projectkorra/util/Updater.java b/src/com/projectkorra/projectkorra/util/Updater.java
index 73a6e4b0..a6b1525f 100644
--- a/src/com/projectkorra/projectkorra/util/Updater.java
+++ b/src/com/projectkorra/projectkorra/util/Updater.java
@@ -71,12 +71,10 @@ public class Updater {
break;
}
}
- }
- catch (final IOException e) {
+ } catch (final IOException e) {
e.printStackTrace();
}
- }
- catch (final IOException e) {
+ } catch (final IOException e) {
plugin.getLogger().info("Could not connect to projectkorra.com");
}
this.checkUpdate();
diff --git a/src/com/projectkorra/projectkorra/util/logging/LogFilter.java b/src/com/projectkorra/projectkorra/util/logging/LogFilter.java
index 2192e04e..740e672c 100644
--- a/src/com/projectkorra/projectkorra/util/logging/LogFilter.java
+++ b/src/com/projectkorra/projectkorra/util/logging/LogFilter.java
@@ -64,12 +64,7 @@ public class LogFilter implements Filter {
}
final String toRecord = recordString;
- Bukkit.getScheduler().runTaskLater(ProjectKorra.plugin, new Runnable() {
- @Override
- public void run() {
- LogFilter.this.loggedRecords.add(toRecord);
- }
- }, 10);
+ Bukkit.getScheduler().runTaskLater(ProjectKorra.plugin, (Runnable) () -> LogFilter.this.loggedRecords.add(toRecord), 10);
return true;
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java b/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
index d3a5f271..99f0ff26 100644
--- a/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
+++ b/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
@@ -17,6 +17,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
@@ -30,13 +31,13 @@ import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
public class OctopusForm extends WaterAbility {
- private static final byte FULL = 8;
-
private boolean sourceSelected;
private boolean settingUp;
private boolean forming;
private boolean formed;
+ @Attribute(Attribute.RANGE)
private int range;
+ @Attribute(Attribute.DAMAGE)
private int damage;
private int currentAnimationStep;
private int stepCounter;
@@ -44,11 +45,17 @@ public class OctopusForm extends WaterAbility {
private long time;
private long startTime;
private long interval;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
+ @Attribute(Attribute.DURATION)
private long duration;
+ @Attribute("Attack" + Attribute.RANGE)
private double attackRange;
+ @Attribute("Usage" + Attribute.COOLDOWN)
private long usageCooldown;
+ @Attribute(Attribute.KNOCKBACK)
private double knockback;
+ @Attribute(Attribute.RADIUS)
private double radius;
private double startAngle;
private double angle;
@@ -150,7 +157,7 @@ public class OctopusForm extends WaterAbility {
if (isTransparent(player, block) && isTransparent(player, eyeLoc.getBlock())) {
block.setType(Material.WATER);
- block.setData(FULL);
+ block.setBlockData(GeneralMethods.getWaterData(0));
final OctopusForm form = new OctopusForm(player);
form.setSourceBlock(block);
form.form();
@@ -172,7 +179,7 @@ public class OctopusForm extends WaterAbility {
} else if (!GeneralMethods.isAdjacentToThreeOrMoreSources(this.sourceBlock) && this.sourceBlock != null) {
this.sourceBlock.setType(Material.AIR);
}
- this.source = new TempBlock(this.sourceBlock, Material.STATIONARY_WATER, (byte) 8);
+ this.source = new TempBlock(this.sourceBlock, Material.WATER, GeneralMethods.getWaterData(0));
}
private void attack() {
@@ -246,7 +253,7 @@ public class OctopusForm extends WaterAbility {
this.sourceLocation = newBlock.getLocation();
if (!GeneralMethods.isSolid(newBlock)) {
- this.source = new TempBlock(newBlock, Material.STATIONARY_WATER, (byte) 8);
+ this.source = new TempBlock(newBlock, Material.WATER, GeneralMethods.getWaterData(0));
this.sourceBlock = newBlock;
} else {
this.remove();
@@ -259,7 +266,7 @@ public class OctopusForm extends WaterAbility {
this.sourceLocation = newBlock.getLocation();
if (!GeneralMethods.isSolid(newBlock)) {
- this.source = new TempBlock(newBlock, Material.STATIONARY_WATER, (byte) 8);
+ this.source = new TempBlock(newBlock, Material.WATER, GeneralMethods.getWaterData(0));
this.sourceBlock = newBlock;
} else {
this.remove();
@@ -275,7 +282,7 @@ public class OctopusForm extends WaterAbility {
this.source.revertBlock();
}
if (!GeneralMethods.isSolid(newBlock)) {
- this.source = new TempBlock(newBlock, Material.STATIONARY_WATER, (byte) 8);
+ this.source = new TempBlock(newBlock, Material.WATER, GeneralMethods.getWaterData(0));
this.sourceBlock = newBlock;
}
}
@@ -419,16 +426,16 @@ public class OctopusForm extends WaterAbility {
if (!SurgeWave.canThaw(block)) {
SurgeWave.thaw(block);
}
- tblock.setType(Material.STATIONARY_WATER, (byte) 8);
+ tblock.setType(Material.WATER, GeneralMethods.getWaterData(0));
this.newBlocks.add(tblock);
} else if (this.blocks.contains(tblock)) {
this.newBlocks.add(tblock);
}
- } else if (this.isWaterbendable(this.player, block) || block.getType() == Material.FIRE || block.getType() == Material.AIR) {
+ } else if (this.isWaterbendable(this.player, block) || block.getType() == Material.FIRE || isAir(block.getType())) {
if (isWater(block) && !TempBlock.isTempBlock(block)) {
- ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, block.getLocation().clone().add(0.5, 0.5, 0.5), 255.0);
+ ParticleEffect.WATER_BUBBLE.display(block.getLocation().clone().add(0.5, 0.5, 0.5), 5, Math.random(), Math.random(), Math.random(), 0);
}
- this.newBlocks.add(new TempBlock(block, Material.STATIONARY_WATER, (byte) 8));
+ this.newBlocks.add(new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0)));
}
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
index 63531cee..9f6fead2 100644
--- a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
+++ b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
@@ -8,7 +8,6 @@ import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
-import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
@@ -17,10 +16,13 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
+import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
@@ -38,9 +40,13 @@ public class SurgeWall extends WaterAbility {
private boolean frozen;
private long time;
private long interval;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
+ @Attribute(Attribute.DURATION)
private long duration;
+ @Attribute(Attribute.RADIUS)
private double radius;
+ @Attribute(Attribute.RANGE)
private double range;
private Block sourceBlock;
private Location location;
@@ -95,7 +101,7 @@ public class SurgeWall extends WaterAbility {
final Block block = eyeLoc.add(eyeLoc.getDirection().normalize()).getBlock();
if (isTransparent(player, block) && isTransparent(player, eyeLoc.getBlock())) {
- final TempBlock tempBlock = new TempBlock(block, Material.STATIONARY_WATER, (byte) 0);
+ final TempBlock tempBlock = new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
SOURCE_BLOCKS.add(tempBlock);
wave = new SurgeWave(player);
@@ -128,7 +134,7 @@ public class SurgeWall extends WaterAbility {
this.frozen = true;
for (final Block block : WALL_BLOCKS.keySet()) {
if (WALL_BLOCKS.get(block) == this.player) {
- new TempBlock(block, Material.ICE, (byte) 0);
+ new TempBlock(block, Material.ICE);
playIcebendingSound(block.getLocation());
}
}
@@ -138,7 +144,7 @@ public class SurgeWall extends WaterAbility {
this.frozen = false;
for (final Block block : WALL_BLOCKS.keySet()) {
if (WALL_BLOCKS.get(block) == this.player) {
- new TempBlock(block, Material.STATIONARY_WATER, (byte) 8);
+ new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
}
}
}
@@ -187,7 +193,7 @@ public class SurgeWall extends WaterAbility {
if (isPlant(this.sourceBlock) || isSnow(this.sourceBlock)) {
new PlantRegrowth(this.player, this.sourceBlock);
- this.sourceBlock.setType(Material.AIR);
+ this.sourceBlock.setType(Material.AIR, false);
}
this.addWater(this.sourceBlock);
}
@@ -239,7 +245,7 @@ public class SurgeWall extends WaterAbility {
this.remove();
return;
} else if (!this.progressing) {
- this.sourceBlock.getWorld().playEffect(this.location, Effect.SMOKE, 4, (int) this.range);
+ ParticleEffect.SMOKE_NORMAL.display(this.sourceBlock.getLocation().add(0.5, 0.5, 0.5), 1);
return;
}
@@ -249,12 +255,11 @@ public class SurgeWall extends WaterAbility {
}
final ArrayList blocks = new ArrayList();
- final Location targetLoc = GeneralMethods.getTargetedLocation(this.player, (int) this.range, Material.WATER, Material.STATIONARY_WATER, Material.ICE);
+ final Location targetLoc = GeneralMethods.getTargetedLocation(this.player, (int) this.range, false, false, Material.WATER, Material.ICE);
this.location = targetLoc.clone();
final Vector eyeDir = this.player.getEyeLocation().getDirection();
Vector vector;
Block block;
-
for (double i = 0; i <= this.getNightFactor(this.radius); i += 0.5) {
for (double angle = 0; angle < 360; angle += 10) {
vector = GeneralMethods.getOrthogonalVector(eyeDir.clone(), angle, i);
@@ -264,7 +269,7 @@ public class SurgeWall extends WaterAbility {
continue;
} else if (WALL_BLOCKS.containsKey(block)) {
blocks.add(block);
- } else if (!blocks.contains(block) && (block.getType() == Material.AIR || block.getType() == Material.FIRE || this.isWaterbendable(block)) && this.isTransparent(block)) {
+ } else if (!blocks.contains(block) && (ElementalAbility.isAir(block.getType()) || block.getType() == Material.FIRE || this.isWaterbendable(block)) && this.isTransparent(block)) {
WALL_BLOCKS.put(block, this.player);
this.addWallBlock(block);
blocks.add(block);
@@ -301,7 +306,7 @@ public class SurgeWall extends WaterAbility {
block = this.location.getBlock();
}
- if (block.getType() != Material.AIR) {
+ if (!ElementalAbility.isAir(block.getType())) {
this.remove();
return;
} else if (!this.progressing) {
@@ -326,9 +331,9 @@ public class SurgeWall extends WaterAbility {
}
if (this.frozen) {
- new TempBlock(block, Material.ICE, (byte) 0);
+ new TempBlock(block, Material.ICE);
} else {
- new TempBlock(block, Material.STATIONARY_WATER, (byte) 8);
+ new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
}
}
@@ -352,7 +357,9 @@ public class SurgeWall extends WaterAbility {
if (!GeneralMethods.isAdjacentToThreeOrMoreSources(block)) {
if (this.oldTemps.containsKey(block)) {
final TempBlock tb = TempBlock.get(block);
- tb.setType(this.oldTemps.get(block));
+ if (tb != null) {
+ tb.setType(this.oldTemps.get(block));
+ }
} else {
TempBlock.revertBlock(block, Material.AIR);
}
@@ -367,7 +374,9 @@ public class SurgeWall extends WaterAbility {
if (AFFECTED_BLOCKS.containsKey(block)) {
if (this.oldTemps.containsKey(block)) {
final TempBlock tb = TempBlock.get(block);
- tb.setType(this.oldTemps.get(block));
+ if (tb != null) {
+ tb.setType(this.oldTemps.get(block));
+ }
} else {
TempBlock.revertBlock(block, Material.AIR);
}
@@ -376,7 +385,9 @@ public class SurgeWall extends WaterAbility {
if (WALL_BLOCKS.containsKey(block)) {
if (this.oldTemps.containsKey(block)) {
final TempBlock tb = TempBlock.get(block);
- tb.setType(this.oldTemps.get(block));
+ if (tb != null) {
+ tb.setType(this.oldTemps.get(block));
+ }
} else {
TempBlock.revertBlock(block, Material.AIR);
}
@@ -389,7 +400,7 @@ public class SurgeWall extends WaterAbility {
if (GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
return;
} else if (!TempBlock.isTempBlock(block)) {
- new TempBlock(block, Material.STATIONARY_WATER, (byte) 8);
+ new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
AFFECTED_BLOCKS.put(block, block);
}
}
@@ -431,7 +442,7 @@ public class SurgeWall extends WaterAbility {
final Block block = eyeLoc.add(eyeLoc.getDirection().normalize()).getBlock();
if (isTransparent(player, block) && isTransparent(player, eyeLoc.getBlock())) {
- final TempBlock tempBlock = new TempBlock(block, Material.STATIONARY_WATER, (byte) 0);
+ final TempBlock tempBlock = new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
SOURCE_BLOCKS.add(tempBlock);
wall = new SurgeWall(player);
@@ -496,7 +507,7 @@ public class SurgeWall extends WaterAbility {
private void returnWater() {
if (this.location != null) {
if (this.frozen) {
- this.location.getBlock().setType(Material.WATER);
+ this.thaw();
}
new WaterReturn(this.player, this.location.getBlock());
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java b/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
index f5de04c5..90611298 100644
--- a/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
@@ -17,13 +17,16 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.avatar.AvatarState;
+import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
+import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
-import com.projectkorra.projectkorra.util.TempBlock.RevertTask;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
@@ -34,15 +37,23 @@ public class SurgeWave extends WaterAbility {
private boolean progressing;
private boolean canHitSelf;
private long time;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private long interval;
+ @Attribute("IceRevertTime")
private long iceRevertTime;
private double currentRadius;
+ @Attribute(Attribute.RADIUS)
private double maxRadius;
+ @Attribute(Attribute.RANGE)
private double range;
+ @Attribute(Attribute.SELECT_RANGE)
private double selectRange;
- private double pushFactor;
- private double verticalFactor;
+ @Attribute(Attribute.KNOCKBACK)
+ private double knockback;
+ @Attribute(Attribute.KNOCKUP)
+ private double knockup;
+ @Attribute("Freeze" + Attribute.RADIUS)
private double maxFreezeRadius;
private Block sourceBlock;
private Location location;
@@ -68,8 +79,8 @@ public class SurgeWave extends WaterAbility {
this.cooldown = getConfig().getLong("Abilities.Water.Surge.Wave.Cooldown");
this.interval = getConfig().getLong("Abilities.Water.Surge.Wave.Interval");
this.maxRadius = getConfig().getDouble("Abilities.Water.Surge.Wave.Radius");
- this.pushFactor = getConfig().getDouble("Abilities.Water.Surge.Wave.HorizontalPush");
- this.verticalFactor = getConfig().getDouble("Abilities.Water.Surge.Wave.VerticalPush");
+ this.knockback = getConfig().getDouble("Abilities.Water.Surge.Wave.Knockback");
+ this.knockup = getConfig().getDouble("Abilities.Water.Surge.Wave.Knockup");
this.maxFreezeRadius = getConfig().getDouble("Abilities.Water.Surge.Wave.MaxFreezeRadius");
this.iceRevertTime = getConfig().getLong("Abilities.Water.Surge.Wave.IceRevertTime");
this.range = getConfig().getDouble("Abilities.Water.Surge.Wave.Range");
@@ -96,7 +107,7 @@ public class SurgeWave extends WaterAbility {
if (GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
return;
} else if (!TempBlock.isTempBlock(block)) {
- new TempBlock(block, Material.STATIONARY_WATER, (byte) 8);
+ new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
this.waveBlocks.put(block, block);
}
}
@@ -136,35 +147,42 @@ public class SurgeWave extends WaterAbility {
if (freezeradius > this.maxFreezeRadius) {
freezeradius = this.maxFreezeRadius;
}
-
- for (final Block block : GeneralMethods.getBlocksAroundPoint(this.frozenLocation, freezeradius)) {
- if (GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation()) || GeneralMethods.isRegionProtectedFromBuild(this.player, "PhaseChange", block.getLocation())) {
+ final List trapped = GeneralMethods.getEntitiesAroundPoint(this.frozenLocation, freezeradius);
+ ICE_SETTING: for (final Block block : GeneralMethods.getBlocksAroundPoint(this.frozenLocation, freezeradius)) {
+ if (GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
continue;
} else if (TempBlock.isTempBlock(block)) {
continue;
}
- final Block oldBlock = block;
- final TempBlock tblock = new TempBlock(block, block.getType(), (byte) 0);
- if (block.getType() == Material.AIR || block.getType() == Material.SNOW || isWater(block)) {
- tblock.setType(Material.ICE);
- } else if (isPlant(block) && block.getType() != Material.LEAVES) {
- block.breakNaturally();
- tblock.setType(Material.ICE);
- } else {
- tblock.revertBlock();
- continue;
- }
- tblock.setRevertTask(new RevertTask() {
-
- @Override
- public void run() {
- SurgeWave.this.frozenBlocks.remove(block);
+ for (final Entity entity : trapped) {
+ if (entity instanceof Player) {
+ if (Commands.invincible.contains(((Player) entity).getName())) {
+ return;
+ }
+ if (!getConfig().getBoolean("Properties.Water.FreezePlayerHead") && GeneralMethods.playerHeadIsInBlock((Player) entity, block)) {
+ continue ICE_SETTING;
+ }
+ if (!getConfig().getBoolean("Properties.Water.FreezePlayerFeet") && GeneralMethods.playerFeetIsInBlock((Player) entity, block)) {
+ continue ICE_SETTING;
+ }
}
+ }
+
+ final Block oldBlock = block;
+ if (!ElementalAbility.isAir(block.getType()) && block.getType() != Material.SNOW && !isWater(block) && !isPlant(block)) {
+ continue;
+ } else if (isPlant(block)) {
+ block.breakNaturally();
+ }
+
+ final TempBlock tblock = new TempBlock(block, Material.ICE);
+
+ tblock.setRevertTask(() -> SurgeWave.this.frozenBlocks.remove(block));
- });
tblock.setRevertTime(this.iceRevertTime + (new Random().nextInt(1000)));
this.frozenBlocks.put(block, oldBlock.getType());
+
for (final Block sound : this.frozenBlocks.keySet()) {
if ((new Random()).nextInt(4) == 0) {
playWaterbendingSound(sound.getLocation());
@@ -201,7 +219,7 @@ public class SurgeWave extends WaterAbility {
this.range = this.getNightFactor(this.range);
if (this.bPlayer.isAvatarState()) {
- this.pushFactor = AvatarState.getValue(this.pushFactor);
+ this.knockback = AvatarState.getValue(this.knockback);
}
final Entity target = GeneralMethods.getTargetedEntity(this.player, this.range);
@@ -221,7 +239,14 @@ public class SurgeWave extends WaterAbility {
if (isPlant(this.sourceBlock) || isSnow(this.sourceBlock)) {
new PlantRegrowth(this.player, this.sourceBlock);
- this.sourceBlock.setType(Material.AIR);
+ this.sourceBlock.setType(Material.AIR, false);
+ }
+
+ if (TempBlock.isTempBlock(this.sourceBlock)) {
+ final TempBlock tb = TempBlock.get(this.sourceBlock);
+ if (Torrent.getFrozenBlocks().containsKey(tb)) {
+ Torrent.massThaw(tb);
+ }
}
this.addWater(this.sourceBlock);
}
@@ -252,7 +277,7 @@ public class SurgeWave extends WaterAbility {
this.remove();
return;
} else if (!this.progressing) {
- this.sourceBlock.getWorld().playEffect(this.location, Effect.SMOKE, 4, (int) this.range);
+ ParticleEffect.SMOKE_NORMAL.display(this.sourceBlock.getLocation().add(0.5, 0.5, 0.5), 4);
return;
}
@@ -268,13 +293,13 @@ public class SurgeWave extends WaterAbility {
final Block blockl = this.location.getBlock();
final ArrayList blocks = new ArrayList();
- if (!GeneralMethods.isRegionProtectedFromBuild(this, this.location) && (((blockl.getType() == Material.AIR || blockl.getType() == Material.FIRE || isPlant(blockl) || isWater(blockl) || this.isWaterbendable(this.player, blockl))) && blockl.getType() != Material.LEAVES)) {
+ if (!GeneralMethods.isRegionProtectedFromBuild(this, this.location) && (((ElementalAbility.isAir(blockl.getType()) || blockl.getType() == Material.FIRE || isPlant(blockl) || isWater(blockl) || this.isWaterbendable(this.player, blockl))))) {
for (double i = 0; i <= this.currentRadius; i += .5) {
for (double angle = 0; angle < 360; angle += 10) {
final Vector vec = GeneralMethods.getOrthogonalVector(this.targetDirection, angle, i);
final Block block = this.location.clone().add(vec).getBlock();
- if (!blocks.contains(block) && (block.getType() == Material.AIR || block.getType() == Material.FIRE) || this.isWaterbendable(block)) {
+ if (!blocks.contains(block) && (ElementalAbility.isAir(block.getType()) || block.getType() == Material.FIRE) || this.isWaterbendable(block)) {
blocks.add(block);
FireBlast.removeFireBlastsAroundPoint(block.getLocation(), 2);
}
@@ -320,9 +345,12 @@ public class SurgeWave extends WaterAbility {
}
}
if (knockback) {
+ if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+ continue;
+ }
final Vector dir = direction.clone();
- dir.setY(dir.getY() * this.verticalFactor);
- GeneralMethods.setVelocity(entity, entity.getVelocity().clone().add(dir.clone().multiply(this.getNightFactor(this.pushFactor))));
+ dir.setY(dir.getY() * this.knockup);
+ GeneralMethods.setVelocity(entity, entity.getVelocity().clone().add(dir.clone().multiply(this.getNightFactor(this.knockback))));
entity.setFallDistance(0);
if (entity.getFireTicks() > 0) {
@@ -391,7 +419,7 @@ public class SurgeWave extends WaterAbility {
public static void removeAllCleanup() {
for (final SurgeWave surgeWave : getAbilities(SurgeWave.class)) {
for (final Block block : surgeWave.waveBlocks.keySet()) {
- block.setType(Material.AIR);
+ block.setType(Material.AIR, false);
surgeWave.waveBlocks.remove(block);
}
for (final Block block : surgeWave.frozenBlocks.keySet()) {
@@ -541,20 +569,20 @@ public class SurgeWave extends WaterAbility {
this.range = range;
}
- public double getPushFactor() {
- return this.pushFactor;
+ public double getKnockback() {
+ return this.knockback;
}
- public void setPushFactor(final double pushFactor) {
- this.pushFactor = pushFactor;
+ public void setKnockback(final double knockback) {
+ this.knockback = knockback;
}
- public double getVerticalFactor() {
- return this.verticalFactor;
+ public double getKnockup() {
+ return this.knockup;
}
- public void setVerticalFactor(final double verticalFactor) {
- this.verticalFactor = verticalFactor;
+ public void setKnockup(final double knockup) {
+ this.knockup = knockup;
}
public double getMaxFreezeRadius() {
diff --git a/src/com/projectkorra/projectkorra/waterbending/Torrent.java b/src/com/projectkorra/projectkorra/waterbending/Torrent.java
index 99ce31a0..582621bd 100644
--- a/src/com/projectkorra/projectkorra/waterbending/Torrent.java
+++ b/src/com/projectkorra/projectkorra/waterbending/Torrent.java
@@ -1,11 +1,14 @@
package com.projectkorra.projectkorra.waterbending;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.commons.lang3.tuple.Pair;
+
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
@@ -18,7 +21,9 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.avatar.AvatarState;
+import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
@@ -30,7 +35,7 @@ import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
public class Torrent extends WaterAbility {
private static final double CLEANUP_RANGE = 50;
- private static final Map FROZEN_BLOCKS = new ConcurrentHashMap<>();
+ private static final Map> FROZEN_BLOCKS = new ConcurrentHashMap<>();
private boolean sourceSelected;
private boolean settingUp;
@@ -46,17 +51,26 @@ public class Torrent extends WaterAbility {
private int hits = 1;
private long time;
private long interval;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private long revertTime;
private double startAngle;
private double angle;
+ @Attribute(Attribute.RADIUS)
private double radius;
- private double push;
- private double maxUpwardForce;
+ @Attribute(Attribute.KNOCKBACK)
+ private double knockback;
+ @Attribute(Attribute.KNOCKUP)
+ private double knockup;
+ @Attribute(Attribute.DAMAGE)
private double damage;
+ @Attribute("Successive" + Attribute.DAMAGE)
private double successiveDamage;
+ @Attribute("Deflect" + Attribute.DAMAGE)
private double deflectDamage;
+ @Attribute(Attribute.RANGE)
private double range;
+ @Attribute(Attribute.SELECT_RANGE)
private double selectRange;
private Block sourceBlock;
private TempBlock source;
@@ -71,10 +85,10 @@ public class Torrent extends WaterAbility {
this.layer = 0;
this.startAngle = 0;
this.maxLayer = getConfig().getInt("Abilities.Water.Torrent.MaxLayer");
- this.push = getConfig().getDouble("Abilities.Water.Torrent.Push");
+ this.knockback = getConfig().getDouble("Abilities.Water.Torrent.Knockback");
this.angle = getConfig().getDouble("Abilities.Water.Torrent.Angle");
this.radius = getConfig().getDouble("Abilities.Water.Torrent.Radius");
- this.maxUpwardForce = getConfig().getDouble("Abilities.Water.Torrent.MaxUpwardForce");
+ this.knockup = getConfig().getDouble("Abilities.Water.Torrent.Knockup");
this.interval = getConfig().getLong("Abilities.Water.Torrent.Interval");
this.damage = getConfig().getDouble("Abilities.Water.Torrent.InitialDamage");
this.successiveDamage = getConfig().getDouble("Abilities.Water.Torrent.SuccessiveDamage");
@@ -105,7 +119,7 @@ public class Torrent extends WaterAbility {
}
if (this.bPlayer.isAvatarState()) {
- this.push = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.Torrent.Push");
+ this.knockback = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.Torrent.Push");
this.damage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.Torrent.InitialDamage");
this.successiveDamage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.Torrent.SuccessiveDamage");
this.maxHits = getConfig().getInt("Abilities.Avatar.AvatarState.Water.Torrent.MaxHits");
@@ -125,12 +139,25 @@ public class Torrent extends WaterAbility {
} else if (!this.bPlayer.canBendIgnoreBindsCooldowns(getAbility("PhaseChange"))) {
return;
}
-
final List ice = GeneralMethods.getBlocksAroundPoint(this.location, this.layer);
- for (final Block block : ice) {
+ final List trapped = GeneralMethods.getEntitiesAroundPoint(this.location, this.layer);
+ ICE_SETTING: for (final Block block : ice) {
if (isTransparent(this.player, block) && block.getType() != Material.ICE) {
- final TempBlock tblock = new TempBlock(block, Material.ICE, (byte) 0);
- FROZEN_BLOCKS.put(tblock, this.player);
+ for (final Entity entity : trapped) {
+ if (entity instanceof Player) {
+ if (Commands.invincible.contains(((Player) entity).getName())) {
+ return;
+ }
+ if (!getConfig().getBoolean("Properties.Water.FreezePlayerHead") && GeneralMethods.playerHeadIsInBlock((Player) entity, block)) {
+ continue ICE_SETTING;
+ }
+ if (!getConfig().getBoolean("Properties.Water.FreezePlayerFeet") && GeneralMethods.playerFeetIsInBlock((Player) entity, block)) {
+ continue ICE_SETTING;
+ }
+ }
+ }
+ final TempBlock tblock = new TempBlock(block, Material.ICE);
+ FROZEN_BLOCKS.put(tblock, Pair.of(this.player, this.getId()));
if (this.revert) {
tblock.setRevertTime(this.revertTime + (new Random().nextInt((500 + 500) + 1) - 500));
}
@@ -163,13 +190,24 @@ public class Torrent extends WaterAbility {
this.sourceSelected = false;
this.settingUp = true;
+ if (TempBlock.isTempBlock(this.sourceBlock)) {
+ final TempBlock origin = TempBlock.get(this.sourceBlock);
+
+ if (FROZEN_BLOCKS.containsKey(origin)) {
+ massThaw(origin);
+ } else if (isBendableWaterTempBlock(origin)) {
+ origin.revertBlock();
+ }
+ }
+
if (isPlant(this.sourceBlock) || isSnow(this.sourceBlock)) {
new PlantRegrowth(this.player, this.sourceBlock);
this.sourceBlock.setType(Material.AIR);
} else if (!GeneralMethods.isAdjacentToThreeOrMoreSources(this.sourceBlock)) {
this.sourceBlock.setType(Material.AIR);
}
- this.source = new TempBlock(this.sourceBlock, Material.STATIONARY_WATER, (byte) 8);
+
+ this.source = new TempBlock(this.sourceBlock, Material.WATER, GeneralMethods.getWaterData(0));
this.location = this.sourceBlock.getLocation();
} else {
playFocusWaterEffect(this.sourceBlock);
@@ -223,7 +261,7 @@ public class Torrent extends WaterAbility {
this.remove();
return;
}
- this.source = new TempBlock(this.location.getBlock(), Material.STATIONARY_WATER, (byte) 8);
+ this.source = new TempBlock(this.location.getBlock(), Material.WATER, GeneralMethods.getWaterData(0));
}
}
if (this.forming && !this.player.isSneaking()) {
@@ -244,7 +282,7 @@ public class Torrent extends WaterAbility {
final double dz = Math.sin(phi) * this.radius;
loc.add(dx, dy, dz);
if (isWater(loc.getBlock()) && GeneralMethods.isAdjacentToThreeOrMoreSources(loc.getBlock())) {
- ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, loc.getBlock().getLocation().clone().add(.5, .5, .5), 255.0);
+ ParticleEffect.WATER_BUBBLE.display(loc.getBlock().getLocation().clone().add(.5, .5, .5), 5, Math.random(), Math.random(), Math.random(), 0);
}
loc.subtract(dx, dy, dz);
}
@@ -316,7 +354,7 @@ public class Torrent extends WaterAbility {
final Block block = blockloc.getBlock();
if (!doneBlocks.contains(block) && !GeneralMethods.isRegionProtectedFromBuild(this, blockloc)) {
if (isTransparent(this.player, block)) {
- this.launchedBlocks.add(new TempBlock(block, Material.STATIONARY_WATER, (byte) 8));
+ this.launchedBlocks.add(new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0)));
doneBlocks.add(block);
} else if (!isTransparent(this.player, block)) {
break;
@@ -382,9 +420,9 @@ public class Torrent extends WaterAbility {
}
if (locBlock.getLocation().distanceSquared(targetLoc) > 1) {
if (isWater(locBlock)) {
- ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, locBlock.getLocation().clone().add(.5, .5, .5), 255.0);
+ ParticleEffect.WATER_BUBBLE.display(locBlock.getLocation().clone().add(.5, .5, .5), 5, Math.random(), Math.random(), Math.random(), 0);
}
- newBlocks.add(new TempBlock(locBlock, Material.STATIONARY_WATER, (byte) 8));
+ newBlocks.add(new TempBlock(locBlock, Material.WATER, GeneralMethods.getWaterData(0)));
} else {
if (this.layer < this.maxLayer) {
if (this.layer == 0) {
@@ -449,7 +487,7 @@ public class Torrent extends WaterAbility {
final Block block = blockLoc.getBlock();
if (!doneBlocks.contains(block)) {
if (isTransparent(this.player, block)) {
- this.blocks.add(new TempBlock(block, Material.STATIONARY_WATER, (byte) 8));
+ this.blocks.add(new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0)));
doneBlocks.add(block);
for (final Entity entity : entities) {
if (entity.getWorld() != blockLoc.getWorld()) {
@@ -503,16 +541,15 @@ public class Torrent extends WaterAbility {
final Block block = eyeLoc.add(eyeLoc.getDirection().normalize()).getBlock();
if (isTransparent(player, block) && isTransparent(player, eyeLoc.getBlock())) {
if (block.getType() != Material.WATER) {
- block.setType(Material.STATIONARY_WATER);
- block.setData((byte) 8);
+ block.setType(Material.WATER);
+ block.setBlockData(GeneralMethods.getWaterData(0));
}
final Torrent tor = new Torrent(player);
if (tor.sourceSelected || tor.settingUp) {
WaterReturn.emptyWaterBottle(player);
- } else {
- block.setType(Material.AIR);
}
+ block.setType(Material.AIR);
}
}
}
@@ -528,6 +565,9 @@ public class Torrent extends WaterAbility {
if (entity.getEntityId() == this.player.getEntityId()) {
return;
}
+ if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+ return;
+ }
double x, z, vx, vz, mag;
double angle = 50;
angle = Math.toRadians(angle);
@@ -540,7 +580,7 @@ public class Torrent extends WaterAbility {
vx = (x * Math.cos(angle) - z * Math.sin(angle)) / mag;
vz = (x * Math.sin(angle) + z * Math.cos(angle)) / mag;
- final Vector vec = new Vector(vx, 0, vz).normalize().multiply(this.push);
+ final Vector vec = new Vector(vx, 0, vz).normalize().multiply(this.knockback);
final Vector velocity = entity.getVelocity();
if (this.bPlayer.isAvatarState()) {
@@ -564,11 +604,14 @@ public class Torrent extends WaterAbility {
if (entity.getEntityId() == this.player.getEntityId()) {
return;
}
- if (direction.getY() > this.maxUpwardForce) {
- direction.setY(this.maxUpwardForce);
+ if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || (entity instanceof Player && Commands.invincible.contains(((Player) entity).getName()))) {
+ return;
+ }
+ if (direction.getY() > this.knockup) {
+ direction.setY(this.knockup);
}
if (!this.freeze) {
- entity.setVelocity(direction.multiply(this.push));
+ entity.setVelocity(direction.multiply(this.knockback));
}
if (entity instanceof LivingEntity && !this.hurtEntities.contains(entity)) {
double damageDealt = this.getNightFactor(this.damage);
@@ -589,7 +632,7 @@ public class Torrent extends WaterAbility {
public static void progressAllCleanup() {
for (final TempBlock block : FROZEN_BLOCKS.keySet()) {
- final Player player = FROZEN_BLOCKS.get(block);
+ final Player player = FROZEN_BLOCKS.get(block).getLeft();
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
if (bPlayer == null) {
FROZEN_BLOCKS.remove(block);
@@ -623,6 +666,33 @@ public class Torrent extends WaterAbility {
FROZEN_BLOCKS.remove(block);
}
+ /**
+ * Thaws the entire mass of ice created by a torrent that the given block is
+ * part of
+ *
+ * @param origin part of the ice mass created by a torrent
+ */
+ public static void massThaw(final TempBlock origin) {
+ if (FROZEN_BLOCKS.containsKey(origin)) {
+ final Player creator = FROZEN_BLOCKS.get(origin).getLeft();
+ final int id = FROZEN_BLOCKS.get(origin).getRight();
+
+ for (final TempBlock tb : FROZEN_BLOCKS.keySet()) {
+ if (tb.equals(origin)) {
+ continue;
+ }
+
+ final Player check = FROZEN_BLOCKS.get(tb).getLeft();
+ final int id2 = FROZEN_BLOCKS.get(tb).getRight();
+ if (creator.equals(check) && id == id2) {
+ thaw(tb);
+ }
+ }
+
+ thaw(origin);
+ }
+ }
+
public static boolean canThaw(final Block block) {
if (TempBlock.isTempBlock(block)) {
final TempBlock tblock = TempBlock.get(block);
@@ -810,19 +880,19 @@ public class Torrent extends WaterAbility {
}
public double getPush() {
- return this.push;
+ return this.knockback;
}
public void setPush(final double push) {
- this.push = push;
+ this.knockback = push;
}
public double getMaxUpwardForce() {
- return this.maxUpwardForce;
+ return this.knockup;
}
public void setMaxUpwardForce(final double maxUpwardForce) {
- this.maxUpwardForce = maxUpwardForce;
+ this.knockup = maxUpwardForce;
}
public double getDamage() {
@@ -886,7 +956,11 @@ public class Torrent extends WaterAbility {
}
public static Map getFrozenBlocks() {
- return FROZEN_BLOCKS;
+ final Map blocks = new HashMap<>();
+ for (final TempBlock tb : FROZEN_BLOCKS.keySet()) {
+ blocks.put(tb, FROZEN_BLOCKS.get(tb).getLeft());
+ }
+ return blocks;
}
public ArrayList getLaunchedBlocks() {
diff --git a/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java b/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
index 8493a9a2..3f38645d 100644
--- a/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
@@ -15,6 +15,8 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
+import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
@@ -22,11 +24,16 @@ public class TorrentWave extends WaterAbility {
private long time;
private long interval;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private double radius;
+ @Attribute(Attribute.RADIUS)
private double maxRadius;
+ @Attribute(Attribute.KNOCKBACK)
private double knockback;
+ @Attribute(Attribute.HEIGHT)
private double maxHeight;
+ @Attribute("Grow" + Attribute.SPEED)
private double growSpeed;
private Location origin;
private ArrayList blocks;
@@ -133,7 +140,7 @@ public class TorrentWave extends WaterAbility {
}
if (isTransparent(this.player, block)) {
- final TempBlock tempBlock = new TempBlock(block, Material.STATIONARY_WATER, (byte) 8);
+ final TempBlock tempBlock = new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
this.blocks.add(tempBlock);
torrentBlocks.add(block);
} else {
@@ -144,6 +151,9 @@ public class TorrentWave extends WaterAbility {
for (final Entity entity : indexList) {
if (!this.affectedEntities.contains(entity)) {
if (entity.getLocation().distanceSquared(location) <= 4) {
+ if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+ continue;
+ }
this.affectedEntities.add(entity);
this.affect(entity);
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java b/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java
index 8fec4454..e81ecddd 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java
@@ -10,25 +10,32 @@ import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.Waterlogged;
import org.bukkit.entity.Player;
-import org.bukkit.material.MaterialData;
import com.projectkorra.projectkorra.ability.CoreAbility;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.util.TempBlock;
public class WaterBubble extends WaterAbility {
- private static long clickDuration; // How long the click variant lasts.
- private static double maxRadius;
- private static double speed;
- private static boolean requireAir = false;
+ @Attribute("Click" + Attribute.DURATION)
+ private long clickDuration;
+ @Attribute(Attribute.RADIUS)
+ private double maxRadius;
+ @Attribute(Attribute.SPEED)
+ private double speed;
+ @Attribute("RequireAir")
+ private boolean requireAir;
private boolean isShift;
private double radius;
private boolean removing = false; // Is true when the radius is shrinking.
- private final Map waterOrigins = new ConcurrentHashMap();
+ private final Map waterOrigins = new ConcurrentHashMap<>();
private Location location;
private long lastActivation; // When the last click happened.
@@ -41,7 +48,7 @@ public class WaterBubble extends WaterAbility {
final WaterBubble bubble = CoreAbility.getAbility(player, this.getClass());
if (bubble.location.getWorld().equals(player.getWorld())) {
- if (bubble.location.distanceSquared(player.getLocation()) < maxRadius * maxRadius) {
+ if (bubble.location.distanceSquared(player.getLocation()) < this.maxRadius * this.maxRadius) {
if (bubble.removing) {
bubble.removing = false;
}
@@ -53,7 +60,7 @@ public class WaterBubble extends WaterAbility {
}
}
bubble.removing = true;
- } else if (requireAir && !(!player.getEyeLocation().getBlock().getType().isSolid() && !player.getEyeLocation().getBlock().isLiquid())) {
+ } else if (this.requireAir && !(!player.getEyeLocation().getBlock().getType().isSolid() && !player.getEyeLocation().getBlock().isLiquid())) {
return;
}
@@ -70,10 +77,10 @@ public class WaterBubble extends WaterAbility {
}
public void setFields() {
- clickDuration = ConfigManager.defaultConfig.get().getLong("Abilities.Water.WaterBubble.ClickDuration");
- maxRadius = ConfigManager.defaultConfig.get().getDouble("Abilities.Water.WaterBubble.Radius");
- speed = ConfigManager.defaultConfig.get().getDouble("Abilities.Water.WaterBubble.Speed");
- requireAir = ConfigManager.defaultConfig.get().getBoolean("Abilities.Water.WaterBubble.MustStartAboveWater");
+ this.clickDuration = ConfigManager.defaultConfig.get().getLong("Abilities.Water.WaterBubble.ClickDuration");
+ this.maxRadius = ConfigManager.defaultConfig.get().getDouble("Abilities.Water.WaterBubble.Radius");
+ this.speed = ConfigManager.defaultConfig.get().getDouble("Abilities.Water.WaterBubble.Speed");
+ this.requireAir = ConfigManager.defaultConfig.get().getBoolean("Abilities.Water.WaterBubble.MustStartAboveWater");
}
@Override
@@ -87,28 +94,28 @@ public class WaterBubble extends WaterAbility {
this.removing = true;
}
- if (System.currentTimeMillis() - this.lastActivation > clickDuration && !this.isShift) {
+ if (System.currentTimeMillis() - this.lastActivation > this.clickDuration && !this.isShift) {
this.removing = true;
}
if (this.removing) {
- this.radius -= speed;
+ this.radius -= this.speed;
if (this.radius <= 0.1) {
this.radius = 0.1;
this.remove();
}
} else {
- this.radius += speed;
+ this.radius += this.speed;
- if (this.radius > maxRadius) {
- this.radius = maxRadius;
+ if (this.radius > this.maxRadius) {
+ this.radius = this.maxRadius;
}
}
final List list = new ArrayList();
- if (this.radius < maxRadius || !this.location.getBlock().equals(this.player.getLocation().getBlock())) {
+ if (this.radius < this.maxRadius || !this.location.getBlock().equals(this.player.getLocation().getBlock())) {
for (double x = -this.radius; x < this.radius; x += 0.5) {
for (double y = -this.radius; y < this.radius; y += 0.5) {
@@ -117,11 +124,17 @@ public class WaterBubble extends WaterAbility {
final Block b = this.location.add(x, y, z).getBlock();
if (!this.waterOrigins.containsKey(b)) {
- if (b.getType() == Material.STATIONARY_WATER || b.getType() == Material.WATER) {
+ if (isWater(b)) {
if (!TempBlock.isTempBlock(b)) {
- this.waterOrigins.put(b, b.getState().getData());
+ this.waterOrigins.put(b, b.getState());
+ if (b.getBlockData() instanceof Waterlogged) {
+ final Waterlogged logged = (Waterlogged) b.getBlockData();
+ logged.setWaterlogged(false);
+ b.setBlockData(logged);
+ } else if (isWater(b.getType())) {
+ b.setType(Material.AIR);
+ }
}
- b.setType(Material.AIR);
}
}
list.add(b); // Store it to say that it should be there.
@@ -137,9 +150,13 @@ public class WaterBubble extends WaterAbility {
set.removeAll(list);
for (final Block b : set) {
- if (b.getType() == Material.AIR) {
- b.setType(this.waterOrigins.get(b).getItemType());
- b.setData(this.waterOrigins.get(b).getData());
+ if (b.getBlockData() instanceof Waterlogged) {
+ final Waterlogged logged = (Waterlogged) b.getBlockData();
+ logged.setWaterlogged(true);
+ b.setBlockData(logged);
+ } else if (ElementalAbility.isAir(b.getType())) {
+ b.setType(this.waterOrigins.get(b).getType());
+ b.setBlockData(this.waterOrigins.get(b).getBlockData());
}
this.waterOrigins.remove(b);
}
@@ -173,11 +190,17 @@ public class WaterBubble extends WaterAbility {
super.remove();
for (final Block b : this.waterOrigins.keySet()) {
- if (b.getType() == Material.AIR) {
- b.setType(this.waterOrigins.get(b).getItemType());
- b.setData(this.waterOrigins.get(b).getData());
+ if (b.getBlockData() instanceof Waterlogged) {
+ final Waterlogged logged = (Waterlogged) b.getBlockData();
+ logged.setWaterlogged(true);
+ b.setBlockData(logged);
+ } else if (ElementalAbility.isAir(b.getType())) {
+ b.setType(this.waterOrigins.get(b).getType());
+ b.setBlockData(this.waterOrigins.get(b).getBlockData());
}
}
+
+ this.waterOrigins.clear();
}
/**
@@ -190,10 +213,10 @@ public class WaterBubble extends WaterAbility {
public static boolean isAir(final Block block) {
for (final WaterBubble bubble : CoreAbility.getAbilities(WaterBubble.class)) {
if (bubble.waterOrigins.containsKey(block)) {
- return false;
+ return true;
}
}
- return true;
+ return false;
}
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java b/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
index c855d04c..11c7b197 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
@@ -6,7 +6,6 @@ import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
-import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
@@ -20,6 +19,8 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
+import com.projectkorra.projectkorra.attribute.Attribute;
+import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
@@ -40,12 +41,20 @@ public class WaterManipulation extends WaterAbility {
private boolean prepared;
private int dispelRange;
private long time;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private long interval;
- private double selectRange, range;
- private double pushFactor;
+ @Attribute(Attribute.SELECT_RANGE)
+ private double selectRange;
+ @Attribute(Attribute.RANGE)
+ private double range;
+ @Attribute(Attribute.KNOCKBACK)
+ private double knockback;
+ @Attribute(Attribute.DAMAGE)
private double damage;
+ @Attribute(Attribute.SPEED)
private double speed;
+ @Attribute("Deflect" + Attribute.RANGE)
private double deflectRange;
private double collisionRadius;
private Block sourceBlock;
@@ -73,7 +82,7 @@ public class WaterManipulation extends WaterAbility {
this.cooldown = getConfig().getLong("Abilities.Water.WaterManipulation.Cooldown");
this.selectRange = getConfig().getDouble("Abilities.Water.WaterManipulation.SelectRange");
this.range = getConfig().getDouble("Abilities.Water.WaterManipulation.Range");
- this.pushFactor = getConfig().getDouble("Abilities.Water.WaterManipulation.Push");
+ this.knockback = getConfig().getDouble("Abilities.Water.WaterManipulation.Knockback");
this.damage = getConfig().getDouble("Abilities.Water.WaterManipulation.Damage");
this.speed = getConfig().getDouble("Abilities.Water.WaterManipulation.Speed");
this.deflectRange = getConfig().getDouble("Abilities.Water.WaterManipulation.DeflectRange");
@@ -200,7 +209,7 @@ public class WaterManipulation extends WaterAbility {
this.remove();
return;
}
- this.sourceBlock.getWorld().playEffect(this.location, Effect.SMOKE, 4, (int) this.selectRange);
+ ParticleEffect.SMOKE_NORMAL.display(this.sourceBlock.getLocation().clone().add(0.5, 0.5, 0.5), 4, 0, 0, 0);
return;
}
@@ -269,9 +278,12 @@ public class WaterManipulation extends WaterAbility {
if (!this.displacing) {
for (final Entity entity : GeneralMethods.getEntitiesAroundPoint(this.location, this.collisionRadius)) {
if (entity instanceof LivingEntity && entity.getEntityId() != this.player.getEntityId()) {
+ if (GeneralMethods.isRegionProtectedFromBuild(this.player, "WaterManipulation", entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+ continue;
+ }
final Location location = this.player.getEyeLocation();
final Vector vector = location.getDirection();
- entity.setVelocity(vector.normalize().multiply(this.pushFactor));
+ entity.setVelocity(vector.normalize().multiply(this.knockback));
if (this.bPlayer.isAvatarState()) {
this.damage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.WaterManipulation.Damage");
@@ -299,9 +311,9 @@ public class WaterManipulation extends WaterAbility {
}
if (this.trail != null) {
this.trail2 = this.trail;
- this.trail2.setType(Material.STATIONARY_WATER, (byte) 2);
+ this.trail2.setType(Material.WATER, GeneralMethods.getWaterData(6));
}
- this.trail = new TempBlock(this.sourceBlock, Material.STATIONARY_WATER, (byte) 1);
+ this.trail = new TempBlock(this.sourceBlock, Material.WATER, GeneralMethods.getWaterData(7));
this.sourceBlock = block;
if (this.location.distanceSquared(this.targetDestination) <= 1 || this.location.distanceSquared(this.firstDestination) > this.range * this.range) {
@@ -354,10 +366,10 @@ public class WaterManipulation extends WaterAbility {
if (PhaseChange.getFrozenBlocksAsBlock().contains(block)) {
PhaseChange.getFrozenBlocksAsBlock().remove(block);
}
- new TempBlock(block, Material.WATER, (byte) 0);
+ new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
} else {
if (isWater(block) && !AFFECTED_BLOCKS.containsKey(block)) {
- ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, block.getLocation().clone().add(.5, .5, .5), 255.0);
+ ParticleEffect.WATER_BUBBLE.display(block.getLocation().clone().add(.5, .5, .5), 5, Math.random(), Math.random(), Math.random(), 0);
}
}
@@ -488,7 +500,7 @@ public class WaterManipulation extends WaterAbility {
if (isTransparent(player, block) && isTransparent(player, eyeLoc.getBlock())) {
if (getTargetLocation(player, range).distanceSquared(block.getLocation()) > 1) {
- final TempBlock tb = new TempBlock(block, Material.WATER, (byte) 0);
+ final TempBlock tb = new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
final WaterManipulation waterManip = new WaterManipulation(player, block);
waterManip.moveWater();
@@ -678,11 +690,11 @@ public class WaterManipulation extends WaterAbility {
}
public double getPushFactor() {
- return this.pushFactor;
+ return this.knockback;
}
public void setPushFactor(final double pushFactor) {
- this.pushFactor = pushFactor;
+ this.knockback = pushFactor;
}
public double getDamage() {
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java b/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
index fffacf8b..52629a45 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
@@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.ProjectKorra;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.attribute.Attribute;
@@ -25,6 +25,7 @@ public class WaterSpout extends WaterAbility {
private static final Map AFFECTED_BLOCKS = new ConcurrentHashMap();
private final List blocks = new ArrayList();
+ @Attribute("CanBendOnPackedIce")
private boolean canBendOnPackedIce;
private boolean useParticles;
private boolean useBlockSpiral;
@@ -33,10 +34,12 @@ public class WaterSpout extends WaterAbility {
private long interval;
@Attribute(Attribute.COOLDOWN)
private long cooldown;
+ @Attribute(Attribute.DURATION)
private long duration;
private long startTime;
private double rotation;
private double height;
+ @Attribute(Attribute.HEIGHT)
private double maxHeight;
private Block base;
private TempBlock baseBlock;
@@ -80,7 +83,7 @@ public class WaterSpout extends WaterAbility {
if (!this.isWithinMaxSpoutHeight(topBlock.getLocation(), heightRemoveThreshold)) {
return;
}
- ProjectKorra.flightHandler.createInstance(player, this.getName());
+ this.flightHandler.createInstance(player, this.getName());
player.setAllowFlight(true);
this.spoutableWaterHeight(player.getLocation()); // Sets base.
this.start();
@@ -107,8 +110,8 @@ public class WaterSpout extends WaterAbility {
loc.add(x, height, z);
final Block block = loc.getBlock();
- if ((!TempBlock.isTempBlock(block)) && (block.getType().equals(Material.AIR) || !GeneralMethods.isSolid(block))) {
- this.blocks.add(new TempBlock(block, Material.STATIONARY_WATER, (byte) 1));
+ if ((!TempBlock.isTempBlock(block)) && (ElementalAbility.isAir(block.getType()) || !GeneralMethods.isSolid(block))) {
+ this.blocks.add(new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(7)));
AFFECTED_BLOCKS.put(block, block);
}
}
@@ -154,7 +157,7 @@ public class WaterSpout extends WaterAbility {
block = location.clone().add(0, i, 0).getBlock();
if (!TempBlock.isTempBlock(block)) {
- this.blocks.add(new TempBlock(block, Material.STATIONARY_WATER, (byte) 8));
+ this.blocks.add(new TempBlock(block, Material.WATER, GeneralMethods.getWaterData(0)));
AFFECTED_BLOCKS.put(block, block);
}
this.rotateParticles(block);
@@ -162,10 +165,14 @@ public class WaterSpout extends WaterAbility {
this.displayWaterSpiral(location.clone().add(.5, 0, .5));
if (this.player.getLocation().getBlockY() > block.getY()) {
- this.player.setFlying(false);
+ if (this.player.isFlying()) {
+ this.player.setFlying(false);
+ }
} else {
- this.player.setAllowFlight(true);
- this.player.setFlying(true);
+ if (!this.player.isFlying()) {
+ this.player.setAllowFlight(true);
+ this.player.setFlying(true);
+ }
}
} else {
this.bPlayer.addCooldown(this);
@@ -183,7 +190,7 @@ public class WaterSpout extends WaterAbility {
AFFECTED_BLOCKS.remove(tb.getBlock());
tb.revertBlock();
}
- ProjectKorra.flightHandler.removeInstance(this.player, this.getName());
+ this.flightHandler.removeInstance(this.player, this.getName());
}
public void revertBaseBlock() {
@@ -222,7 +229,7 @@ public class WaterSpout extends WaterAbility {
dy = this.height;
}
- final float[] directions = { -0.5f, 0.325f, 0.25f, 0.125f, 0.f, 0.125f, 0.25f, 0.325f, 0.5f };
+ final double[] directions = { -0.5, 0.325, 0.25, 0.125, 0.0, 0.125, 0.25, 0.325, 0.5 };
int index = this.angle;
this.angle++;
if (this.angle >= directions.length) {
@@ -235,7 +242,7 @@ public class WaterSpout extends WaterAbility {
}
final Location effectLoc2 = new Location(location.getWorld(), location.getX(), block.getY() + i, location.getZ());
- ParticleEffect.WATER_SPLASH.display(effectLoc2, directions[index], directions[index], directions[index], 5, (int) (this.height + 5));
+ ParticleEffect.WATER_SPLASH.display(effectLoc2, 5, directions[index], directions[index], directions[index]);
}
}
}
@@ -279,7 +286,7 @@ public class WaterSpout extends WaterAbility {
if (!TempBlock.isTempBlock(blocki)) {
this.revertBaseBlock();
- this.baseBlock = new TempBlock(blocki, Material.STATIONARY_WATER, (byte) 8);
+ this.baseBlock = new TempBlock(blocki, Material.WATER, GeneralMethods.getWaterData(0));
}
this.base = blocki;
@@ -289,7 +296,7 @@ public class WaterSpout extends WaterAbility {
return i;
}
- if ((blocki.getType() != Material.AIR && (!isPlant(blocki) || !this.bPlayer.canPlantbend()))) {
+ if ((!ElementalAbility.isAir(blocki.getType()) && (!isPlant(blocki) || !this.bPlayer.canPlantbend()))) {
this.revertBaseBlock();
return -1;
}
@@ -354,6 +361,9 @@ public class WaterSpout extends WaterAbility {
@Override
public List getLocations() {
+ if (this.getBase() == null) {
+ return new ArrayList<>();
+ }
final ArrayList locations = new ArrayList<>();
final Location top = this.getLocation();
final Location iterLoc = this.getBase().getLocation();
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java b/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
index 2ecbf5d2..1184b6c4 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
@@ -11,6 +11,7 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@@ -21,7 +22,10 @@ import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
+import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.combo.IceWave;
@@ -39,6 +43,7 @@ public class WaterSpoutWave extends WaterAbility {
private static final Map FROZEN_BLOCKS = new ConcurrentHashMap<>();
+ @Attribute(Attribute.RADIUS)
private double radius;
private boolean charging;
private boolean iceWave;
@@ -49,14 +54,22 @@ public class WaterSpoutWave extends WaterAbility {
private boolean revertIceSphere;
private int progressCounter;
private long time;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private long revertSphereTime;
+ @Attribute(Attribute.SELECT_RANGE)
private double selectRange;
+ @Attribute(Attribute.SPEED)
private double speed;
+ @Attribute(Attribute.CHARGE_DURATION)
private double chargeTime;
- private double flightTime;
+ @Attribute("Flight" + Attribute.DURATION)
+ private double flightDuration;
+ @Attribute("Wave" + Attribute.RADIUS)
private double waveRadius;
+ @Attribute("Thaw" + Attribute.RADIUS)
private double thawRadius;
+ @Attribute(Attribute.DAMAGE)
private double damage;
private double animationSpeed;
private AbilityType type;
@@ -84,7 +97,7 @@ public class WaterSpoutWave extends WaterAbility {
this.speed = getConfig().getDouble("Abilities.Water.WaterSpout.Wave.Speed");
this.damage = getConfig().getDouble("Abilities.Water.IceWave.Damage");
this.chargeTime = getConfig().getLong("Abilities.Water.WaterSpout.Wave.ChargeTime");
- this.flightTime = getConfig().getLong("Abilities.Water.WaterSpout.Wave.FlightTime");
+ this.flightDuration = getConfig().getLong("Abilities.Water.WaterSpout.Wave.FlightDuration");
this.cooldown = getConfig().getLong("Abilities.Water.WaterSpout.Wave.Cooldown");
this.revertSphereTime = getConfig().getLong("Abilities.Water.IceWave.RevertSphereTime");
this.revertIceSphere = getConfig().getBoolean("Abilities.Water.IceWave.RevertSphere");
@@ -100,7 +113,7 @@ public class WaterSpoutWave extends WaterAbility {
if (this.bPlayer.isAvatarState()) {
this.chargeTime = 0;
- this.flightTime = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.WaterWave.FlightTime");
+ this.flightDuration = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.WaterWave.FlightDuration");
this.damage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.IceWave.Damage");
this.cooldown = 0;
}
@@ -158,7 +171,7 @@ public class WaterSpoutWave extends WaterAbility {
}
final Block blockAbove = block.getRelative(BlockFace.UP);
- if (blockAbove.getType() != Material.AIR && !this.isWaterbendable(blockAbove)) {
+ if (!ElementalAbility.isAir(blockAbove.getType()) && !this.isWaterbendable(blockAbove)) {
this.remove();
return;
}
@@ -200,6 +213,17 @@ public class WaterSpoutWave extends WaterAbility {
new PlantRegrowth(this.player, this.origin.getBlock());
this.origin.getBlock().setType(Material.AIR);
}
+
+ if (TempBlock.isTempBlock(this.origin.getBlock())) {
+ final TempBlock tb = TempBlock.get(this.origin.getBlock());
+
+ if (Torrent.getFrozenBlocks().containsKey(tb)) {
+ Torrent.massThaw(tb);
+ } else if (!isBendableWaterTempBlock(tb)) {
+ this.remove();
+ return;
+ }
+ }
}
this.removeOldType(this.player, AbilityType.CLICK);
@@ -218,11 +242,11 @@ public class WaterSpoutWave extends WaterAbility {
this.location.add(0, this.animationSpeed, 0);
final Block block = this.location.getBlock();
- if (!(this.isWaterbendable(block) || block.getType() == Material.AIR) || GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
+ if (!(this.isWaterbendable(block) || ElementalAbility.isAir(block.getType()) || GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation()))) {
this.remove();
return;
}
- this.createBlock(block, Material.STATIONARY_WATER);
+ this.createBlock(block, Material.WATER);
if (this.location.distanceSquared(this.origin) > 4) {
this.animation = AnimateState.TOWARD_PLAYER;
}
@@ -234,12 +258,12 @@ public class WaterSpoutWave extends WaterAbility {
this.location.add(vec.normalize().multiply(this.animationSpeed));
final Block block = this.location.getBlock();
- if (!(this.isWaterbendable(block) || block.getType() == Material.AIR) || GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
+ if (!(this.isWaterbendable(block) || ElementalAbility.isAir(block.getType()) || GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation()))) {
this.remove();
return;
}
- this.createBlock(block, Material.STATIONARY_WATER);
+ this.createBlock(block, Material.WATER);
if (this.location.distanceSquared(eyeLoc) < 1.7) {
this.animation = AnimateState.CIRCLE;
final Vector tempDir = this.player.getLocation().getDirection();
@@ -263,13 +287,13 @@ public class WaterSpoutWave extends WaterAbility {
} else {
this.moving = true;
this.collidable = true;
- if ((System.currentTimeMillis() - this.time > this.flightTime && !this.bPlayer.isAvatarState()) || this.player.isSneaking()) {
+ if ((System.currentTimeMillis() - this.time > this.flightDuration && !this.bPlayer.isAvatarState()) || this.player.isSneaking()) {
this.remove();
return;
}
this.player.setFallDistance(0f);
- double currentSpeed = this.speed - (this.speed * (System.currentTimeMillis() - this.time) / this.flightTime);
+ double currentSpeed = this.speed - (this.speed * (System.currentTimeMillis() - this.time) / this.flightDuration);
final double nightSpeed = this.getNightFactor(currentSpeed * 0.9);
currentSpeed = nightSpeed > currentSpeed ? nightSpeed : currentSpeed;
if (this.bPlayer.isAvatarState()) {
@@ -278,11 +302,11 @@ public class WaterSpoutWave extends WaterAbility {
this.player.setVelocity(this.player.getEyeLocation().getDirection().normalize().multiply(currentSpeed));
for (final Block block : GeneralMethods.getBlocksAroundPoint(this.player.getLocation().add(0, -1, 0), this.waveRadius)) {
- if (block.getType() == Material.AIR && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
+ if (ElementalAbility.isAir(block.getType()) && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
if (this.iceWave) {
- this.createBlockDelay(block, Material.ICE, (byte) 0, 2L);
+ this.createBlockDelay(block, Material.ICE, Material.ICE.createBlockData(), 2L);
} else {
- this.createBlock(block, Material.STATIONARY_WATER, (byte) 0);
+ this.createBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
}
}
}
@@ -326,8 +350,8 @@ public class WaterSpoutWave extends WaterAbility {
dir.setY(0);
final Block block = this.player.getEyeLocation().add(dir).getBlock();
this.location = block.getLocation();
- if (block.getType() == Material.AIR && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
- this.createBlock(block, Material.STATIONARY_WATER, (byte) 8);
+ if (ElementalAbility.isAir(block.getType()) && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
+ this.createBlock(block, Material.WATER, GeneralMethods.getWaterData(0));
}
}
}
@@ -344,7 +368,7 @@ public class WaterSpoutWave extends WaterAbility {
}
}
- public void createBlockDelay(final Block block, final Material mat, final byte data, final long delay) {
+ public void createBlockDelay(final Block block, final Material mat, final BlockData data, final long delay) {
final BukkitRunnable br = new BukkitRunnable() {
@Override
public void run() {
@@ -356,10 +380,10 @@ public class WaterSpoutWave extends WaterAbility {
}
public void createBlock(final Block block, final Material mat) {
- this.createBlock(block, mat, (byte) 0);
+ this.createBlock(block, mat, mat.createBlockData());
}
- public void createBlock(final Block block, final Material mat, final byte data) {
+ public void createBlock(final Block block, final Material mat, final BlockData data) {
this.affectedBlocks.put(block, new TempBlock(block, mat, data));
}
@@ -398,10 +422,23 @@ public class WaterSpoutWave extends WaterAbility {
if (block.getLocation().distanceSquared(entity.getLocation().getBlock().getLocation()) > radius * radius) {
continue;
}
-
- if (block.getType() == Material.AIR || block.getType() == Material.ICE || this.isWaterbendable(block)) {
+ if (GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
+ continue;
+ }
+ if (entity instanceof Player) {
+ if (Commands.invincible.contains(((Player) entity).getName())) {
+ return;
+ }
+ if (!getConfig().getBoolean("Properties.Water.FreezePlayerHead") && GeneralMethods.playerHeadIsInBlock((Player) entity, block)) {
+ continue;
+ }
+ if (!getConfig().getBoolean("Properties.Water.FreezePlayerFeet") && GeneralMethods.playerFeetIsInBlock((Player) entity, block)) {
+ continue;
+ }
+ }
+ if (ElementalAbility.isAir(block.getType()) || block.getType() == Material.ICE || this.isWaterbendable(block)) {
if (!FROZEN_BLOCKS.containsKey(block)) {
- final TempBlock tblock = new TempBlock(block, Material.ICE, (byte) 1);
+ final TempBlock tblock = new TempBlock(block, Material.ICE);
FROZEN_BLOCKS.put(block, tblock);
if (this.revertIceSphere) {
tblock.setRevertTime(this.revertSphereTime + (new Random().nextInt(1000) - 500));
@@ -607,12 +644,12 @@ public class WaterSpoutWave extends WaterAbility {
this.chargeTime = chargeTime;
}
- public double getFlightTime() {
- return this.flightTime;
+ public double getFlightDuration() {
+ return this.flightDuration;
}
- public void setFlightTime(final double flightTime) {
- this.flightTime = flightTime;
+ public void setFlightDuration(final double flightDuration) {
+ this.flightDuration = flightDuration;
}
public double getWaveRadius() {
diff --git a/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java b/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
index fd66986e..fc203eec 100644
--- a/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
+++ b/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
@@ -1,13 +1,13 @@
package com.projectkorra.projectkorra.waterbending.blood;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.bukkit.Location;
+import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Creature;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
@@ -20,6 +20,7 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.BloodAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
import com.projectkorra.projectkorra.util.DamageHandler;
@@ -30,14 +31,20 @@ public class Bloodbending extends BloodAbility {
private static final Map TARGETED_ENTITIES = new ConcurrentHashMap();
private boolean canOnlyBeUsedAtNight;
+ @Attribute("CanBeUsedOnUndeadMobs")
private boolean canBeUsedOnUndeadMobs;
private boolean onlyUsableDuringMoon;
+ @Attribute("CanBloodbendOtherBloodbenders")
private boolean canBloodbendOtherBloodbenders;
+ @Attribute(Attribute.RANGE)
private int range;
private long time;
- private long holdTime;
+ @Attribute(Attribute.DURATION)
+ private long duration;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
- private double throwFactor;
+ @Attribute(Attribute.KNOCKBACK)
+ private double knockback;
private Entity target;
private Vector vector;
@@ -55,9 +62,9 @@ public class Bloodbending extends BloodAbility {
this.onlyUsableDuringMoon = getConfig().getBoolean("Abilities.Water.Bloodbending.CanOnlyBeUsedDuringFullMoon");
this.canBloodbendOtherBloodbenders = getConfig().getBoolean("Abilities.Water.Bloodbending.CanBloodbendOtherBloodbenders");
this.range = getConfig().getInt("Abilities.Water.Bloodbending.Range");
- this.holdTime = getConfig().getInt("Abilities.Water.Bloodbending.HoldTime");
+ this.duration = getConfig().getInt("Abilities.Water.Bloodbending.Duration");
this.cooldown = getConfig().getInt("Abilities.Water.Bloodbending.Cooldown");
- this.throwFactor = getConfig().getDouble("Abilities.Water.Bloodbending.ThrowFactor");
+ this.knockback = getConfig().getDouble("Abilities.Water.Bloodbending.Knockback");
this.vector = new Vector(0, 0, 0);
if (this.canOnlyBeUsedAtNight && !isNight(player.getWorld()) && !this.bPlayer.canBloodbendAtAnytime()) {
@@ -90,19 +97,15 @@ public class Bloodbending extends BloodAbility {
for (int i = 0; i < this.range; i++) {
final Location location = GeneralMethods.getTargetedLocation(player, i, getTransparentMaterials());
entities = GeneralMethods.getEntitiesAroundPoint(location, 1.7);
- if (entities.contains(player)) {
- entities.remove(player);
- }
- for (final Iterator iterator = entities.iterator(); iterator.hasNext();) {
- if (!(iterator.next() instanceof LivingEntity)) {
- iterator.remove();
- }
- }
- if (entities != null && !entities.isEmpty() && !entities.contains(player)) {
+
+ entities.remove(player);
+ entities.removeIf(e -> !(e instanceof LivingEntity) || e instanceof ArmorStand);
+
+ if (!entities.isEmpty() && !entities.contains(player)) {
break;
}
}
- if (entities == null || entities.isEmpty()) {
+ if (entities.isEmpty()) {
return;
}
this.target = entities.get(0);
@@ -120,7 +123,7 @@ public class Bloodbending extends BloodAbility {
return;
}
}
- } else if (!this.canBeUsedOnUndeadMobs && isUndead(this.target)) {
+ } else if (!this.canBeUsedOnUndeadMobs && GeneralMethods.isUndead(this.target)) {
return;
}
@@ -150,7 +153,7 @@ public class Bloodbending extends BloodAbility {
vector = GeneralMethods.getDirection(location, GeneralMethods.getTargetedLocation(this.player, location.distance(target)));
}
vector.normalize();
- entity.setVelocity(vector.multiply(this.throwFactor));
+ entity.setVelocity(vector.multiply(this.knockback));
new HorizontalVelocityTracker(entity, this.player, 200, this);
}
this.remove();
@@ -164,7 +167,7 @@ public class Bloodbending extends BloodAbility {
if (!this.player.isSneaking()) {
this.remove();
return;
- } else if (this.holdTime > 0 && System.currentTimeMillis() - this.time > this.holdTime) {
+ } else if (this.duration > 0 && System.currentTimeMillis() - this.time > this.duration) {
this.remove();
this.bPlayer.addCooldown(this);
return;
@@ -172,7 +175,7 @@ public class Bloodbending extends BloodAbility {
if (!this.canBeUsedOnUndeadMobs) {
for (final Entity entity : TARGETED_ENTITIES.keySet()) {
- if (isUndead(entity)) {
+ if (GeneralMethods.isUndead(entity)) {
TARGETED_ENTITIES.remove(entity);
}
}
@@ -417,20 +420,20 @@ public class Bloodbending extends BloodAbility {
this.time = time;
}
- public long getHoldTime() {
- return this.holdTime;
+ public long getDuration() {
+ return this.duration;
}
- public void setHoldTime(final long holdTime) {
- this.holdTime = holdTime;
+ public void setDuration(final long duration) {
+ this.duration = duration;
}
- public double getThrowFactor() {
- return this.throwFactor;
+ public double getKnockback() {
+ return this.knockback;
}
- public void setThrowFactor(final double throwFactor) {
- this.throwFactor = throwFactor;
+ public void setKnockback(final double knockback) {
+ this.knockback = knockback;
}
public Entity getTarget() {
diff --git a/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java b/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java
index a219266f..be954f76 100644
--- a/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java
+++ b/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java
@@ -1,7 +1,6 @@
package com.projectkorra.projectkorra.waterbending.combo;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
@@ -10,6 +9,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@@ -19,10 +19,11 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.ComboAbility;
-import com.projectkorra.projectkorra.ability.CoreAbility;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.firebending.combo.FireComboStream;
import com.projectkorra.projectkorra.util.BlockSource;
@@ -40,15 +41,22 @@ public class IceBullet extends IceAbility implements ComboAbility {
private int leftClicks;
private int rightClicks;
+ @Attribute(Attribute.DAMAGE)
private double damage;
+ @Attribute(Attribute.SPEED)
private double speed;
+ @Attribute(Attribute.RANGE)
private double range;
+ @Attribute(Attribute.RADIUS)
private double radius;
private double shootTime;
private double shots;
+ @Attribute("MaxShots")
private double maxShots;
private double animationSpeed;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
+ private long shotcooldown;
private long time;
private String name;
private AbilityState state;
@@ -74,6 +82,7 @@ public class IceBullet extends IceAbility implements ComboAbility {
this.range = getConfig().getDouble("Abilities.Water.IceBullet.Range");
this.radius = getConfig().getDouble("Abilities.Water.IceBullet.Radius");
this.cooldown = getConfig().getLong("Abilities.Water.IceBullet.Cooldown");
+ this.shotcooldown = getConfig().getLong("Abilities.Water.IceBullet.ShotCooldown");
this.shootTime = getConfig().getLong("Abilities.Water.IceBullet.ShootTime");
this.maxShots = getConfig().getInt("Abilities.Water.IceBullet.MaxShots");
this.animationSpeed = getConfig().getDouble("Abilities.Water.IceBullet.AnimationSpeed");
@@ -92,7 +101,7 @@ public class IceBullet extends IceAbility implements ComboAbility {
this.radius *= aug;
if (this.bPlayer.isAvatarState()) {
- this.cooldown = 0;
+ this.cooldown = getConfig().getLong("Abilities.Avatar.AvatarState.Water.IceBullet.Cooldown");
this.damage = AvatarState.getValue(this.damage);
this.range = AvatarState.getValue(this.range);
this.shootTime = AvatarState.getValue(this.shootTime);
@@ -147,34 +156,6 @@ public class IceBullet extends IceAbility implements ComboAbility {
return locations;
}
- public static class IceBulletLeftClick extends IceBullet {
-
- public IceBulletLeftClick(final Player player) {
- super(player);
- this.setName("IceBulletLeftClick");
- }
-
- @Override
- public String getName() {
- return "IceBullet";
- }
-
- }
-
- public static class IceBulletRightClick extends IceBullet {
-
- public IceBulletRightClick(final Player player) {
- super(player);
- this.setName("IceBulletRightClick");
- }
-
- @Override
- public String getName() {
- return "IceBullet";
- }
-
- }
-
public void manageShots() {
for (int i = 0; i < this.tasks.size(); i++) {
if (((FireComboStream) this.tasks.get(i)).isCancelled()) {
@@ -211,18 +192,18 @@ public class IceBullet extends IceAbility implements ComboAbility {
}
public void createBlock(final Block block, final Material mat) {
- this.createBlock(block, mat, (byte) 0);
+ this.createBlock(block, mat, mat.createBlockData());
}
- public void createBlock(final Block block, final Material mat, final byte data) {
+ public void createBlock(final Block block, final Material mat, final BlockData data) {
this.affectedBlocks.put(block, new TempBlock(block, mat, data));
}
public void drawWaterCircle(final Location loc, final double theta, final double increment, final double radius) {
- this.drawWaterCircle(loc, theta, increment, radius, Material.STATIONARY_WATER, (byte) 0);
+ this.drawWaterCircle(loc, theta, increment, radius, Material.WATER, GeneralMethods.getWaterData(0));
}
- public void drawWaterCircle(final Location loc, final double theta, final double increment, final double radius, final Material mat, final byte data) {
+ public void drawWaterCircle(final Location loc, final double theta, final double increment, final double radius, final Material mat, final BlockData data) {
final double rotateSpeed = theta;
this.direction = GeneralMethods.rotateXZ(this.direction, rotateSpeed);
@@ -232,7 +213,7 @@ public class IceBullet extends IceAbility implements ComboAbility {
final Block block = loc.clone().add(dir).getBlock();
this.location = block.getLocation();
- if (block.getType() == Material.AIR && !GeneralMethods.isRegionProtectedFromBuild(this.player, "WaterManipulation", block.getLocation())) {
+ if (ElementalAbility.isAir(block.getType()) && !GeneralMethods.isRegionProtectedFromBuild(this.player, "WaterManipulation", block.getLocation())) {
this.createBlock(block, mat, data);
}
}
@@ -250,30 +231,13 @@ public class IceBullet extends IceAbility implements ComboAbility {
return;
}
- if (this.name.equalsIgnoreCase("IceBulletLeftClick") || this.name.equalsIgnoreCase("IceBulletRightClick")) {
- final Collection bullets = CoreAbility.getAbilities(this.player, IceBullet.class);
- if (bullets.size() == 0) {
- return;
- }
- for (final IceBullet bullet : bullets) {
- if (this.name.equalsIgnoreCase("IceBulletLeftClick")) {
- if (bullet.leftClicks <= bullet.rightClicks) {
- bullet.leftClicks += 1;
- }
- } else if (bullet.leftClicks >= bullet.rightClicks) {
- bullet.rightClicks += 1;
- }
- }
- return;
- }
-
if (this.origin == null) {
- if (this.bPlayer.isOnCooldown("IceBullet") && !this.bPlayer.isAvatarState()) {
+ if (this.bPlayer.isOnCooldown("IceBullet")) {
this.remove();
return;
}
- final Block waterBlock = BlockSource.getWaterSourceBlock(this.player, this.range, ClickType.LEFT_CLICK, true, true, this.bPlayer.canPlantbend());
+ final Block waterBlock = BlockSource.getWaterSourceBlock(this.player, this.range, ClickType.SHIFT_DOWN, true, true, this.bPlayer.canPlantbend());
if (waterBlock == null) {
this.remove();
return;
@@ -283,7 +247,6 @@ public class IceBullet extends IceAbility implements ComboAbility {
this.origin = waterBlock.getLocation();
this.location = this.origin.clone();
this.state = AbilityState.ICE_BULLET_FORMING;
- this.bPlayer.addCooldown("IceBullet", this.cooldown);
this.direction = new Vector(1, 0, 1);
this.waterGrabber = new WaterSourceGrabber(this.player, this.origin.clone());
} else if (this.waterGrabber.getState() == WaterSourceGrabber.AnimationState.FAILED) {
@@ -306,13 +269,21 @@ public class IceBullet extends IceAbility implements ComboAbility {
} else if (timeDiff < 2500 * this.animationSpeed) {
this.revertBlocks();
for (double i = 0; i < this.radius; i++) {
- this.drawWaterCircle(this.player.getEyeLocation().clone().add(0, i, 0), 360, 5, this.radius - i, Material.ICE, (byte) 0);
- this.drawWaterCircle(this.player.getEyeLocation().clone().add(0, -i, 0), 360, 5, this.radius - i, Material.ICE, (byte) 0);
+ this.drawWaterCircle(this.player.getEyeLocation().clone().add(0, i, 0), 360, 5, this.radius - i, Material.ICE, Material.ICE.createBlockData());
+ this.drawWaterCircle(this.player.getEyeLocation().clone().add(0, -i, 0), 360, 5, this.radius - i, Material.ICE, Material.ICE.createBlockData());
}
}
if (timeDiff < this.shootTime) {
- if (this.shots < this.rightClicks + this.leftClicks) {
+ if (this.rightClicks > 0 || this.leftClicks > 0) {
+ if (this.leftClicks > 0) {
+ this.leftClicks = 0;
+ this.bPlayer.addCooldown("IceBullet Left", this.shotcooldown);
+ } else if (this.rightClicks > 0) {
+ this.rightClicks = 0;
+ this.bPlayer.addCooldown("IceBullet Right", this.shotcooldown);
+ }
+
this.shots++;
final Vector vec = this.player.getEyeLocation().getDirection().normalize();
final Location loc = this.player.getEyeLocation().add(vec.clone().multiply(this.radius + 1.3));
@@ -337,6 +308,20 @@ public class IceBullet extends IceAbility implements ComboAbility {
}
}
+ public void doLeftClick() {
+ if (this.bPlayer.isOnCooldown("IceBullet Left")) {
+ return;
+ }
+ this.leftClicks++;
+ }
+
+ public void doRightClick() {
+ if (this.bPlayer.isOnCooldown("IceBullet Right")) {
+ return;
+ }
+ this.rightClicks++;
+ }
+
@Override
public boolean isSneakAbility() {
return true;
@@ -538,9 +523,4 @@ public class IceBullet extends IceAbility implements ComboAbility {
public void setName(final String name) {
this.name = name;
}
-
- @Override
- public String getInstructions() {
- return "WaterBubble (Tap Shift) > IceBlast (Hold Shift) > Wait for ice to Form > Then alternate between Left and Right click with IceBlast";
- }
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java b/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java
index 9a4d245d..ef29923d 100644
--- a/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java
@@ -11,6 +11,7 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;
@@ -19,6 +20,7 @@ public class IceWave extends IceAbility implements ComboAbility {
private static final Map FROZEN_BLOCKS = new ConcurrentHashMap<>();
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private Location origin;
@@ -123,9 +125,4 @@ public class IceWave extends IceAbility implements ComboAbility {
iceWave.add(new AbilityInformation("PhaseChange", ClickType.LEFT_CLICK));
return iceWave;
}
-
- @Override
- public String getInstructions() {
- return "Create a WaterSpout Wave > PhaseChange (Left Click)";
- }
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java b/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java
index d819e221..d9328624 100644
--- a/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java
+++ b/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java
@@ -18,6 +18,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.HealingAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.chiblocking.Smokescreen;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
@@ -25,12 +26,16 @@ import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
public class HealingWaters extends HealingAbility {
// Configurable Variables.
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
+ @Attribute(Attribute.RANGE)
private double range;
private long interval;
+ @Attribute(Attribute.CHARGE_DURATION)
private long chargeTime;
- private int power;
- private int potDuration;
+ @Attribute("PotionPotency")
+ private int potionPotency;
+ @Attribute(Attribute.DURATION)
private long duration;
private boolean enableParticles;
@@ -76,8 +81,7 @@ public class HealingWaters extends HealingAbility {
this.range = getConfig().getDouble("Abilities.Water.HealingWaters.Range");
this.interval = getConfig().getLong("Abilities.Water.HealingWaters.Interval");
this.chargeTime = getConfig().getLong("Abilities.Water.HealingWaters.ChargeTime");
- this.power = getConfig().getInt("Abilities.Water.HealingWaters.Power");
- this.potDuration = getConfig().getInt("Abilities.Water.HealingWaters.HealingDuration");
+ this.potionPotency = getConfig().getInt("Abilities.Water.HealingWaters.PotionPotency");
this.duration = getConfig().getLong("Abilities.Water.HealingWaters.Duration");
this.enableParticles = getConfig().getBoolean("Abilities.Water.HealingWaters.EnableParticles");
this.hex = "00ffff";
@@ -122,7 +126,7 @@ public class HealingWaters extends HealingAbility {
WaterReturn.emptyWaterBottle(this.player);
}
} else {
- GeneralMethods.displayColoredParticle(this.origin, this.hex);
+ GeneralMethods.displayColoredParticle(this.hex, this.origin);
}
// If the ability is charged, try healing.
@@ -210,7 +214,7 @@ public class HealingWaters extends HealingAbility {
private void applyHealing(final Player player) {
if (!GeneralMethods.isRegionProtectedFromBuild(player, "HealingWaters", player.getLocation())) {
- player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, this.potDuration, this.power));
+ player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 30, this.potionPotency));
AirAbility.breakBreathbendingHold(player);
this.healing = true;
this.healingSelf = true;
@@ -219,7 +223,7 @@ public class HealingWaters extends HealingAbility {
private void applyHealing(final LivingEntity livingEntity) {
if (livingEntity.getHealth() < livingEntity.getMaxHealth()) {
- livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, this.potDuration, this.power));
+ livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 30, this.potionPotency));
AirAbility.breakBreathbendingHold(livingEntity);
this.healing = true;
this.healingSelf = false;
@@ -238,7 +242,7 @@ public class HealingWaters extends HealingAbility {
final double angle = this.pstage * increment;
final double x = centre.getX() + (0.75 * Math.cos(angle));
final double z = centre.getZ() + (0.75 * Math.sin(angle));
- GeneralMethods.displayColoredParticle(new Location(centre.getWorld(), x, centre.getY(), z), this.hex);
+ GeneralMethods.displayColoredParticle(this.hex, new Location(centre.getWorld(), x, centre.getY(), z));
if (this.pstage >= 36) {
this.pstage = 0;
@@ -259,8 +263,8 @@ public class HealingWaters extends HealingAbility {
final double x2 = centre.getX() + (0.75 * Math.cos(angle2));
final double z2 = centre.getZ() + (0.75 * Math.sin(angle2));
- GeneralMethods.displayColoredParticle(new Location(centre.getWorld(), x1, centre.getY() + (0.75 * Math.cos(angle1)), z1), this.hex);
- GeneralMethods.displayColoredParticle(new Location(centre.getWorld(), x2, centre.getY() + (0.75 * -Math.cos(angle2)), z2), this.hex);
+ GeneralMethods.displayColoredParticle(this.hex, new Location(centre.getWorld(), x1, centre.getY() + (0.75 * Math.cos(angle1)), z1));
+ GeneralMethods.displayColoredParticle(this.hex, new Location(centre.getWorld(), x2, centre.getY() + (0.75 * -Math.cos(angle2)), z2));
if (this.tstage1 >= 36) {
this.tstage1 = 0;
@@ -295,7 +299,7 @@ public class HealingWaters extends HealingAbility {
}
}
- GeneralMethods.displayColoredParticle(this.location, this.hex);
+ GeneralMethods.displayColoredParticle(this.hex, this.location);
}
private void fillBottle() {
@@ -304,12 +308,14 @@ public class HealingWaters extends HealingAbility {
final int index = inventory.first(Material.GLASS_BOTTLE);
final ItemStack item = inventory.getItem(index);
+ final ItemStack water = WaterReturn.waterBottleItem();
+
if (item.getAmount() == 1) {
- inventory.setItem(index, new ItemStack(Material.POTION));
+ inventory.setItem(index, water);
} else {
item.setAmount(item.getAmount() - 1);
inventory.setItem(index, item);
- final HashMap leftover = inventory.addItem(new ItemStack(Material.POTION));
+ final HashMap leftover = inventory.addItem(water);
for (final int left : leftover.keySet()) {
this.player.getWorld().dropItemNaturally(this.player.getLocation(), leftover.get(left));
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java
index 20278159..cefee2f2 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java
@@ -10,6 +10,7 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
@@ -18,6 +19,7 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.IceAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
@@ -33,16 +35,21 @@ public class IceBlast extends IceAbility {
private boolean progressing;
private byte data;
private long time;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private long interval;
+ @Attribute(Attribute.RANGE)
private double range;
+ @Attribute(Attribute.DAMAGE)
private double damage;
private double collisionRadius;
+ @Attribute("Deflect" + Attribute.RANGE)
private double deflectRange;
private Block sourceBlock;
private Location location;
private Location firstDestination;
private Location destination;
+ private boolean allowSnow;
public TempBlock source;
public IceBlast(final Player player) {
@@ -55,6 +62,7 @@ public class IceBlast extends IceAbility {
this.range = getConfig().getDouble("Abilities.Water.IceBlast.Range");
this.damage = getConfig().getInt("Abilities.Water.IceBlast.Damage");
this.cooldown = getConfig().getInt("Abilities.Water.IceBlast.Cooldown");
+ this.allowSnow = getConfig().getBoolean("Abilities.Water.IceBlast.AllowSnow");
this.damage = getNightFactor(this.damage, player.getWorld());
@@ -63,14 +71,14 @@ public class IceBlast extends IceAbility {
}
if (this.bPlayer.isAvatarState()) {
- this.cooldown = 0;
+ this.cooldown = getConfig().getLong("Abilities.Avatar.AvatarState.Water.IceBlast.Cooldown");
this.range = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.IceBlast.Range");
this.damage = getConfig().getInt("Abilities.Avatar.AvatarState.Water.IceBlast.Damage");
}
block(player);
this.range = getNightFactor(this.range, player.getWorld());
- final Block sourceBlock = BlockSource.getWaterSourceBlock(player, this.range, ClickType.SHIFT_DOWN, false, true, false, false, false);
+ final Block sourceBlock = BlockSource.getWaterSourceBlock(player, this.range, ClickType.SHIFT_DOWN, false, true, false, this.allowSnow, false);
final IceBlast oldAbil = getAbility(player, IceBlast.class);
if (oldAbil != null) {
oldAbil.setSourceBlock(sourceBlock == null ? oldAbil.getSourceBlock() : sourceBlock);
@@ -174,7 +182,7 @@ public class IceBlast extends IceAbility {
AirAbility.breakBreathbendingHold(entity);
for (int x = 0; x < 30; x++) {
- 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)), .3f, this.location, 255.0);
+ ParticleEffect.ITEM_CRACK.display(this.location, 5, Math.random() / 4, Math.random() / 4, Math.random() / 4, new ItemStack(Material.ICE));
}
}
@@ -208,11 +216,11 @@ public class IceBlast extends IceAbility {
this.prepared = false;
if (TempBlock.isTempBlock(this.sourceBlock)) {
- TempBlock.get(this.sourceBlock).setType(Material.PACKED_ICE, this.data);
+ TempBlock.get(this.sourceBlock).setType(Material.PACKED_ICE);
this.source = TempBlock.get(this.sourceBlock);
} else {
- new TempBlock(this.sourceBlock, Material.AIR, (byte) 0);
- this.source = new TempBlock(this.sourceBlock, Material.PACKED_ICE, this.data);
+ new TempBlock(this.sourceBlock, Material.AIR);
+ this.source = new TempBlock(this.sourceBlock, Material.PACKED_ICE);
}
}
@@ -302,15 +310,15 @@ public class IceBlast extends IceAbility {
this.sourceBlock = block;
if (TempBlock.isTempBlock(this.sourceBlock)) {
- TempBlock.get(this.sourceBlock).setType(Material.PACKED_ICE, this.data);
+ TempBlock.get(this.sourceBlock).setType(Material.PACKED_ICE);
this.source = TempBlock.get(this.sourceBlock);
} else {
- this.source = new TempBlock(this.sourceBlock, Material.PACKED_ICE, this.data);
+ this.source = new TempBlock(this.sourceBlock, Material.PACKED_ICE);
}
for (int x = 0; x < 10; x++) {
- 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)), .5f, this.location, 255.0);
- ParticleEffect.SNOW_SHOVEL.display(this.location, (float) (Math.random() - 0.5), (float) (Math.random() - 0.5), (float) (Math.random() - 0.5), 0, 5);
+ ParticleEffect.ITEM_CRACK.display(this.location, 5, Math.random() / 2, Math.random() / 2, Math.random() / 2, new ItemStack(Material.ICE));
+ ParticleEffect.SNOW_SHOVEL.display(this.location, 5, Math.random() / 2, Math.random() / 2, Math.random() / 2, 0);
}
if ((new Random()).nextInt(4) == 0) {
playIcebendingSound(this.location);
@@ -323,8 +331,8 @@ public class IceBlast extends IceAbility {
public void breakParticles(final int amount) {
for (int x = 0; x < amount; x++) {
- 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, this.location, 255.0);
- ParticleEffect.SNOW_SHOVEL.display(this.location, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0, 2);
+ ParticleEffect.ITEM_CRACK.display(this.location, 2, Math.random(), Math.random(), Math.random(), new ItemStack(Material.ICE));
+ ParticleEffect.SNOW_SHOVEL.display(this.location, 2, Math.random(), Math.random(), Math.random(), 0);
}
this.location.getWorld().playSound(this.location, Sound.BLOCK_GLASS_BREAK, 5, 1.3f);
}
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java
index 74afcecf..29eea0e4 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java
@@ -5,10 +5,10 @@ import java.util.Random;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
-import org.bukkit.material.MaterialData;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
@@ -17,6 +17,7 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.IceAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
@@ -29,21 +30,29 @@ public class IceSpikeBlast extends IceAbility {
private boolean settingUp;
private boolean progressing;
private byte data;
- private int slowPower;
+ @Attribute("SlowPotency")
+ private int slowPotency;
+ @Attribute("Slow" + Attribute.DURATION)
private int slowDuration;
private long time;
private long interval;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
+ @Attribute("Slow" + Attribute.COOLDOWN)
private long slowCooldown;
+ @Attribute(Attribute.RANGE)
private double range;
+ @Attribute(Attribute.DAMAGE)
private double damage;
private double collisionRadius;
+ @Attribute("Deflect" + Attribute.RANGE)
private double deflectRange;
private Block sourceBlock;
private Location location;
private Location firstDestination;
private Location destination;
private TempBlock source;
+ private Material sourceType;
public IceSpikeBlast(final Player player) {
super(player);
@@ -60,7 +69,7 @@ public class IceSpikeBlast extends IceAbility {
this.range = getConfig().getDouble("Abilities.Water.IceSpike.Blast.Range");
this.damage = getConfig().getDouble("Abilities.Water.IceSpike.Blast.Damage");
this.cooldown = getConfig().getLong("Abilities.Water.IceSpike.Blast.Cooldown");
- this.slowPower = getConfig().getInt("Abilities.Water.IceSpike.Blast.SlowPower");
+ this.slowPotency = getConfig().getInt("Abilities.Water.IceSpike.Blast.SlowPotency");
this.slowDuration = getConfig().getInt("Abilities.Water.IceSpike.Blast.SlowDuration");
if (!this.bPlayer.canBend(this) || !this.bPlayer.canIcebend()) {
@@ -72,14 +81,14 @@ public class IceSpikeBlast extends IceAbility {
this.slowCooldown = 0;
this.range = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.Range");
this.damage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.Damage");
- this.slowPower = getConfig().getInt("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.SlowPower");
+ this.slowPotency = getConfig().getInt("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.SlowPotency");
this.slowDuration = getConfig().getInt("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.SlowDuration");
}
block(player);
this.range = this.getNightFactor(this.range);
this.damage = this.getNightFactor(this.damage);
- this.slowPower = (int) this.getNightFactor(this.slowPower);
+ this.slowPotency = (int) this.getNightFactor(this.slowPotency);
this.sourceBlock = getWaterSourceBlock(player, this.range, this.bPlayer.canPlantbend());
if (this.sourceBlock == null) {
this.sourceBlock = getIceSourceBlock(player, this.range);
@@ -101,13 +110,13 @@ public class IceSpikeBlast extends IceAbility {
return;
}
if (targetBPlayer.canBeSlowed()) {
- final PotionEffect effect = new PotionEffect(PotionEffectType.SLOW, this.slowDuration, this.slowPower);
+ final PotionEffect effect = new PotionEffect(PotionEffectType.SLOW, this.slowDuration, this.slowPotency);
new TempPotionEffect(entity, effect);
targetBPlayer.slow(this.slowCooldown);
DamageHandler.damageEntity(entity, this.damage, this);
}
} else {
- final PotionEffect effect = new PotionEffect(PotionEffectType.SLOW, this.slowDuration, this.slowPower);
+ final PotionEffect effect = new PotionEffect(PotionEffectType.SLOW, this.slowDuration, this.slowPotency);
new TempPotionEffect(entity, effect);
DamageHandler.damageEntity(entity, this.damage, this);
}
@@ -122,6 +131,11 @@ public class IceSpikeBlast extends IceAbility {
}
this.sourceBlock = block;
+ if (!isIce(block)) {
+ this.sourceType = Material.ICE;
+ } else {
+ this.sourceType = block.getType();
+ }
this.location = this.sourceBlock.getLocation();
this.prepared = true;
this.start();
@@ -175,8 +189,6 @@ public class IceSpikeBlast extends IceAbility {
return;
}
- this.source = null;
-
if (isTransparent(this.player, block) && !block.isLiquid()) {
GeneralMethods.breakBlock(block);
} else if (!isWater(block)) {
@@ -191,7 +203,7 @@ public class IceSpikeBlast extends IceAbility {
return;
}
- for (final Entity entity : GeneralMethods.getEntitiesAroundPoint(this.location, this.collisionRadius)) {
+ for (final Entity entity : GeneralMethods.getEntitiesAroundPoint(this.location, this.collisionRadius + 0.5)) {
if (entity.getEntityId() != this.player.getEntityId() && entity instanceof LivingEntity) {
this.affect((LivingEntity) entity);
this.progressing = false;
@@ -209,8 +221,8 @@ public class IceSpikeBlast extends IceAbility {
}
this.sourceBlock = block;
- this.source = new TempBlock(this.sourceBlock, Material.ICE, this.data);
- this.source.setRevertTime(140);
+ this.source = new TempBlock(this.sourceBlock, this.sourceType);
+ this.source.setRevertTime(130);
} else if (this.prepared) {
if (this.sourceBlock != null) {
playFocusWaterEffect(this.sourceBlock);
@@ -226,12 +238,10 @@ public class IceSpikeBlast extends IceAbility {
@Override
public void remove() {
super.remove();
- if (this.progressing) {
- if (this.source != null) {
- this.source.revertBlock();
- }
- this.progressing = false;
+ if (this.source != null) {
+ this.source.revertBlock();
}
+ this.progressing = false;
}
private void returnWater() {
@@ -245,9 +255,9 @@ public class IceSpikeBlast extends IceAbility {
final LivingEntity target = (LivingEntity) GeneralMethods.getTargetedEntity(this.player, this.range);
if (target == null) {
- this.destination = GeneralMethods.getTargetedLocation(this.player, this.range, getTransparentMaterials());
+ this.destination = GeneralMethods.getTargetedLocation(this.player, this.range, true, getTransparentMaterials());
} else {
- this.destination = target.getEyeLocation();
+ this.destination = target.getLocation();
}
if (this.sourceBlock == null) {
@@ -273,8 +283,16 @@ public class IceSpikeBlast extends IceAbility {
if (isPlant(this.sourceBlock) || isSnow(this.sourceBlock)) {
new PlantRegrowth(this.player, this.sourceBlock);
this.sourceBlock.setType(Material.AIR);
+ } else if (isWater(this.sourceBlock)) {
+ if (!GeneralMethods.isAdjacentToThreeOrMoreSources(this.sourceBlock)) {
+ this.sourceBlock.setType(Material.AIR);
+ }
+ } else if (TempBlock.isTempBlock(this.sourceBlock)) {
+ final TempBlock tb = TempBlock.get(this.sourceBlock);
+ if (isBendableWaterTempBlock(tb)) {
+ tb.revertBlock();
+ }
}
-
}
public static void activate(final Player player) {
@@ -358,7 +376,7 @@ public class IceSpikeBlast extends IceAbility {
Location loc;
final Entity target = GeneralMethods.getTargetedEntity(player, iceSpike.range);
if (target == null) {
- loc = GeneralMethods.getTargetedLocation(player, iceSpike.range);
+ loc = GeneralMethods.getTargetedLocation(player, iceSpike.range, true);
} else {
loc = ((LivingEntity) target).getEyeLocation();
}
@@ -390,9 +408,9 @@ public class IceSpikeBlast extends IceAbility {
return;
}
- final MaterialData data = block.getState().getData();
+ final BlockState state = block.getState();
block.setType(Material.WATER);
- block.setData((byte) 0);
+ block.setBlockData(GeneralMethods.getWaterData(0));
final IceSpikeBlast iceSpike = new IceSpikeBlast(player);
iceSpike.throwIce();
iceSpike.sourceBlock = null;
@@ -400,8 +418,8 @@ public class IceSpikeBlast extends IceAbility {
if (iceSpike.progressing) {
WaterReturn.emptyWaterBottle(player);
}
- block.setType(data.getItemType());
- block.setData(data.getData());
+ block.setType(state.getType());
+ block.setBlockData(state.getBlockData());
}
}
@@ -479,12 +497,12 @@ public class IceSpikeBlast extends IceAbility {
this.data = data;
}
- public int getSlowPower() {
- return this.slowPower;
+ public int getSlowPotency() {
+ return this.slowPotency;
}
- public void setSlowPower(final int slowPower) {
- this.slowPower = slowPower;
+ public void setSlowPotency(final int slowPotency) {
+ this.slowPotency = slowPotency;
}
public int getSlowDuration() {
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
index 4ba2a257..55a497fc 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
@@ -18,8 +18,10 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
@@ -29,18 +31,27 @@ public class IceSpikePillar extends IceAbility {
/** The list of blocks IceSpike uses */
private final Map ice_blocks = new HashMap();
+ @Attribute(Attribute.HEIGHT)
private int height;
private int progress;
+ @Attribute("SlowPotency")
private int slowPower;
+ @Attribute("Slow" + Attribute.DURATION)
private int slowDuration;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
private long time;
private long removeTimestamp;
- private long removeTimer;
+ @Attribute(Attribute.DURATION)
+ private long duration;
private long interval;
+ @Attribute("Slow" + Attribute.COOLDOWN)
private long slowCooldown;
+ @Attribute(Attribute.DAMAGE)
private double damage;
+ @Attribute(Attribute.RANGE)
private double range;
+ @Attribute(Attribute.SPEED)
private double speed;
private Block source_block; // The block clicked on.
private Block base_block; // The block at the bottom of the pillar.
@@ -86,8 +97,7 @@ public class IceSpikePillar extends IceAbility {
}
this.origin = this.source_block.getLocation();
this.location = this.origin.clone();
- }
- catch (final IllegalStateException e) {
+ } catch (final IllegalStateException e) {
return;
}
@@ -174,7 +184,7 @@ public class IceSpikePillar extends IceAbility {
Block b;
for (int i = 1; i <= this.height; i++) {
b = this.source_block.getWorld().getBlockAt(this.location.clone().add(this.direction.clone().multiply(i)));
- if (b.getType() != Material.AIR) {
+ if (!ElementalAbility.isAir(b.getType())) {
return false;
}
@@ -194,7 +204,7 @@ public class IceSpikePillar extends IceAbility {
this.removeTimestamp = System.currentTimeMillis();
} else {
// If it's time to remove.
- if (this.removeTimestamp != 0 && this.removeTimestamp + this.removeTimer <= System.currentTimeMillis()) {
+ if (this.removeTimestamp != 0 && this.removeTimestamp + this.duration <= System.currentTimeMillis()) {
if (!this.sinkPillar()) {
this.remove();
return;
@@ -225,7 +235,7 @@ public class IceSpikePillar extends IceAbility {
}
}
- final TempBlock b = new TempBlock(affectedBlock, Material.ICE, (byte) 0);
+ final TempBlock b = new TempBlock(affectedBlock, Material.ICE);
this.ice_blocks.put(affectedBlock, b);
if (!this.inField || new Random().nextInt((int) ((this.height + 1) * 1.5)) == 0) {
@@ -344,12 +354,12 @@ public class IceSpikePillar extends IceAbility {
this.removeTimestamp = removeTimestamp;
}
- public long getRemoveTimer() {
- return this.removeTimer;
+ public long getDuration() {
+ return this.duration;
}
- public void setRemoveTimer(final long removeTimer) {
- this.removeTimer = removeTimer;
+ public void setDuration(final long duration) {
+ this.duration = duration;
}
public long getInterval() {
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java
index 62275845..bed947b3 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java
@@ -14,16 +14,24 @@ import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
+import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
+import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.TempBlock;
public class IceSpikePillarField extends IceAbility {
+ @Attribute(Attribute.DAMAGE)
private double damage;
+ @Attribute(Attribute.RADIUS)
private double radius;
+ @Attribute("NumberOfSpikes")
private int numberOfSpikes;
+ @Attribute(Attribute.COOLDOWN)
private long cooldown;
+ @Attribute(Attribute.KNOCKUP)
+ private double knockup;
private Vector thrownForce;
public IceSpikePillarField(final Player player) {
@@ -36,28 +44,37 @@ public class IceSpikePillarField extends IceAbility {
this.damage = getConfig().getDouble("Abilities.Water.IceSpike.Field.Damage");
this.radius = getConfig().getDouble("Abilities.Water.IceSpike.Field.Radius");
this.cooldown = getConfig().getLong("Abilities.Water.IceSpike.Field.Cooldown");
- this.thrownForce = new Vector(0, getConfig().getDouble("Abilities.Water.IceSpike.Field.Push"), 0);
+ this.knockup = getConfig().getDouble("Abilities.Water.IceSpike.Field.Knockup");
if (this.bPlayer.isAvatarState()) {
this.damage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.IceSpike.Field.Damage");
this.radius = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.IceSpike.Field.Radius");
- this.thrownForce = new Vector(0, getConfig().getDouble("Abilities.Avatar.AvatarState.Water.IceSpike.Field.Push"), 0);
}
- this.numberOfSpikes = (int) (((this.radius * 2) * (this.radius * 2)) / 16);
+ this.numberOfSpikes = (int) (((this.radius) * (this.radius)) / 4);
+ this.start();
+ }
+ @Override
+ public String getName() {
+ return "IceSpike";
+ }
+
+ @Override
+ public void progress() {
+ this.thrownForce = new Vector(0, this.knockup, 0);
final Random random = new Random();
- final int locX = player.getLocation().getBlockX();
- final int locY = player.getLocation().getBlockY();
- final int locZ = player.getLocation().getBlockZ();
+ final int locX = this.player.getLocation().getBlockX();
+ final int locY = this.player.getLocation().getBlockY();
+ final int locZ = this.player.getLocation().getBlockZ();
final List iceBlocks = new ArrayList();
for (int x = (int) -(this.radius - 1); x <= (this.radius - 1); x++) {
for (int z = (int) -(this.radius - 1); z <= (this.radius - 1); z++) {
for (int y = -1; y <= 1; y++) {
- final Block testBlock = player.getWorld().getBlockAt(locX + x, locY + y, locZ + z);
+ final Block testBlock = this.player.getWorld().getBlockAt(locX + x, locY + y, locZ + z);
- if (WaterAbility.isIcebendable(player, testBlock.getType(), false) && testBlock.getRelative(BlockFace.UP).getType() == Material.AIR && !(testBlock.getX() == player.getEyeLocation().getBlock().getX() && testBlock.getZ() == player.getEyeLocation().getBlock().getZ()) || (TempBlock.isTempBlock(testBlock) && WaterAbility.isBendableWaterTempBlock(testBlock))) {
+ if (((WaterAbility.isIcebendable(this.player, testBlock.getType(), false) && !TempBlock.isTempBlock(testBlock)) || (TempBlock.isTempBlock(testBlock) && WaterAbility.isBendableWaterTempBlock(testBlock))) && ElementalAbility.isAir(testBlock.getRelative(BlockFace.UP).getType()) && !(testBlock.getX() == this.player.getEyeLocation().getBlock().getX() && testBlock.getZ() == this.player.getEyeLocation().getBlock().getZ())) {
iceBlocks.add(testBlock);
for (int i = 0; i < iceBlocks.size() / 2 + 1; i++) {
final Random rand = new Random();
@@ -70,16 +87,18 @@ public class IceSpikePillarField extends IceAbility {
}
}
- final List entities = GeneralMethods.getEntitiesAroundPoint(player.getLocation(), this.radius);
- for (int i = 0; i < this.numberOfSpikes; i++) {
+ int pillars;
+
+ final List