diff --git a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilMath.java b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilMath.java
index 1b3b40835..5e37e0ac5 100644
--- a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilMath.java
+++ b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilMath.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
@@ -14,8 +13,6 @@ import org.bukkit.util.Vector;
public class UtilMath
{
- public static final double TAU = Math.PI * 2D;
-
public static double trim(int degree, double d)
{
String format = "#.#";
@@ -335,119 +332,4 @@ public class UtilMath
return min;
}
-
- /**
- * Creates an array of points, arranged in a circle normal to a vector.
- *
- * @param center The center of the circle.
- * @param normal A vector normal to the circle.
- * @param radius The radius of the circle.
- * @param points How many points to make up the circle.
- *
- * @return An array of points of the form double[point #][x=0, y=1, z=3].
- */
- public static double[][] normalCircle(Location center, Vector normal, double radius, int points)
- {
- return normalCircle(center.toVector(), normal, radius, points);
- }
-
- /**
- * Creates an array of points, arranged in a circle normal to a vector.
- *
- * @param center The center of the circle.
- * @param normal A vector normal to the circle.
- * @param radius The radius of the circle.
- * @param points How many points to make up the circle.
- *
- * @return An array of points of the form double[point #][x=0, y=1, z=3].
- */
- public static double[][] normalCircle(Vector center, Vector normal, double radius, int points)
- {
- Vector n = normal.clone().normalize();
- Vector a = n.clone().add(new Vector(1, 1, 1)).crossProduct(n).normalize();
- Vector b = n.getCrossProduct(a).normalize();
-
- double[][] data = new double[points][3];
-
- double interval = TAU / points;
- double theta = 0;
-
- for (int i = 0; i < points; i++)
- {
- data[i][0] = center.getX() + (radius * ((Math.cos(theta) * a.getX()) + (Math.sin(theta) * b.getX())));
- data[i][1] = center.getY() + (radius * ((Math.cos(theta) * a.getY()) + (Math.sin(theta) * b.getY())));
- data[i][2] = center.getZ() + (radius * ((Math.cos(theta) * a.getZ()) + (Math.sin(theta) * b.getZ())));
- theta += interval;
- }
-
- return data;
- }
-
- /**
- * Slightly randomize a location with a standard deviation of one.
- *
- * @param location The location to randomize.
- *
- * @return The original location, now gaussian-randomized.
- */
- public static Location gauss(Location location)
- {
- return gauss(location, 1, 1, 1);
- }
-
- /**
- * Slightly randomize a vector with a standard deviation of one.
- *
- * @param vector The location to randomize.
- *
- * @return The randomized vector, now gaussian-randomized.
- */
- public static Vector gauss(Vector vector)
- {
- return gauss(vector, 1, 1, 1);
- }
-
- /**
- * Slightly randomize a location with a standard deviation of one.
- *
- * This method only accepts positive values for all of its arguments.
- *
- * A good parameter set for small offsets is (loc, 10, 10, 10).
- *
- * @param location The location to randomize.
- * @param x A granularity control for the x-axis, higher numbers = less randomness
- * @param y A granularity control for the y-axis, higher numbers = less randomness
- * @param z A granularity control for the z-axis, higher numbers = less randomness
- *
- * @return The original location, now gaussian-randomized
- */
- public static Location gauss(Location location, double x, double y, double z)
- {
- return location.clone().add(
- x <= 0 ? 0 : (ThreadLocalRandom.current().nextGaussian() / x),
- y <= 0 ? 0 : (ThreadLocalRandom.current().nextGaussian() / y),
- z <= 0 ? 0 : (ThreadLocalRandom.current().nextGaussian() / z));
- }
-
- /**
- * Slightly randomize a vector with a standard deviation of one.
- *
- * This method only accepts positive values for all of its arguments.
- *
- * A good parameter set for small offsets is (loc, 10, 10, 10).
- *
- * @param vector The location to randomize.
- * @param x A granularity control for the x-axis, higher numbers = less randomness
- * @param y A granularity control for the y-axis, higher numbers = less randomness
- * @param z A granularity control for the z-axis, higher numbers = less randomness
- *
- * @return The randomized vector, now gaussian-randomized
- */
- public static Vector gauss(Vector vector, double x, double y, double z)
- {
- return vector.clone().add(new Vector(
- x <= 0 ? 0 : (ThreadLocalRandom.current().nextGaussian() / x),
- y <= 0 ? 0 : (ThreadLocalRandom.current().nextGaussian() / y),
- z <= 0 ? 0 : (ThreadLocalRandom.current().nextGaussian() / z)));
- }
}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
index 4026dad3f..3c9a78a56 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
@@ -166,40 +166,7 @@ public class ShapeWings extends ShapeGrid implements CosmeticShape
"0$#######$0",
"$#########$"
};
-
- public static final String[] MAPLE_LEAF = new String[]
- {
- "000000000000000000000000000$000000000000000000000000000",
- "00000000000000000000000000$$$00000000000000000000000000",
- "0000000000000000000000000$$#$$0000000000000000000000000",
- "000000000000000000000000$$###$$000000000000000000000000",
- "00000000000000000000000$$#####$$00000000000000000000000",
- "0000000000000000$$$000$$#######$$000$$$0000000000000000",
- "0000000000000000$#$$$$$#########$$$$$#$0000000000000000",
- "0000000000000000$$###################$$0000000000000000",
- "00000000000000000$###################$00000000000000000",
- "00000000000$$0000$$#################$$0000$$00000000000",
- "0$$$000000$$$$$000$#################$000$$$$$000000$$$0",
- "00$$$$$$$$$###$$$0$$###############$$0$$$###$$$$$$$$$00",
- "00$$############$$$$###############$$$$############$$00",
- "000$$#############$$###############$$#############$$000",
- "0000$$###########################################$$0000",
- "00$$$#############################################$$$00",
- "$$$#################################################$$$",
- "00$$$$###########################################$$$$00",
- "00000$$$#######################################$$$00000",
- "00000000$$$$###############################$$$$00000000",
- "00000000000$$$###########################$$$00000000000",
- "0000000000000$$#########################$$0000000000000",
- "0000000000000$$#########################$$0000000000000",
- "0000000000000$##$$$$$$$$$$$#$$$$$$$$$$$##$0000000000000",
- "000000000000$$$$$000000000$#$000000000$$$$$000000000000",
- "00000000000000000000000000$#$00000000000000000000000000",
- "00000000000000000000000000$#$00000000000000000000000000",
- "00000000000000000000000000$#$00000000000000000000000000",
- "00000000000000000000000000$#$00000000000000000000000000",
- "00000000000000000000000000$$$00000000000000000000000000"
- };
+
/**
* Default rotation to give the wings a little tilt when displayed on players for instance
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/skin/SkinData.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/skin/SkinData.java
index 6b7b7a675..f803154ce 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/skin/SkinData.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/skin/SkinData.java
@@ -78,8 +78,6 @@ public class SkinData
public static final SkinData LARISSA = new SkinData("eyJ0aW1lc3RhbXAiOjE0OTc0NjE0MTUxMzQsInByb2ZpbGVJZCI6Ijg1MmE4YWNmNzMzNzQwZDc5OWVjYjA4ZmQ5OTY1MGI1IiwicHJvZmlsZU5hbWUiOiJLaW5nQ3JhenlfIiwic2lnbmF0dXJlUmVxdWlyZWQiOnRydWUsInRleHR1cmVzIjp7IlNLSU4iOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jYThjNDRhOWVmZTY3NzExMDYzMjM5ODEwNDRmOTdjYmM1OWJmZmRlOGI1ODdlMGQzMWE4N2ViMDhhMmExZiJ9fX0=", "Lyac51CrnMK/CI2dWgGQLowAm/ZnQMpf0Ict/gqVrUgJVlGWDIVG77Rd1JyMQDEeESvTmoyivH+usiO0ePW95qjisqT3R43YEmLi85CqctGYqLKeSYpGYwYRz8Euw57LwJAALKOMLhVc2s4h2Or9nTecunG8KSmkCuZc4H1qh3frU+ltuV4HLqgdFUULbIHTggyvqiINov2tBqkkXeEjT7sOcTJCJNgNYU2O7//qg5kJmhso2CKHlRLpmy9LsaUK/Z+BzUmoRbwQgSwr3mz7dFAdlVWWKvKNcgX3nt1et0DIig3JKYmrnQX2Fprg+kWcr3nuizzLgjVwAlADC48P3DN0s/VBty2AYoWie16VNPIM+CV4BF2JRQ34GxZ8XceXbCKURrOjoCBgLGHvIhRW35eicoh26xp3/mwLvk5anPi5StJ/qEuzWJALeWcNbLsnt21m2MZp9h/MxaY6ftWOTzjTr5CYVd/teJyscMnGK4+lcV1dlt12lhbDMv6I+iz8iG9NIzuW5OvGkax90dA/Gq+Cd9FXVThPY4ufxWttHcTqgPB64GfMn6rywRm1B0eO1pJpYc/KlJZlW/PuaO8L1assyJs5KkOypBSy3zc6TO6pzgeOZv+VpQfA/UWpogv6ofmTpgdtwpjLFGSzIKTDXvF6FftALKVlYypG0fYbssA=");
public static final SkinData ROWENA = new SkinData("eyJ0aW1lc3RhbXAiOjE0OTc0Njk1MTcxOTgsInByb2ZpbGVJZCI6Ijg1MmE4YWNmNzMzNzQwZDc5OWVjYjA4ZmQ5OTY1MGI1IiwicHJvZmlsZU5hbWUiOiJLaW5nQ3JhenlfIiwic2lnbmF0dXJlUmVxdWlyZWQiOnRydWUsInRleHR1cmVzIjp7IlNLSU4iOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jNDY1OGExODY4YzNhNjhhZWVhZmZkOTUxZDQyYmZkN2QxYTRjNGZjNDJjZDI2YTlmYzhkNTNmOTkxMTM1ZCJ9fX0=", "OqXMyH9SMmQ/Pwmb21In29YnCxbsN6yqUxfudN6KNgDwRUK6y072XhW6TIoTh9JQLAUKftpeVB53tk0LxHIxnsuBMrIHvETPDQFysIc/6xq3ABogs+zqFzcp5jk6S73HiD78JxLq5pzfUzhgDPMPuZP5Q/u2q1rYbe6B9lVEJ5sUcxBLUTossgucoR4qXYAlWVQdHRhq85Ol8a+OU7ruw3HackNGto6wt6u2MigCtiHVTt9XhJ/AJE4ScodQ3XwW4L6urpl/lV2OMCsr3mCjjjEz2EMhDbCWxrAorQ9aPpMbDkHBS+4TC1tbMGUlKhj5n+EZBYVaeLr4NGPACPSdT35p/2Zra49+DXn9Xn+681yNEB0ghTdsnsgwXg76+HVPHPqRHQMuTBQGQyGZaaTX/zE0tFjH+osMElLdb8dmz3dC7kQA4A13B2phj3YbMSF1FoU4GvnPKIQn6JIuEd6hd+pRLUW7Y+mgYIHHX1FT0ihrXAyVO6lQQ6rs92gSQr7sxC7tnhPSMFcmh7OcJYcbRpn97GMubthPLanOhVy7CKqjmwIkEVtYgP28idigKwNJ+sJuUONrOu7nMKl1UTD5EEapOacc/np6UhdSw8yW+LnWD/x9ueYz9ksnyRrJgcOa41izo/WCbjPK/j3JVezr9Q3x1yveWuFmdl7CGYdXngw=");
public static final SkinData BIFF = new SkinData("eyJ0aW1lc3RhbXAiOjE0OTc0NjEzMDQzNjYsInByb2ZpbGVJZCI6Ijg1MmE4YWNmNzMzNzQwZDc5OWVjYjA4ZmQ5OTY1MGI1IiwicHJvZmlsZU5hbWUiOiJLaW5nQ3JhenlfIiwic2lnbmF0dXJlUmVxdWlyZWQiOnRydWUsInRleHR1cmVzIjp7IlNLSU4iOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mOWMyMTE3ZDY0ZWE0ZmUxMWZiY2NhZmE2YzU5YzhlZjY3NDVkZjVkMTZjM2QwMmI4NmI2OTlmZWJjNTA0OGI1In19fQ==", "mJMpEvQ4A02z0S/chgLm5bKrrrd+zmp7A0012AB7b3KlyIHoLKEDDz+ZJgJtvN6skOqed3P+yNVqkxitugXaZZP8Af9J+/TseHn+vOy6CTK5tykRSY3Zb8Zmw1kn36v/SARAVtDIHD53yuPgJayYSAbVB7aknj1Q8XBQGUmZRMRxWWxeD7rQTOwgRYI4YJeKFf4UL9i6zxvOJuHsOAouJ7scu7VohG8vgR77Js/Z8rSu8/aSG+O9AQdzP6h9ixYNFkkQOHm7DseK/5tsWKHM4FYBgjIDKt3ApQokSbhThzGB55BA1qjXZkfCoOb13y1nOMC8WoIL6Ees1qzxG3VloGx2WAZLh+Q+/irwrFDMxk1zeU5fIRuj1c/UIM2HKdxxWgoRdrZ8ww/Jrll6maiOBx7geMn/0aOUbJ2U7gkTif6RG6YNS5YN9ZQDLh72l/akJMxF3SlmuAPmLs2kBghQ6eD2YQKuxWR/Hf1yS1YXtogFVNsGnzC1nda7F48EGL3zI+kCajbDlAGQ32aRt0btbEQ+Gj575kir3Aa53qiZ0YOIYQlhgZdOsTN2NE2s8uuy/15Rgc6K3ydgEmSZfdqyMyW0Dy7pE5TfVL8DumKRVRXdOceT5WfnW7MyqSmdorP5ab1fw2wLOnAVzhJmW8oXXNSs77WJ1/PURclxOWB4IF8=");
- public static final SkinData CANADA_HAT = new SkinData("eyJ0aW1lc3RhbXAiOjE0OTg2MDE5MDYwNzYsInByb2ZpbGVJZCI6IjdkYTJhYjNhOTNjYTQ4ZWU4MzA0OGFmYzNiODBlNjhlIiwicHJvZmlsZU5hbWUiOiJHb2xkYXBmZWwiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2M2MTExNTNmODdmMjZjMzRmOTdkODIxM2ZmOTk1ZGJlNjcyZWJkNGM0NjRkNGFkNzM5MWFlNDNjMWU3YTllIn19fQ", "QMw6e1FXl/Xrt+BbfPKsz3OHyOxL9CEPffS9grxRLD6gbLbMD84OT3+bge5V9lBFn9PPnTyID+WTF24qHj4ADTTgK94ykNedCEO6R1wS0FZKPI1UjwOxMhIG5ZeVr7+HxITgGU4Xz94IigBkvW//f2ZGelMvS0GLCrm4iCovEBMUzyYJ2dZ4xgzFSH6v+9efK4/SBAJaj8mHjXpDxU58/vskTGI3T9t5sWlZLXgId9vHcMj0GH3Un6yvUXiMkh38V/rAEM8/R8q08xUVyW0e2R38qWQV2+eKvsG8GmJmgkU/78wA9cKGZdrEz0pnr80eGNCbvXqQvC/czYhEhDapgxfndcHLX8q/Zk3I8msNr340E4ZrQL61Yl7KcVC1qEUQVu3cosq5A6ckXLGvv//HSwXVO8M9ThUbuEC8QjiS/fMFufnVa18lHrVulnfb/2KQ4yPsoCHK/zvGtRkWtD1sLOIfehN+sxCLiaz80ILBiwN0oHITfNHpJzoa4kF/OrxxCualp4Sv5o5TXBv7aWsO18v9ixb9o9CmJKKE8MUl5xmRVz4HQD4dyOfcwtPuxmfcYjJrxqBijdQMrcgLzqqMs+DUqcZZlxM7M5GaNUoEvL9tJNGpZaB2OrBw0DTk5wx15XfANCH4egx8X4+Iy2RUoFthHX3BsVazG7fjSiDnUtI=");
- public static final SkinData AMERICA_HAT = new SkinData("eyJ0aW1lc3RhbXAiOjE0OTg2MDI3MjMyODgsInByb2ZpbGVJZCI6IjNlMjZiMDk3MWFjZDRjNmQ5MzVjNmFkYjE1YjYyMDNhIiwicHJvZmlsZU5hbWUiOiJOYWhlbGUiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzYzMjI0MDhkYzBiZjMxNjU4N2RiNDJiN2Q5ZmViZTUwYWQ4MGY0OGU4Njc5YzI0NTFkOTk3MTdjZmVjNTdkYWQifX19","oRo6DIuhOTaXDkFsgwJ488LWqx5d1QpwtglwG1SdEvkbX1aCMGdZyDm9YIopQRjfBg0uYKQFetOZ1ZkdMmc/aKC5/dm0+Ema7g8AUzjwf4OaSLH1r4C1UJ4ruaNG5diBxNTkYnMa7yT8zvyEr22CA7lUOIgTh8ymBfSGK35RPhsn8jM0hDjdhjemBAlxKpiioByfmAQbwokNBOrXfh/PnKq+iJYg4WpMSZ1zo5Rr0CzLXwu+/T3dvrb6mg7qry7J3Lj5/qn6iIdBcjJBeyvy1sCo45jQ3Rzc6oL/84Vu5Dpn395EqUK8Sa7mdpVpATTcj56TCjkNNtDapXNqyO/IIQuzU4wnBKNQmZefaxRl6LV0DhZ8n8YQaPj6hH/mr2oDsd23+jejjqu6Y95ReTyukp06mIGqgekmrdZV2etML2oMAOTv9ieVvqtfo5gEomYs+NFAL7rMmzjAlhd17VOgqNRMpmJazAHWOYKl8KdOH99wGDe5XcyKHysh+qyHKMvhPJztIeAEaosynF/aGHghH2PM354KCuUVNmdR5G7UZUoG9ZA5ZU3EzZ854jeqxcqw3jzb6qL7A83QNuFqOsb87ugL/jO3QEDdQ9drdf3WAQauQGkU3nYBrls5wxoMrQ+Ceth+FtZw9a1v7dc+DEWOeJKCtOAIskb29pv6OcRe0Wk=");
// Comments this out for now, so it doesn't load the player profile
// A better way to do this would check for the properties when getting the skull or the skin
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
index cc58f5d0d..a87bb2565 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
@@ -418,22 +418,4 @@ public class UtilParticle
PlayParticleToAll(particleType, location, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1f, count, dist);
}
- public static void playColoredParticle(java.awt.Color color, ParticleType particleType, Location location, int count, ViewDist dist, Player... players)
- {
- if (particleType != ParticleType.RED_DUST
- && particleType != ParticleType.MOB_SPELL_AMBIENT)
- return;
- PlayParticle(particleType, location, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1f, count, dist, players);
- }
-
- public static void playColoredParticleToAll(java.awt.Color color, ParticleType particleType, Location location, int count, ViewDist dist)
- {
- if (particleType != ParticleType.RED_DUST && particleType != ParticleType.MOB_SPELL_AMBIENT)
- {
- return;
- }
-
- PlayParticleToAll(particleType, location, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1f, count, dist);
- }
-
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/banner/CountryFlag.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/banner/CountryFlag.java
index 54626d736..d4e48144f 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/banner/CountryFlag.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/banner/CountryFlag.java
@@ -1,30 +1,17 @@
package mineplex.core.common.util.banner;
import org.bukkit.DyeColor;
-import org.bukkit.Material;
import org.bukkit.block.banner.Pattern;
import org.bukkit.block.banner.PatternType;
import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.BannerMeta;
-
-import static org.bukkit.DyeColor.*;
-import static org.bukkit.block.banner.PatternType.*;
public enum CountryFlag
{
- // Vetted
- MINEPLEX("Mineplex", "Mineplexian", BLACK, new Pattern(ORANGE, TRIANGLE_TOP), new Pattern(BLACK, TRIANGLES_TOP),
- new Pattern(ORANGE, STRIPE_LEFT), new Pattern(ORANGE, STRIPE_RIGHT), new Pattern(BLACK, BORDER),
- new Pattern(BLACK, STRIPE_BOTTOM)),
- USA("The United States of America", "American", RED, new Pattern(WHITE, STRIPE_SMALL), new Pattern(BLUE, SQUARE_TOP_RIGHT),
- new Pattern(BLUE, SQUARE_TOP_RIGHT), new Pattern(BLUE, SQUARE_TOP_RIGHT)),
-
- CANADA("Canada", "Canadian", WHITE, new Pattern(RED, CROSS), new Pattern(WHITE, STRIPE_LEFT), new Pattern(RED, STRIPE_MIDDLE),
- new Pattern(WHITE, BORDER), new Pattern(RED, STRIPE_TOP), new Pattern(RED, STRIPE_BOTTOM)),
-
- // Not Vetted
BRAZIL(DyeColor.GREEN, new Pattern(DyeColor.YELLOW, PatternType.RHOMBUS_MIDDLE), new Pattern(DyeColor.BLUE, PatternType.CIRCLE_MIDDLE)),
+ USA(DyeColor.RED, new Pattern(DyeColor.WHITE, PatternType.STRIPE_SMALL), new Pattern(DyeColor.BLUE, PatternType.SQUARE_TOP_RIGHT)),
+ CANADA(DyeColor.WHITE, new Pattern(DyeColor.RED, PatternType.STRIPE_TOP), new Pattern(DyeColor.RED, PatternType.STRIPE_BOTTOM),
+ new Pattern(DyeColor.RED, PatternType.CIRCLE_MIDDLE)),
UK(DyeColor.BLUE, new Pattern(DyeColor.WHITE, PatternType.STRIPE_DOWNLEFT), new Pattern(DyeColor.WHITE, PatternType.STRIPE_DOWNRIGHT),
new Pattern(DyeColor.RED, PatternType.STRAIGHT_CROSS), new Pattern(DyeColor.RED, PatternType.CROSS)),
IRELAND(DyeColor.WHITE, new Pattern(DyeColor.LIME, PatternType.STRIPE_TOP), new Pattern(DyeColor.ORANGE, PatternType.STRIPE_BOTTOM)),
@@ -67,47 +54,17 @@ public enum CountryFlag
new Pattern(DyeColor.GREEN, PatternType.STRIPE_CENTER), new Pattern(DyeColor.BLACK, PatternType.TRIANGLE_BOTTOM)),
POLAND(DyeColor.RED, new Pattern(DyeColor.WHITE, PatternType.HALF_VERTICAL_MIRROR));
- private final String _country;
- private final String _adjective;
- private final DyeColor _baseColor;
- private final Pattern[] _patterns;
+ private DyeColor _baseColor;
+ private Pattern[] _patterns;
- CountryFlag(String country, String adjective, DyeColor baseColor, Pattern... patterns)
- {
- _country = country;
- _adjective = adjective;
+ CountryFlag(DyeColor baseColor, Pattern... patterns){
_baseColor = baseColor;
_patterns = patterns;
}
- CountryFlag(DyeColor baseColor, Pattern... patterns)
- {
- this("", "", baseColor, patterns);
- }
-
public ItemStack getBanner()
{
- ItemStack banner = new ItemStack(Material.BANNER);
- BannerMeta bannerMeta = (BannerMeta) banner.getItemMeta();
- bannerMeta.setBaseColor(_baseColor);
-
- for (Pattern pattern : _patterns)
- {
- bannerMeta.addPattern(pattern);
- }
-
- banner.setItemMeta(bannerMeta);
- return banner;
- }
-
- public String getCountryName()
- {
- return _country;
- }
-
- public String getCountryAdjective()
- {
- return _adjective;
+ return UtilBanner.createBanner(_baseColor, _patterns);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java
index 7cb686de7..d1ae7b491 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java
@@ -1,6 +1,5 @@
package mineplex.core.cosmetic;
-import mineplex.core.punish.Punish;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@@ -42,23 +41,19 @@ import mineplex.core.twofactor.TwoFactorAuth;
public class CosmeticManager extends MiniPlugin
{
private final TwoFactorAuth _twofactor = Managers.require(TwoFactorAuth.class);
- private final InventoryManager _inventoryManager;
- private final GadgetManager _gadgetManager;
- private final MountManager _mountManager;
- private final PetManager _petManager;
- private final TreasureManager _treasureManager;
- private final BoosterManager _boosterManager;
- private final Punish _punish;
+ private InventoryManager _inventoryManager;
+ private GadgetManager _gadgetManager;
+ private MountManager _mountManager;
+ private PetManager _petManager;
+ private TreasureManager _treasureManager;
+ private BoosterManager _boosterManager;
private CosmeticShop _shop;
private boolean _showInterface = true;
private int _interfaceSlot = 4;
- public CosmeticManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager,
- InventoryManager inventoryManager, GadgetManager gadgetManager, MountManager mountManager,
- PetManager petManager, TreasureManager treasureManager, BoosterManager boosterManager,
- Punish punish)
+ public CosmeticManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, GadgetManager gadgetManager, MountManager mountManager, PetManager petManager, TreasureManager treasureManager, BoosterManager boosterManager)
{
super("Cosmetic Manager", plugin);
@@ -68,7 +63,6 @@ public class CosmeticManager extends MiniPlugin
_petManager = petManager;
_treasureManager = treasureManager;
_boosterManager = boosterManager;
- _punish = punish;
_shop = new CosmeticShop(this, clientManager, donationManager, _moduleName);
}
@@ -248,11 +242,6 @@ public class CosmeticManager extends MiniPlugin
{
return _boosterManager;
}
-
- public Punish getPunishManager()
- {
- return _punish;
- }
public void displayUI(Player player)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/open/OpenFlags.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/open/OpenFlags.java
deleted file mode 100644
index 987d549ac..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/open/OpenFlags.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package mineplex.core.cosmetic.ui.button.open;
-
-import mineplex.core.cosmetic.ui.page.FlagPage;
-import mineplex.core.cosmetic.ui.page.HatPage;
-import mineplex.core.cosmetic.ui.page.Menu;
-import mineplex.core.gadget.types.Gadget;
-import org.bukkit.entity.Player;
-
-/**
- * @author J Teissler
- * @date 6/26/17
- */
-public class OpenFlags extends OpenPageButton
-{
- public OpenFlags(Menu menu, Gadget active)
- {
- super(menu, active);
- }
-
- @Override
- protected void leftClick(Player player)
- {
- getMenu().getShop().openPageForPlayer(player, new FlagPage(getMenu().getPlugin(), getMenu().getShop(), getMenu().getClientManager(), getMenu().getDonationManager(), "Flags", player));
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ArrowTrailPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ArrowTrailPage.java
index e4d1333f9..80db4bcd6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ArrowTrailPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ArrowTrailPage.java
@@ -33,16 +33,12 @@ public class ArrowTrailPage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.ARROW_TRAIL) == gadget)
- {
- addGlow(slot);
- }
+ addGlow(slot);
slot++;
- if (slot % 9 == 8)
- {
- slot += 2;
- }
+ if (slot == 17)
+ slot += 2;
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
index 3208e5a05..fd0b3cf08 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
@@ -32,16 +32,12 @@ public class BalloonsPage extends GadgetPage
addGadget(gadget, slot);
if (gadget.isActive(getPlayer()))
- {
addGlow(slot);
- }
slot++;
- if (slot % 9 == 8)
- {
+ if (slot == 17 || slot == 26)
slot += 2;
- }
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java
index c1a606358..73af59a89 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java
@@ -22,6 +22,9 @@ import mineplex.core.gadget.types.OutfitGadget;
import mineplex.core.shop.item.IButton;
import mineplex.core.shop.item.ShopItem;
+/**
+ * Created by shaun on 14-09-15.
+ */
public class CostumePage extends GadgetPage
{
public CostumePage(CosmeticManager plugin, CosmeticShop shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DeathEffectPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DeathEffectPage.java
index a54b7f840..07dbee136 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DeathEffectPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DeathEffectPage.java
@@ -33,16 +33,12 @@ public class DeathEffectPage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.DEATH) == gadget)
- {
- addGlow(slot);
- }
+ addGlow(slot);
slot++;
- if (slot % 9 == 8)
- {
- slot += 2;
- }
+ if (slot == 17)
+ slot += 2;
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DoubleJumpPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DoubleJumpPage.java
index 8ecddc541..f9748cb06 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DoubleJumpPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/DoubleJumpPage.java
@@ -33,16 +33,12 @@ public class DoubleJumpPage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.DOUBLE_JUMP) == gadget)
- {
- addGlow(slot);
- }
+ addGlow(slot);
slot++;
-
- if (slot % 9 == 8)
- {
- slot += 2;
- }
+
+ if (slot == 17)
+ slot += 2;
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/FlagPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/FlagPage.java
deleted file mode 100644
index 8de6f4cdf..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/FlagPage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package mineplex.core.cosmetic.ui.page;
-
-import mineplex.core.account.CoreClientManager;
-import mineplex.core.common.util.C;
-import mineplex.core.cosmetic.CosmeticManager;
-import mineplex.core.cosmetic.ui.CosmeticShop;
-import mineplex.core.donation.DonationManager;
-import mineplex.core.gadget.types.Gadget;
-import mineplex.core.gadget.types.GadgetType;
-import mineplex.core.shop.item.IButton;
-import mineplex.core.shop.item.ShopItem;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-
-import java.util.List;
-
-public class FlagPage extends GadgetPage
-{
- public FlagPage(CosmeticManager plugin, CosmeticShop shop, CoreClientManager clientManager, DonationManager donationManager, String name,
- Player player)
- {
- super(plugin, shop, clientManager, donationManager, name, player);
- }
-
- @Override
- protected void buildPage()
- {
- int slot = 10;
-
- List list = getPlugin().getGadgetManager().getGadgets(GadgetType.FLAG);
- if(list != null)
- for (Gadget gadget : list)
- {
- addGadget(gadget, slot);
-
- if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.FLAG) == gadget)
- {
- addGlow(slot);
- }
-
- slot++;
-
- if (slot % 9 == 8)
- {
- slot += 2;
- }
- }
-
- addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
- {
- public void onClick(Player player, ClickType clickType)
- {
- getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
- }
- });
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
index 03efda5ce..657d98b30 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
@@ -12,6 +12,7 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BannerMeta;
import org.bukkit.inventory.meta.ItemMeta;
import mineplex.core.account.CoreClientManager;
@@ -20,6 +21,7 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilText;
+import mineplex.core.common.util.banner.CountryFlag;
import mineplex.core.cosmetic.CosmeticManager;
import mineplex.core.cosmetic.ui.CosmeticShop;
import mineplex.core.cosmetic.ui.button.GadgetButton;
@@ -58,16 +60,12 @@ public class GadgetPage extends ShopPageBase
addGadget(gadget, slot);
if (getPlugin().getInventoryManager().Get(getPlayer()).getItemCount(gadget.getDisplayName()) > 0)
- {
addGlow(slot);
- }
slot++;
- if (slot % 9 == 8)
- {
+ if (slot == 17 || slot == 26)
slot += 2;
- }
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
@@ -368,6 +366,19 @@ public class GadgetPage extends ShopPageBase
meta.setLore(itemLore);
gadgetItemStack.setItemMeta(meta);
+ if (gadget.getGadgetType() == GadgetType.ARROW_TRAIL || gadget.getGadgetType() == GadgetType.DEATH
+ || gadget.getGadgetType() == GadgetType.PARTICLE || gadget.getGadgetType() == GadgetType.DOUBLE_JUMP)
+ {
+ if (gadget.getCost(GlobalCurrency.TREASURE_SHARD) == -8)
+ {
+ gadgetItemStack = CountryFlag.USA.getBanner();
+ BannerMeta bannerMeta = (BannerMeta) gadgetItemStack.getItemMeta();
+ bannerMeta.setDisplayName(C.cGreen + C.Bold + gadget.getName());
+ bannerMeta.setLore(meta.getLore());
+ gadgetItemStack.setItemMeta(bannerMeta);
+ }
+ }
+
addButton(slot, new ShopItem(gadgetItemStack, false, false).hideInfo(), new DeactivateGadgetButton(gadget, this));
}
else
@@ -378,6 +389,19 @@ public class GadgetPage extends ShopPageBase
meta.setLore(itemLore);
gadgetItemStack.setItemMeta(meta);
+ if (gadget.getGadgetType() == GadgetType.ARROW_TRAIL || gadget.getGadgetType() == GadgetType.DEATH
+ || gadget.getGadgetType() == GadgetType.PARTICLE || gadget.getGadgetType() == GadgetType.DOUBLE_JUMP)
+ {
+ if (gadget.getCost(GlobalCurrency.TREASURE_SHARD) == -8)
+ {
+ gadgetItemStack = CountryFlag.USA.getBanner();
+ BannerMeta bannerMeta = (BannerMeta) gadgetItemStack.getItemMeta();
+ bannerMeta.setDisplayName(C.cGreen + C.Bold + gadget.getName());
+ bannerMeta.setLore(meta.getLore());
+ gadgetItemStack.setItemMeta(bannerMeta);
+ }
+ }
+
/*if (gadget instanceof MorphStray)
{
gadgetItemStack = UtilItem.getVersionSpecificItem(_player, UtilPlayer.PlayerVersion._1_9, gadgetItemStack);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/HatPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/HatPage.java
index a21f31cea..37f472616 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/HatPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/HatPage.java
@@ -38,16 +38,12 @@ public class HatPage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.HAT) == gadget)
- {
- addGlow(slot);
- }
+ addGlow(slot);
slot++;
-
- if (slot % 9 == 8)
- {
- slot += 2;
- }
+
+ if (slot == 17)
+ slot += 2;
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/KitSelectorPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/KitSelectorPage.java
index 6ce7f5ebd..26b399783 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/KitSelectorPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/KitSelectorPage.java
@@ -31,16 +31,12 @@ public class KitSelectorPage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.KIT_SELECTOR) == gadget)
- {
addGlow(slot);
- }
slot++;
- if (slot % 9 == 8)
- {
+ if (slot == 17 || slot == 26 || slot == 35)
slot += 2;
- }
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
index 9814c081b..8a27df36e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
@@ -5,9 +5,6 @@ import java.util.EnumMap;
import java.util.List;
import java.util.Map;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.cosmetic.ui.button.open.OpenFlags;
-import mineplex.core.itemstack.ItemBuilder;
import org.bukkit.Material;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
@@ -17,6 +14,7 @@ import mineplex.core.common.currency.GlobalCurrency;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
+import mineplex.core.common.util.UtilUI;
import mineplex.core.cosmetic.CosmeticManager;
import mineplex.core.cosmetic.ui.CosmeticShop;
import mineplex.core.cosmetic.ui.button.open.OpenArrowTrails;
@@ -42,9 +40,6 @@ import mineplex.core.mount.Mount;
import mineplex.core.pet.PetType;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.shop.page.ShopPageBase;
-import org.bukkit.inventory.ItemFlag;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.BannerMeta;
public class Menu extends ShopPageBase
{
@@ -69,46 +64,35 @@ public class Menu extends ShopPageBase
List shardLore = new ArrayList();
shardLore.add(" ");
- shardLore.add(C.cGray + "These seem like they might come in");
- shardLore.add(C.cGray + "handy. Maybe I should collect more!");
+ shardLore.add(C.cGray + "This seems like it might come in");
+ shardLore.add(C.cGray + "handy. Maybe I can collect more!");
ShopItem shards = new ShopItem(Material.PRISMARINE_SHARD, C.cAqua + C.Bold + treasureShards + " Treasure Shards", shardLore.toArray(new String[0]), 0, false);
- int deathSlot = 19;
- int jumpSlot = 28;
- int particleSlot = 1;
- int winEffectSlot = 13;
- int shardSlot = 22;
- int arrowSlot = 10;
- int tauntSlot = 31;
- int gameModifierSlot = 21;
- int kitSelectorSlot = 23;
- int musicSlot = 48;
- int mountSlot = 50;
- int balloonsSlot = 47;
- int petSlot = 51;
- int gadgetSlot = 49;
- int hatSlot = 7;
- int flagSlot = 34;
- int morphSlot = 25;
- int costumeSlot = 16;
-
- addItem(shardSlot, shards);
-
- ItemStack pane = new ItemBuilder(Material.STAINED_GLASS_PANE).setData((byte)15).setTitle(C.cBlack).build();
- for (int i = 0; i <= 45; i += 9) addItem(i, pane.clone());
- for (int i = 8; i <= 53; i += 9) addItem(i, pane.clone());
- for (int i = 37; i <= 43; ++i) addItem(i, pane.clone());
- for (int i = 2; i <= 6; ++i) addItem(i, pane.clone());
- for (int i = 11; i <= 29; i += 9) addItem(i, pane.clone());
- for (int i = 15; i <= 33; i += 9) addItem(i, pane.clone());
- addItem(12, pane.clone());
- addItem(14, pane.clone());
- addItem(30, pane.clone());
- addItem(32, pane.clone());
- addItem(46, pane.clone());
- addItem(52, pane.clone());
+ // Cosmetic Items
+ int[] slots = UtilUI.getIndicesFor(15, 0, 5, 1);
+ /*int particleSlot = 9;//slots[0];
+ int arrowSlot = 11;//slots[1];
+ int jumpSlot = 13;//slots[2];
+ int deathSlot = 15;//slots[3];
+ int gadgetSlot = 27;//slots[4];
+ int morphSlot = 29;//slots[5];
+ int mountSlot = 31;//slots[6];
+ int petSlot = 33;//slots[7];
+ int hatSlot = 35;//slots[8];
+ int costumeSlot = 45;//slots[9];
+ int musicSlot = 47;//slots[10];
+ int tauntSlot = 49;//slots[11];
+ int winEffectSlot = 51;
+ int gameModifierSlot = 53;*/
+ int particleSlot = slots[0], arrowSlot = slots[1], jumpSlot = slots[2],
+ deathSlot = slots[3], gadgetSlot = slots[4], morphSlot = slots[5],
+ mountSlot = slots[6], petSlot = slots[7], hatSlot = slots[8],
+ costumeSlot = slots[9], musicSlot = slots[10], tauntSlot = slots[11],
+ winEffectSlot = slots[12], gameModifierSlot = slots[13], balloonsSlot = slots[14],
+ kitSelectorSlot = balloonsSlot + 4;
+ addItem(kitSelectorSlot + 2, shards);
EnumMap ownedCount = new EnumMap<>(GadgetType.class);
EnumMap maxCount = new EnumMap<>(GadgetType.class);
@@ -203,7 +187,7 @@ public class Menu extends ShopPageBase
if (petActive != null) addGlow(petSlot);
type = GadgetType.HAT;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Hats are in this year. Wear them on your head to impress the others.", VISIBILITY_HUB, enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Hats are in this year. Wear them on your head to impress the ladies.", VISIBILITY_HUB, enabled.get(type));
addButton(hatSlot, new ShopItem(Material.GOLD_HELMET, "Hats", lore, 1, false), new OpenHats(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(hatSlot);
@@ -243,19 +227,6 @@ public class Menu extends ShopPageBase
lore = getLore(ownedCount.get(type), maxCount.get(type), "Click here to select different particles to indicate which kit you have selected!", VISIBILITY_GAME_HUB, enabled.get(type));
addButton(kitSelectorSlot, new ShopItem(Material.LEVER, "Kit Selector Particles", lore, 1, false), new OpenKitSelector(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(kitSelectorSlot);
-
- type = GadgetType.FLAG;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Show off your country's flag!", VISIBILITY_HUB, enabled.get(type));
- addButton(flagSlot, new ShopItem(Material.BANNER, "Flags", lore, 1, false), new OpenFlags(this, enabled.get(type)));
- if (enabled.containsKey(type)) addGlow(flagSlot);
-
- // Copy over banner design
- BannerMeta banner = (BannerMeta) CountryFlag.MINEPLEX.getBanner().getItemMeta();
- BannerMeta meta = ((BannerMeta) getItem(flagSlot).getItemMeta());
- meta.setBaseColor(banner.getBaseColor());
- meta.setPatterns(banner.getPatterns());
- meta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS);
- getItem(flagSlot).setItemMeta(meta);
}
private String[] getLore(int ownedCount, int maxCount, String info, String visibility, Gadget enabled)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java
index 0689b3f07..682140891 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java
@@ -32,19 +32,13 @@ public class MorphPage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.MORPH) == gadget)
- {
- if (!(gadget instanceof MorphBlock))
- {
- addGlow(slot);
- }
- }
+ if (!(gadget instanceof MorphBlock))
+ addGlow(slot);
slot++;
- if (slot % 9 == 8)
- {
+ if (slot == 17 || slot == 26 || slot == 35)
slot += 2;
- }
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
index 0c2b2cd60..6e670effc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
@@ -46,10 +46,8 @@ public class MountPage extends ShopPageBase
addMount(mount, slot);
slot++;
- if (slot % 9 == 8)
- {
+ if (slot == 17 || slot == 26)
slot += 2;
- }
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java
index 49fa65cf7..54ff244d7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java
@@ -14,6 +14,9 @@ import mineplex.core.gadget.types.GadgetType;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.shop.item.IButton;
+/**
+ * Created by shaun on 14-09-15.
+ */
public class MusicPage extends GadgetPage
{
public MusicPage(CosmeticManager plugin, CosmeticShop shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player)
@@ -31,10 +34,8 @@ public class MusicPage extends GadgetPage
slot++;
- if (slot % 9 == 8)
- {
+ if (slot == 17)
slot += 2;
- }
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java
index 168741d0a..a488c922c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java
@@ -31,16 +31,12 @@ public class ParticlePage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.PARTICLE) == gadget)
- {
- addGlow(slot);
- }
+ addGlow(slot);
slot++;
-
- if (slot % 9 == 8)
- {
- slot += 2;
- }
+
+ if (slot == 17 || slot == 26 || slot == 35)
+ slot += 2;
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java
index 264f73dbe..e7bf684cb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java
@@ -231,23 +231,16 @@ public class PetPage extends ShopPageBase
slot++;
- if (slot % 9 == 8)
- {
+ if (slot == 17 || slot == 26)
slot += 2;
- }
}
slot = 49;
for (PetExtra petExtra : PetExtra.values())
{
List itemLore = new ArrayList();
-
- if (getPlugin().getPunishManager().GetClient(_player.getName()).IsMuted())
- {
- itemLore.add(C.cRed + "You may not rename pets while muted!");
- getInventory().setItem(slot, new ShopItem(petExtra.getMaterial(), (byte)0, C.cRed + petExtra.getName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).getHandle());
- }
- else if (!getPlugin().getPetManager().hasActivePet(getPlayer().getName()))
+
+ if (!getPlugin().getPetManager().hasActivePet(getPlayer().getName()))
{
itemLore.add(C.cWhite + "You must have an active pet to use this!");
getInventory().setItem(slot, new ShopItem(petExtra.getMaterial(), (byte)0, C.cRed + petExtra.getName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).getHandle());
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TauntPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TauntPage.java
index 63ef90b24..687516e0f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TauntPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TauntPage.java
@@ -38,16 +38,12 @@ public class TauntPage extends GadgetPage
addGadget(gadget, slot);
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.TAUNT) == gadget)
- {
- addGlow(slot);
- }
+ addGlow(slot);
slot++;
-
- if (slot % 9 == 8)
- {
- slot += 2;
- }
+
+ if (slot == 26)
+ slot += 2;
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/WinEffectPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/WinEffectPage.java
index e66674be4..cc116cbac 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/WinEffectPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/WinEffectPage.java
@@ -49,16 +49,12 @@ public class WinEffectPage extends GadgetPage
}
if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.WIN_EFFECT) == gadget)
- {
- addGlow(slot);
- }
+ addGlow(slot);
slot++;
-
- if (slot % 9 == 8)
- {
- slot += 2;
- }
+
+ if (slot == 17 || slot == 26)
+ slot += 2;
}
addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/custompet/name/CustomPetTagPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/custompet/name/CustomPetTagPage.java
index 2350f8eba..774ecf2d0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/custompet/name/CustomPetTagPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/custompet/name/CustomPetTagPage.java
@@ -1,14 +1,9 @@
package mineplex.core.cosmetic.ui.page.custompet.name;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilItem;
-import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.punish.PunishClient;
import net.minecraft.server.v1_8_R3.ItemStack;
import net.minecraft.server.v1_8_R3.Items;
import org.bukkit.ChatColor;
-import org.bukkit.Material;
import org.bukkit.entity.Player;
import mineplex.core.account.CoreClientManager;
@@ -39,7 +34,6 @@ public class CustomPetTagPage extends ShopPageBase
{
addCosmetics(null, caller);
}
- else if (args.length >= 1)
+ else if (args.length == 1)
{
- if (args[0].equalsIgnoreCase("all"))
+ Player player = Bukkit.getPlayer(args[0]);
+ if (player != null)
{
- for (Player player : UtilServer.getPlayers())
- {
- if (player != null)
- {
- addCosmetics(null, player);
- UtilPlayer.message(caller, F.main("Unlock Cosmetics", "Added all the cosmetics to " + F.name(player.getName()) + "!"));
- }
- }
- }
- else
- {
- for (int i = 0; i < args.length; ++i)
- {
- Player player = Bukkit.getPlayer(args[i]);
- if (player != null)
- {
- addCosmetics(null, player);
- UtilPlayer.message(caller, F.main("Unlock Cosmetics", "Added all the cosmetics to " + F.name(player.getName()) + "!"));
- }
- }
+ addCosmetics(null, player);
+ UtilPlayer.message(caller, F.main("Unlock Cosmetics", "Added all the cosmetics to " + F.name(player.getName()) + "!"));
}
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailRedWhite.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailRedWhite.java
deleted file mode 100644
index 37934c81f..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailRedWhite.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilAlg;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.ArrowEffectGadget;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Arrow;
-import org.bukkit.util.Vector;
-
-import java.awt.Color;
-
-/**
- * Trails a red and white double helix behind the arrow.
- */
-public class ArrowTrailRedWhite extends ArrowEffectGadget
-{
- public ArrowTrailRedWhite(GadgetManager manager)
- {
- super(manager, "Red & White Arrows",
- UtilText.splitLineToArray(C.cRed + "Killing you nicely.", LineFormat.LORE),
- -8, Material.WOOL, (byte)0);
-
- setDisplayItem(CountryFlag.CANADA.getBanner());
- }
-
- @Override
- public void doTrail(Arrow arrow)
- {
- Vector v = arrow.getVelocity();
- Vector up = UtilAlg.getUp(v);
- Vector left = UtilAlg.getLeft(v);
-
- Location loc = arrow.getLocation();
-
- double amount = 2;
- double ticks = 15;
-
- for(int i = 0; i < amount; i++)
- {
- double rad = Math.PI*2.0;
- rad += i/amount * rad;
- rad += Math.PI*2*(arrow.getTicksLived()%ticks)/ticks;
- double l = -Math.sin(rad);
- double u = Math.cos(rad);
-
- Vector vel = v.clone().add(up.clone().multiply(u)).add(left.clone().multiply(l));
- vel.multiply(0.4);
-
- if (i == 0)
- {
- for(int j = 0; j < 3; ++j)
- {
- UtilParticle.playColoredParticleToAll(Color.RED, UtilParticle.ParticleType.RED_DUST, loc.clone().add(vel), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- else
- {
- for(int j = 0; j < 3; ++j)
- {
- UtilParticle.playColoredParticleToAll(Color.WHITE, UtilParticle.ParticleType.RED_DUST, loc.clone().add(vel), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
- }
-
- @Override
- public void doHitEffect(Arrow arrow)
- {
- UtilParticle.PlayParticleToAll(UtilParticle.ParticleType.EXPLODE, arrow.getLocation(), 0, 0, 0, 0, 3, UtilParticle.ViewDist.NORMAL);
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/candycane/ArrowTrailCandyCane.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/candycane/ArrowTrailCandyCane.java
index 58cbee4d9..d45b1b023 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/candycane/ArrowTrailCandyCane.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.candycane;
import org.bukkit.Location;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/cupidslove/ArrowTrailCupid.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/cupidslove/ArrowTrailCupid.java
index 4249c19c3..c10562f6d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/cupidslove/ArrowTrailCupid.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.cupidslove;
import org.bukkit.Color;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/emerald/ArrowTrailEmerald.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/emerald/ArrowTrailEmerald.java
index b7b8a6df2..8592bc16b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/emerald/ArrowTrailEmerald.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.emerald;
import mineplex.core.common.util.*;
import org.bukkit.Location;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFreedom.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java
index fa5f7ade2..8921b26cc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFreedom.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.freedom;
import java.awt.Color;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/frostlord/ArrowTrailFrostLord.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/frostlord/ArrowTrailFrostLord.java
index 3a7c910b5..6ae8d9b43 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/frostlord/ArrowTrailFrostLord.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.frostlord;
import org.bukkit.Material;
import org.bukkit.entity.Arrow;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailHalloween.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/halloween/ArrowTrailHalloween.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailHalloween.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/halloween/ArrowTrailHalloween.java
index bd5b62563..112f272ad 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailHalloween.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/halloween/ArrowTrailHalloween.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.halloween;
import java.awt.Color;
import java.util.HashMap;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/howlingwinds/ArrowTrailStorm.java
similarity index 94%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/howlingwinds/ArrowTrailStorm.java
index 084611017..a3cc14165 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/howlingwinds/ArrowTrailStorm.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.howlingwinds;
import org.bukkit.Material;
import org.bukkit.entity.Arrow;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/music/ArrowTrailMusic.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/music/ArrowTrailMusic.java
index 6c6a3006e..d535035af 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/music/ArrowTrailMusic.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.music;
import org.bukkit.Material;
import org.bukkit.entity.Arrow;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/party/ArrowTrailConfetti.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/party/ArrowTrailConfetti.java
index be2cd9b90..d8f06ce45 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/party/ArrowTrailConfetti.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.party;
import org.bukkit.Material;
import org.bukkit.entity.Arrow;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/shadow/ArrowTrailShadow.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/shadow/ArrowTrailShadow.java
index 8db14cbdb..aec688901 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/shadow/ArrowTrailShadow.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.shadow;
import org.bukkit.Material;
import org.bukkit.entity.Arrow;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailSpring.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/spring/ArrowTrailSpring.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailSpring.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/spring/ArrowTrailSpring.java
index 59cb064c4..c335ce062 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailSpring.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/spring/ArrowTrailSpring.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.spring;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailTitan.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java
index 29c39b7d0..956055929 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.titan;
import org.bukkit.Material;
import org.bukkit.entity.Arrow;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/vampire/ArrowTrailBlood.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/vampire/ArrowTrailBlood.java
index 180e336de..f54c9ae92 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/vampire/ArrowTrailBlood.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.vampire;
import org.bukkit.Material;
import org.bukkit.entity.Arrow;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/wisdom/ArrowTrailEnchant.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/wisdom/ArrowTrailEnchant.java
index b33723020..00e47e049 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/wisdom/ArrowTrailEnchant.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.arrowtrail;
+package mineplex.core.gadget.gadgets.arrowtrail.wisdom;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMapleLeaf.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMapleLeaf.java
deleted file mode 100644
index 3cfeeb034..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMapleLeaf.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package mineplex.core.gadget.gadgets.death;
-
-import mineplex.core.blood.BloodEvent;
-import mineplex.core.common.shape.ShapeWings;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.DeathEffectGadget;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-/**
- * Displays a giant maple leaf at the point of death.
- */
-public class DeathMapleLeaf extends DeathEffectGadget
-{
- /** height off the ground of the leaf */
- private static final double HEIGHT = 3;
-
- private final ShapeWings _leafOuter = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1.0, 1.0, 1.0), 1, 0, false, 0, ShapeWings.MAPLE_LEAF);
- private final ShapeWings _leafInner = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(0.7, 0, 0), 1, 0, false, 0, ShapeWings.MAPLE_LEAF);
-
- public DeathMapleLeaf(GadgetManager manager)
- {
- super(manager, "Fallen Maple Leaf",
- UtilText.splitLineToArray(C.cGray + "When you die in " + C.cRed + "Canada" + C.cGray + " you die in real life.", LineFormat.LORE),
- -8, Material.WOOL, (byte) 0);
-
- setDisplayItem(CountryFlag.CANADA.getBanner());
- }
-
- @Override
- public void onBlood(Player player, BloodEvent event)
- {
- event.setCancelled(true);
- Location loc = player.getLocation().add(0, HEIGHT, 0);
- _leafOuter.display(loc);
- _leafInner.display(loc);
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/candycane/DeathCandyCane.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/candycane/DeathCandyCane.java
index 2d100b3fe..45a7028d0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/candycane/DeathCandyCane.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.candycane;
import org.bukkit.Location;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPresentDanger.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/christmas/DeathPresentDanger.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPresentDanger.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/christmas/DeathPresentDanger.java
index c1b07ce33..e8db5ed6a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPresentDanger.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/christmas/DeathPresentDanger.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.christmas;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBrokenHeart.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/cupidslove/DeathCupidsBrokenHeart.java
similarity index 94%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBrokenHeart.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/cupidslove/DeathCupidsBrokenHeart.java
index d0053f9df..1c92abc02 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBrokenHeart.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/cupidslove/DeathCupidsBrokenHeart.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.cupidslove;
import org.bukkit.Location;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/emerald/DeathEmerald.java
similarity index 93%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/emerald/DeathEmerald.java
index 85fb2db18..79ea0b404 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/emerald/DeathEmerald.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.emerald;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/freedom/DeathFreedom.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFreedom.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/freedom/DeathFreedom.java
index 137b68207..24d43eb0b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFreedom.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/freedom/DeathFreedom.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.freedom;
import org.bukkit.ChatColor;
import org.bukkit.Location;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/frostlord/DeathFrostLord.java
similarity index 93%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFrostLord.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/frostlord/DeathFrostLord.java
index 72cd2c3cb..0ce7b546f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFrostLord.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/frostlord/DeathFrostLord.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.frostlord;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/howlingwinds/DeathStorm.java
similarity index 94%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/howlingwinds/DeathStorm.java
index c3cf2f0da..00cf6d607 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/howlingwinds/DeathStorm.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.howlingwinds;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/music/DeathMusic.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/music/DeathMusic.java
index d6c4176ad..2bf566254 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/music/DeathMusic.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.music;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/party/DeathPinataBurst.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/party/DeathPinataBurst.java
index 0adc3dfb8..09ccfe10a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/party/DeathPinataBurst.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.party;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/shadow/DeathShadow.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/shadow/DeathShadow.java
index f80b4ad9b..3adb240f2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/shadow/DeathShadow.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.shadow;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathSpring.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/spring/DeathSpring.java
similarity index 98%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathSpring.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/spring/DeathSpring.java
index bae34473b..eb15f5986 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathSpring.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/spring/DeathSpring.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.spring;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathTitan.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java
index 0e56f8308..00b64eace 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.titan;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/vampire/DeathBlood.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/vampire/DeathBlood.java
index 7101aba36..5365e3e14 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/vampire/DeathBlood.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.vampire;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/wisdom/DeathEnchant.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/wisdom/DeathEnchant.java
index 35532906d..7229b155d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/wisdom/DeathEnchant.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.death;
+package mineplex.core.gadget.gadgets.death.wisdom;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMaple.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMaple.java
deleted file mode 100644
index 4b9d08338..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMaple.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package mineplex.core.gadget.gadgets.doublejump;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.DoubleJumpEffectGadget;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-public class DoubleJumpMaple extends DoubleJumpEffectGadget
-{
- /**
- * Amount of particles played per tick as a player flies through the air.
- */
- private static final int PARTICLES = 50;
-
- /**
- * Vertical offset of the animation's center from the player's location.
- */
- private static final float Y_OFFSET = 0.95f;
-
- /**
- * Divisor of the gaussian distribution of particles as the player flies through the air.
- */
- private static final int DISTRIBUTION = 2;
-
- /**
- * Particle ring count when a player launches from the ground.
- */
- private static final int LAUNCH_RINGS = 6;
-
- /**
- * The distance between launch rings.
- */
- private static final float RING_SPACING = 0.4f;
-
- /**
- * Particles played per 1 unit radius.
- */
- private static final int RING_DENSITY = 8;
-
- private HashMap _playerMap = new HashMap<>();
-
- public DoubleJumpMaple(GadgetManager manager)
- {
- super(manager, "Maple Leap",
- UtilText.splitLineToArray(C.cGray + "Jump higher than the maple trees!", LineFormat.LORE),
- -8, Material.WOOL, (byte)0);
- setDisplayItem(CountryFlag.CANADA.getBanner());
- }
-
- @Override
- public void doEffect(Player player)
- {
- _playerMap.put(player, System.currentTimeMillis() + 1000);
-
- float limit = (LAUNCH_RINGS * RING_SPACING) + RING_SPACING;
-
- for (float r = RING_SPACING; r < limit; r++)
- {
- double[][] points = UtilMath.normalCircle(player.getLocation(), player.getVelocity(), r, Math.round(RING_DENSITY * r));
-
- for (int i = 0; i < points.length; i++)
- {
- UtilParticle.PlayParticleToAll(UtilParticle.ParticleType.EXPLODE, new Location(player.getWorld(), points[i][0], points[i][1], points[i][2]),
- null, 0, 1, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
-
- @EventHandler
- public void onUpdate(UpdateEvent event)
- {
- if(event.getType() != UpdateType.FASTEST)
- {
- return;
- }
-
- for(Iterator> it = _playerMap.entrySet().iterator(); it.hasNext();)
- {
- Map.Entry e = it.next();
-
- if(e.getValue() <= System.currentTimeMillis())
- {
- it.remove();
- continue;
- }
-
- Location loc = e.getKey().getLocation().add(0, Y_OFFSET, 0);
-
- for (int i = 0; i < PARTICLES; ++i)
- {
- UtilParticle.playColoredParticleToAll(java.awt.Color.RED, UtilParticle.ParticleType.RED_DUST,
- UtilMath.gauss(loc, DISTRIBUTION, DISTRIBUTION, DISTRIBUTION), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/candycane/DoubleJumpCandyCane.java
similarity index 91%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCandyCane.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/candycane/DoubleJumpCandyCane.java
index 209da4b7c..d6a7620c7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCandyCane.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/candycane/DoubleJumpCandyCane.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.candycane;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -30,7 +30,7 @@ public class DoubleJumpCandyCane extends DoubleJumpEffectGadget
Location loc = player.getLocation();
UtilParticle.PlayParticleToAll(ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 15), loc, 0, 0, 0, 0.15f, 100, ViewDist.NORMAL);
UtilParticle.PlayParticleToAll(ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 1), loc, 0, 0, 0, 0.15f, 100, ViewDist.NORMAL);
- UtilParticle.PlayParticleToAll(ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 15), loc, 0, 0, 0, 0.15f, 100, ViewDist.NORMAL);
+ UtilParticle.PlayParticleToAll(ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 2), loc, 0, 0, 0, 0.15f, 100, ViewDist.NORMAL);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/cupidslove/DoubleJumpCupidsWings.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/cupidslove/DoubleJumpCupidsWings.java
index 81884a52b..71a7b66b5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/cupidslove/DoubleJumpCupidsWings.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.cupidslove;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/emerald/DoubleJumpEmerald.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/emerald/DoubleJumpEmerald.java
index f74859c2c..0453e0b57 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/emerald/DoubleJumpEmerald.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.emerald;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/freedom/DoubleJumpFreedom.java
similarity index 92%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFreedom.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/freedom/DoubleJumpFreedom.java
index 820ccd155..7f887e345 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFreedom.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/freedom/DoubleJumpFreedom.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.freedom;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@@ -18,7 +18,7 @@ public class DoubleJumpFreedom extends DoubleJumpEffectGadget
{
super(manager, "Leap of Freedom", UtilText.splitLineToArray(UtilText.colorWords("FREEEEEEEEEEEDOM!",
ChatColor.RED, ChatColor.WHITE, ChatColor.BLUE), LineFormat.LORE), -8, Material.WOOL,
- (byte) 0);
+ (byte) 14);
setDisplayItem(CountryFlag.USA.getBanner());
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/frostlord/DoubleJumpFrostLord.java
similarity index 94%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFrostLord.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/frostlord/DoubleJumpFrostLord.java
index 64cc9f962..62325731c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFrostLord.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/frostlord/DoubleJumpFrostLord.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.frostlord;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpHalloween.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/halloween/DoubleJumpHalloween.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpHalloween.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/halloween/DoubleJumpHalloween.java
index 0f2cc13e8..10155afbd 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpHalloween.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/halloween/DoubleJumpHalloween.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.halloween;
import java.awt.Color;
import java.util.HashMap;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/howlingwinds/DoubleJumpStorm.java
similarity index 94%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/howlingwinds/DoubleJumpStorm.java
index 9cd07ef15..6b04d1f00 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/howlingwinds/DoubleJumpStorm.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.howlingwinds;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/music/DoubleJumpMusic.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/music/DoubleJumpMusic.java
index 2a4d5c1ba..5b7459f0d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/music/DoubleJumpMusic.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.music;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/party/DoubleJumpFirecracker.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/party/DoubleJumpFirecracker.java
index 65ce9bd80..06ee124f7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/party/DoubleJumpFirecracker.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.party;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/shadow/DoubleJumpShadow.java
similarity index 94%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/shadow/DoubleJumpShadow.java
index c64052bca..005c3403c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/shadow/DoubleJumpShadow.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.shadow;
import mineplex.core.common.util.C;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpSpring.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/spring/DoubleJumpSpring.java
similarity index 94%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpSpring.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/spring/DoubleJumpSpring.java
index 527b44b0f..63dabdaf9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpSpring.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/spring/DoubleJumpSpring.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.spring;
import java.util.ArrayList;
import java.util.Iterator;
@@ -38,7 +38,7 @@ public class DoubleJumpSpring extends DoubleJumpEffectGadget
{
for (int i = 50; i < 60; i++)
{
- Item sunflower = player.getWorld().dropItem(player.getLocation().add(0.0, 0.2, 0.0), ItemStackFactory.Instance.CreateStack(Material.DOUBLE_PLANT, (byte) 0, 1, " " + i));
+ Item sunflower = player.getWorld().dropItem(player.getLocation().add(0.5, 1.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.DOUBLE_PLANT, (byte) 0, 1, " " + i));
_items.add(sunflower);
Vector vel = new Vector(Math.sin(i * 9/5d), 0, Math.cos(i * 9/5d));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpTitan.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java
index 9c81a3309..336aaa5bc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.titan;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/vampire/DoubleJumpBlood.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/vampire/DoubleJumpBlood.java
index 2f910416c..882133687 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/vampire/DoubleJumpBlood.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.vampire;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/wisdom/DoubleJumpEnchant.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/wisdom/DoubleJumpEnchant.java
index d9d4db576..ec1120f3b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/wisdom/DoubleJumpEnchant.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.doublejump;
+package mineplex.core.gadget.gadgets.doublejump.wisdom;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/flag/FlagType.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/flag/FlagType.java
deleted file mode 100644
index aec958dd9..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/flag/FlagType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package mineplex.core.gadget.gadgets.flag;
-
-import mineplex.core.common.util.banner.CountryFlag;
-
-/**
- * Cosmetic flags representing countries.
- */
-public enum FlagType
-{
- UNITED_STATES(CountryFlag.USA, -8),
- CANADA(CountryFlag.CANADA, -8),
-
- ;
-
- private final CountryFlag _flag;
- private final int _cost;
-
- FlagType(CountryFlag flag, int cost)
- {
- _flag = flag;
- _cost = cost;
- }
-
- public CountryFlag getFlag()
- {
- return _flag;
- }
-
- public int getCost()
- {
- return _cost;
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatType.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatType.java
index cabad2568..c6f623e20 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatType.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatType.java
@@ -22,11 +22,7 @@ public enum HatType
SNOWMAN("Snowman Head", UtilText.splitLineToArray(C.cGray + "Do you want to be a snowman?", LineFormat.LORE), -2, SkinData.SNOWMAN),
TEDDY_BEAR("Teddy Bear", UtilText.splitLineToArray(C.cGray + "Aww, it's a cute teddy bear! What shall I name him?", LineFormat.LORE), -6, SkinData.TEDDY_BEAR),
UNCLE_SAM("Uncle Sam Hat", UtilText.splitLineToArray(UtilText.colorWords("Uncle Sam has a big hat but now you can too.", ChatColor.RED, ChatColor.WHITE, ChatColor.BLUE), LineFormat.LORE), -8, SkinData.UNCLE_SAM),
- PUMPKIN("Pumpkin Hat", UtilText.splitLineToArray(C.cGray + "Pumpkin on the head, don't end up dead!", LineFormat.LORE), -9, Material.PUMPKIN),
- CANADA("Warm Canadian Hat", UtilText.splitLineToArray(C.cGray + "Keep your ears nice and warm while up north.", LineFormat.LORE), -8, SkinData.CANADA_HAT),
- AMERICA("Patriotic American Hat", UtilText.splitLineToArray(C.cGray + "Careful not to get a big head.", LineFormat.LORE), -8, SkinData.AMERICA_HAT),
-
- ;
+ PUMPKIN("Pumpkin Hat", UtilText.splitLineToArray(C.cGray + "Pumpkin on the head, don't end up dead!", LineFormat.LORE), -9, Material.PUMPKIN);
private final String _name;
private final String[] _lore;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
index 651993fb9..236bc1e8a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
@@ -1,6 +1,5 @@
package mineplex.core.gadget.gadgets.particle;
-import mineplex.core.common.util.UtilMath;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@@ -28,7 +27,7 @@ public class ParticleCoalFumes extends ParticleGadget
@Override
public void playParticle(Player player, UpdateEvent event)
{
- if(event.getType() != UpdateType.FASTER) return;
+ if(event.getType() != UpdateType.TICK) return;
float xz = 1;
int amount = 5;
@@ -40,6 +39,6 @@ public class ParticleCoalFumes extends ParticleGadget
amount = 2;
}
- UtilParticle.playParticleFor(player, type, UtilMath.gauss(player.getLocation(), 2, 6, 2), xz, 0, xz, 0, amount, ViewDist.NORMAL);
+ UtilParticle.playParticleFor(player, type, player.getLocation(), xz, 0, xz, 0, amount, ViewDist.NORMAL);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java
index 8337efae4..f99338a75 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java
@@ -1,8 +1,6 @@
package mineplex.core.gadget.gadgets.particle;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilParticle;
-import org.bukkit.Location;
+import org.bukkit.Effect;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -19,40 +17,12 @@ import mineplex.core.inventory.data.Item;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
-import java.awt.Color;
-
public class ParticleLegend extends ParticleGadget
{
- private static final double PI = Math.PI;
- private static final int BASE_PILLARS = 9;
- private static final int PILLAR_VARIANCE = 8;
- private static final int MOVING_PARTICLES = 8;
- private static final double VERTICAL_SPEED = 0.1;
- private static final double HEIGHT_VARIANCE = 0.8;
- private static final double ROTATIONAL_SPEED = .03;
- private static final double RADIAL_VARIANCE = 0.09;
- private static final double BASE_RADIUS = 1.30;
- private static final double HEIGHT_MODIFIER_BASE = 0.1;
- private static final double HEIGHT_MODIFIER_MAX = 1.3;
- private static final double HEIGHT_MODIFIER_INTERVAL = 0.15;
- private static final Color[] SELECTABLE_COLORS = {
- new Color(60, 170, 25),
- new Color(33, 92, 13),
- new Color(0, 0, 0)
- };
-
- private final int _pillars = pillars();
- private final Color[] _colors = colors();
- private final double[] _heights = heights();
- private final double[] _verticals = verticals();
- private final double[] _variance = variances();
- private final double[] _thetas = thetas();
- private final double[] _radii = radii();
-
public ParticleLegend(GadgetManager manager)
{
super(manager, "Legendary Aura",
- UtilText.splitLineToArray(C.cGray + "Legendary energy protects you.", LineFormat.LORE),
+ UtilText.splitLineToArray(C.cGray + "This particle will be updated soon! Yay!", LineFormat.LORE),
-1,
Material.ENDER_PORTAL_FRAME, (byte)0);
}
@@ -61,150 +31,11 @@ public class ParticleLegend extends ParticleGadget
public void playParticle(Player player, UpdateEvent event)
{
if (event.getType() != UpdateType.TICK)
- {
return;
- }
- if (Manager.isMoving(player))
- {
-
- for (int i = 0; i < MOVING_PARTICLES; i++)
- {
- if (_colors[i].getGreen() == 0)
- {
- UtilParticle.PlayParticleToAll(UtilParticle.ParticleType.SMOKE,
- UtilMath.gauss(player.getLocation(), 8, 4, 8), null, 0, 1, UtilParticle.ViewDist.NORMAL);
- }
- else
- {
- UtilParticle.playColoredParticleToAll(_colors[i], UtilParticle.ParticleType.RED_DUST,
- UtilMath.gauss(player.getLocation(), 8, 4, 8), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
- else
- {
- if (event.getTick() % (ROTATIONAL_SPEED * 100) == 0)
- {
- for (int i = 0; i < _pillars; i++)
- {
- _thetas[i] = rollover(_thetas[i], ROTATIONAL_SPEED);
- _heights[i] = rollover(_heights[i], _verticals[i]);
-
- double x = (_radii[i] * Math.cos(_thetas[i])) + player.getLocation().getX();
- double z = (_radii[i] * Math.sin(_thetas[i])) + player.getLocation().getZ();
- double y = (Math.sin(_heights[i]) * _variance[i]) + player.getLocation().getY();
-
- for (double h = HEIGHT_MODIFIER_BASE; h <= HEIGHT_MODIFIER_MAX; h+= HEIGHT_MODIFIER_INTERVAL)
- {
- if (_colors[i].getGreen() == 0)
- {
- UtilParticle.PlayParticleToAll(UtilParticle.ParticleType.SMOKE,
- new Location(player.getWorld(), x, y + h, z), null, 0, 1, UtilParticle.ViewDist.NORMAL);
- }
- else
- {
- UtilParticle.playColoredParticleToAll(_colors[i], UtilParticle.ParticleType.RED_DUST,
- new Location(player.getWorld(), x, y + h, z), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
- }
- }
+ player.getWorld().playEffect(player.getLocation().add(0, 1, 0), Effect.ENDER_SIGNAL, 0);
}
-
- private double[] heights()
- {
- double[] array = new double[_pillars];
-
- for (int i = 0; i < _pillars; i++)
- {
- array[i] = 6.28 * Math.random();
- }
-
- return array;
- }
-
- private double[] variances()
- {
- double[] array = new double[_pillars];
-
- for (int i = 0; i < _pillars; i++)
- {
- array[i] = Math.random() * HEIGHT_VARIANCE;
- }
-
- return array;
- }
-
- private double[] verticals()
- {
- double[] array = new double[_pillars];
-
- for (int i = 0; i < _pillars; i++)
- {
- array[i] = Math.random() * VERTICAL_SPEED;
- }
-
- return array;
- }
-
- private double[] thetas()
- {
- double[] array = new double[_pillars];
- double theta = 0;
- double interval = (2 * PI) / _pillars;
-
- for (int i = 0; i < _pillars; i++)
- {
- array[i] = theta;
- theta += interval;
- }
-
- return array;
- }
-
- private double[] radii()
- {
- double[] array = new double[_pillars];
-
- for (int i = 0; i < _pillars; i++)
- {
- array[i] = BASE_RADIUS + (Math.random() * RADIAL_VARIANCE);
- }
-
- return array;
- }
-
- private Color[] colors()
- {
- Color[] array = new Color[_pillars];
-
- for (int i = 0; i < _pillars; i++)
- {
- array[i] = SELECTABLE_COLORS[i % SELECTABLE_COLORS.length];
- }
-
- return array;
- }
-
- private int pillars()
- {
- return BASE_PILLARS + (int) ((Math.random() * PILLAR_VARIANCE) - (PILLAR_VARIANCE / 2));
- }
-
- private double rollover(double value, double additive)
- {
- value += additive;
-
- if (value >= 2 * PI)
- {
- value = value - (2 * PI);
- }
-
- return value;
- }
-
+
@EventHandler
public void legendOwner(PlayerJoinEvent event)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java
similarity index 93%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java
index e9e572f19..4d8b223fc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.candycane;
import java.util.HashMap;
import java.util.UUID;
@@ -63,7 +63,7 @@ public class ParticleCandyCane extends ParticleGadget
UtilParticle.playParticleFor(player, UtilParticle.ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 15), loc, w, y, w, 0, a, UtilParticle.ViewDist.NORMAL);
UtilParticle.playParticleFor(player, UtilParticle.ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 1), loc, w, y, w, 0, a, UtilParticle.ViewDist.NORMAL);
- UtilParticle.playParticleFor(player, UtilParticle.ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 15), loc, w, y, w, 0, a, UtilParticle.ViewDist.NORMAL);
+ UtilParticle.playParticleFor(player, UtilParticle.ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, 2), loc, w, y, w, 0, a, UtilParticle.ViewDist.NORMAL);
}
@EventHandler
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java
similarity index 84%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java
index c48b0ddb4..dea6a85aa 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java
@@ -1,6 +1,5 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.cupidslove;
-import mineplex.core.common.util.UtilMath;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -38,11 +37,11 @@ public class ParticleHeart extends ParticleGadget
{
if(getSet() == null || !getSet().isActive(player)) return;
- UtilParticle.playParticleFor(player, ParticleType.HEART, player.getLocation().add(0, 1.2, 0), null, 0, 1, ViewDist.NORMAL);
+ UtilParticle.playParticleFor(player, ParticleType.HEART, player.getLocation().add(0, 1, 0), null, 0, 1, ViewDist.NORMAL);
}
else
{
- UtilParticle.playParticleFor(player, ParticleType.HEART, UtilMath.gauss(player.getLocation(), 1, 3, 1).add(0, 1.2, 0), null, 0, 1, ViewDist.NORMAL);
+ UtilParticle.playParticleFor(player, ParticleType.HEART, player.getLocation().add(0, 1, 0), 0.5f, 0.5f, 0.5f, 0, 1, ViewDist.NORMAL);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEmerald.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java
index f81361c66..417587dbb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEmerald.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.emerald;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleAuraNiceness.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleAuraNiceness.java
deleted file mode 100644
index 2e68270e5..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleAuraNiceness.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package mineplex.core.gadget.gadgets.particle.freedom;
-
-import mineplex.core.arcadeevents.CoreGameStartEvent;
-import mineplex.core.arcadeevents.CoreGameStopEvent;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilShapes;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.ParticleGadget;
-import mineplex.core.treasure.event.TreasureFinishEvent;
-import mineplex.core.treasure.event.TreasureStartEvent;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.BlockPhysicsEvent;
-
-import java.awt.Color;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-
-/**
- * Places flowers around the player with poofs of red and white
- */
-public class ParticleAuraNiceness extends ParticleGadget
-{
- /** Radius within which flowers not allowed near treasure chests */
- private static final int TREASURE_RADIUS = 4;
-
- /** Horizontal offset for particle spawns */
- private static final double H_FIELD = 0.5;
-
- /** Vertical offset for particle spawns */
- private static final double V_FIELD = 0.35;
-
- /** How likely a flower is to be spawned (1/n) */
- private static final int ROSE_PROBABILITY = 40;
-
- /** Radius in which flowers are spawned */
- private static final double ROSE_RADIUS = 2.5;
-
- /** How many particles accompany each flower spawn */
- private static final int PARTICLE_COUNT = 20;
-
- /** List of blocks that have flowers in them */
- private final Set _blocks = new HashSet<>();
-
- /** Milliseconds for which flowers persist */
- private final long DURATION = 5000;
-
- /** Locations at which treasure is currently being opened */
- private final Map _openingTreasure = new HashMap<>();
-
- /** Whether flowers can be spawned in addition to particles */
- private boolean _enabled = true;
-
- public ParticleAuraNiceness(GadgetManager manager)
- {
- super(manager, "Aura of Niceness",
- UtilText.splitLineToArray(C.cGray + "Canadians are always nice online.", LineFormat.LORE), -8, Material.WOOL,
- (byte) 0);
-
- setDisplayItem(CountryFlag.CANADA.getBanner());
- }
-
- @Override
- public void playParticle(Player player, UpdateEvent event)
- {
- if (event.getType() != UpdateType.FASTER)
- {
- return;
- }
-
- for (Location location : _openingTreasure.values())
- {
- if (location.toVector().isInSphere(player.getLocation().toVector(), TREASURE_RADIUS))
- {
- return;
- }
- }
-
- UtilShapes.getCircle(player.getLocation().subtract(0, 0.5, 0), false, ROSE_RADIUS).stream().map(Location::getBlock)
- .collect(Collectors.toSet()).forEach(block ->
- {
- if (ThreadLocalRandom.current().nextInt(ROSE_PROBABILITY) == 0)
- {
- Block b = block.getRelative(BlockFace.UP);
-
- if (b.isEmpty() && UtilBlock.fullSolid(block) && !UtilBlock.bottomSlab(block))
- {
- Location loc = b.getLocation().add(H_FIELD, V_FIELD, H_FIELD);
-
- if (_enabled)
- {
- byte data = ThreadLocalRandom.current().nextInt(2) == 0 ? (byte) 4 : 6;
-
- _blocks.add(b);
- Manager.getBlockRestore().add(b, Material.RED_ROSE.getId(), data, DURATION);
- }
-
- for (int i = 0; i < PARTICLE_COUNT; ++i)
- {
- UtilParticle.playColoredParticleToAll(Color.RED, UtilParticle.ParticleType.RED_DUST, UtilMath.gauss(loc, 4, 4, 4), 0, UtilParticle.ViewDist.NORMAL);
- UtilParticle.playColoredParticleToAll(Color.WHITE, UtilParticle.ParticleType.RED_DUST, UtilMath.gauss(loc, 4, 4, 4), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
- });
-
- for(Iterator it = _blocks.iterator(); it.hasNext();)
- {
- Block b = it.next();
-
- if (b.getType() != Material.RED_ROSE)
- {
- it.remove();
- Location loc = b.getLocation().add(H_FIELD, V_FIELD, H_FIELD);
- for (int i = 0; i < PARTICLE_COUNT / 2; ++i)
- {
- UtilParticle.playColoredParticleToAll(Color.RED, UtilParticle.ParticleType.RED_DUST, UtilMath.gauss(loc, 6, 6, 6), 0, UtilParticle.ViewDist.NORMAL);
- UtilParticle.playColoredParticleToAll(Color.WHITE, UtilParticle.ParticleType.RED_DUST, UtilMath.gauss(loc, 6, 6, 6), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
- }
-
- /**
- * Stop flowers from popping off of blocks
- */
- @EventHandler
- public void onBlockFade(BlockPhysicsEvent event)
- {
- if (_blocks.contains(event.getBlock()))
- {
- event.setCancelled(true);
- }
- }
-
- /**
- * Disable flowers in the area around treasure being opened.
- */
- @EventHandler(priority = EventPriority.LOW)
- public void disableOnTreasureStart(TreasureStartEvent event)
- {
- _openingTreasure.put(event.getPlayer().getUniqueId(), event.getPlayer().getLocation());
- Manager.getBlockRestore().restoreBlockAround(Material.CARPET, event.getPlayer().getLocation(), TREASURE_RADIUS);
- }
-
- /**
- * Enable flowers in the area around treasure no longer being opened.
- */
- @EventHandler(priority = EventPriority.HIGH)
- public void enableOnTreasureFinish(TreasureFinishEvent event)
- {
- if (_openingTreasure.containsKey(event.getPlayer().getUniqueId()))
- {
- _openingTreasure.remove(event.getPlayer().getUniqueId());
- }
- }
-
- /**
- * Disable flowers on game start
- */
- @EventHandler
- public void onGameStart(CoreGameStartEvent event)
- {
- _enabled = false;
- }
-
- /**
- * Enable flowers on game end
- */
- @EventHandler
- public void onGameEnd(CoreGameStopEvent event)
- {
- _enabled = true;
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleCanadian.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleCanadian.java
deleted file mode 100644
index 4770908b9..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleCanadian.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package mineplex.core.gadget.gadgets.particle.freedom;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.ParticleGadget;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.BannerMeta;
-
-import java.awt.Color;
-
-/**
- * Leaves a trail behind the player with the colors of the Canadian flag.
- */
-public class ParticleCanadian extends ParticleGadget
-{
- /** # of lines of particles */
- private static final int STRAND_COUNT = 9;
-
- /** How far apart each line of particles is */
- private static final double STRAND_SPACING = 0.124;
-
- /** How far off the floor the particles begin */
- private static final double DISTANCE_FROM_FLOOR = 0.43;
-
- public ParticleCanadian(GadgetManager manager)
- {
- super(manager, "Canadian Trail",
- UtilText.splitLineToArray(C.cGray + "Lead the way to freedom!", LineFormat.LORE),
- -8, Material.WOOL, (byte) 0);
-
- setDisplayItem(CountryFlag.CANADA.getBanner());
- }
-
- @Override
- public void playParticle(Player player, UpdateEvent event)
- {
- if (event.getType() != UpdateType.TICK)
- {
- return;
- }
-
- Location center = player.getLocation().subtract(player.getLocation().getDirection().multiply(0.4))
- .subtract(0, 0.1, 0).add(0, DISTANCE_FROM_FLOOR, 0);
-
- if (Manager.isMoving(player))
- {
- for (int i = 0; i < STRAND_COUNT; i++)
- {
- if (i < 3 || i > 5)
- {
- UtilParticle.playColoredParticleToAll(Color.RED, UtilParticle.ParticleType.RED_DUST,
- center.add(0, STRAND_SPACING, 0), 0, UtilParticle.ViewDist.NORMAL);
- }
- else
- {
- UtilParticle.playColoredParticleToAll(Color.WHITE, UtilParticle.ParticleType.RED_DUST,
- center.add(0, STRAND_SPACING, 0), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedomFireworks.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedomFireworks.java
deleted file mode 100644
index a7a18702e..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedomFireworks.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package mineplex.core.gadget.gadgets.particle.freedom;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.ParticleGadget;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.ThreadLocalRandom;
-
-/**
- * Small fireworks which explode around the player
- */
-public class ParticleFreedomFireworks extends ParticleGadget
-{
- /** Block types to source for particles */
- private static final Material[] BLOCKTYPES = {
- Material.REDSTONE_BLOCK,
- Material.LAPIS_BLOCK,
- Material.QUARTZ_BLOCK
- };
-
- /** Amount of particles for each firework */
- private static final int PARTICLE_COUNT = 20;
-
- public ParticleFreedomFireworks(GadgetManager manager)
- {
- super(manager, "Freedom Fireworks",
- UtilText.splitLineToArray(C.cGray + "Keep your patriotism close.", LineFormat.LORE),
- -8, Material.WOOL, (byte) 0);
-
- setDisplayItem(CountryFlag.USA.getBanner());
- }
-
- @Override
- public void playParticle(Player player, UpdateEvent event)
- {
- if (event.getType() != UpdateType.FAST)
- {
- return;
- }
-
- String particle = UtilParticle.ParticleType.BLOCK_CRACK.getParticle(BLOCKTYPES[ThreadLocalRandom.current().nextInt(0, BLOCKTYPES.length)], 0);
- Location location = UtilMath.gauss(player.getEyeLocation(), 1, 1, 1);
-
- for (int i = 0; i < PARTICLE_COUNT; ++i)
- {
- UtilParticle.PlayParticleToAll(particle, location, null, 3.0f, 1, UtilParticle.ViewDist.NORMAL);
- }
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleStarSpangled.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleStarSpangled.java
deleted file mode 100644
index 7ad601f9a..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleStarSpangled.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package mineplex.core.gadget.gadgets.particle.freedom;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.common.util.banner.CountryFlag;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.ParticleGadget;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import net.minecraft.server.v1_8_R3.MinecraftServer;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-
-import java.awt.*;
-
-
-/**
- * @author J Teissler
- * @date 6/26/17
- */
-public class ParticleStarSpangled extends ParticleGadget
-{
- private static final int STRAND_COUNT = 9;
- private static final double STRAND_SPACING = 0.124;
- private static final double DISTANCE_FROM_FLOOR = 0.43;
-
- private static final Color BLUE = new Color(29, 26, 120);
-
- public ParticleStarSpangled(GadgetManager manager)
- {
- super(manager, "Star Spangled Stripe",
- UtilText.splitLineToArray(C.cGray + "Blaze a trail of freedom!", LineFormat.LORE),
- -8, Material.WOOL, (byte) 0);
- setDisplayItem(CountryFlag.USA.getBanner());
- }
-
- @Override
- public void playParticle(Player player, UpdateEvent event)
- {
- if (event.getType() != UpdateType.TICK)
- {
- return;
- }
-
- Location center = player.getLocation().subtract(player.getLocation().getDirection().multiply(0.4))
- .subtract(0, 0.1, 0).add(0, DISTANCE_FROM_FLOOR, 0);
-
- if (Manager.isMoving(player))
- {
- for (int i = 0; i < STRAND_COUNT; i++)
- {
- if (i == 3 || i == 7)
- {
- if (player.getTicksLived() % 3 == 0)
- {
- UtilParticle.PlayParticleToAll(UtilParticle.ParticleType.FIREWORKS_SPARK,
- center.add(0, STRAND_SPACING, 0), 0f, 0f, 0f, 0f, 0, UtilParticle.ViewDist.NORMAL);
- continue;
- }
- }
- else if (i == 5)
- {
- if (player.getTicksLived() + 1 % 3 == 0)
- {
- UtilParticle.PlayParticleToAll(UtilParticle.ParticleType.FIREWORKS_SPARK,
- center.add(0, STRAND_SPACING, 0), 0f, 0f, 0f, 0f, 0, UtilParticle.ViewDist.NORMAL);
- continue;
- }
- }
-
- UtilParticle.playColoredParticleToAll(BLUE, UtilParticle.ParticleType.RED_DUST,
- center.add(0, STRAND_SPACING, 0), 0, UtilParticle.ViewDist.NORMAL);
- }
- }
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java
index 32f947e47..62c1388b3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.frostlord;
import org.bukkit.Material;
import org.bukkit.Sound;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleRain.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleRain.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java
index 4311666c0..f2c45007c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleRain.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.howlingwinds;
import java.util.ArrayList;
import java.util.List;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java
similarity index 98%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java
index e0bbb3537..04874fffc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.music;
import org.bukkit.Location;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticlePartyTime.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java
similarity index 98%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticlePartyTime.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java
index a3944317c..3aab6f928 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticlePartyTime.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.party;
import java.util.Arrays;
import java.util.Collections;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFoot.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java
similarity index 98%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFoot.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java
index fd315fc04..9c3b8be54 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFoot.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.shadow;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java
similarity index 98%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleTitan.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java
index 7d062f713..b5f02de23 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.titan;
import org.bukkit.Location;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleBlood.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java
index 0c3c3546a..a33078067 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleBlood.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.vampire;
import org.bukkit.Location;
import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java
index 706c32fbd..f8d734e74 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java
@@ -1,4 +1,4 @@
-package mineplex.core.gadget.gadgets.particle;
+package mineplex.core.gadget.gadgets.particle.wisdom;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/BlowAKissTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/BlowAKissTaunt.java
index c246b2975..fdc5da288 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/BlowAKissTaunt.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/BlowAKissTaunt.java
@@ -35,12 +35,10 @@ public class BlowAKissTaunt extends TauntGadget
}
@Override
- public boolean onStart(Player player)
+ public void onStart(Player player)
{
if (!Recharge.Instance.use(player, getName(), COOLDOWN, true, false, "Cosmetics"))
- {
- return false;
- }
+ return;
HashSet ignore = new HashSet<>();
ignore.add(Material.AIR);
@@ -48,8 +46,6 @@ public class BlowAKissTaunt extends TauntGadget
BlowAKissEffect blowAKissEffect = new BlowAKissEffect(player, loc, this);
blowAKissEffect.start();
-
- return true;
}
@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java
index 6e0a7e133..103efacd2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java
@@ -6,8 +6,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import mineplex.core.disguise.disguises.DisguiseBase;
-import mineplex.core.game.GameDisplay;
import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.FireworkEffect;
@@ -30,7 +28,9 @@ import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguiseSkeleton;
import mineplex.core.events.EnableArcadeSpawnEvent;
import mineplex.core.gadget.GadgetManager;
+import mineplex.core.gadget.gadgets.morph.managers.UtilMorph;
import mineplex.core.gadget.types.TauntGadget;
+import mineplex.core.game.GameDisplay;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
@@ -41,8 +41,7 @@ public class EternalTaunt extends TauntGadget
private static final int COOLDOWN = 30000;
private static final int PVP_COOLDOWN = 10000;
- private final Map> _clocks = new HashMap<>();
- private final Map _disguises = new HashMap<>();
+ private Map> _clocks = new HashMap<>();
public EternalTaunt(GadgetManager manager)
{
@@ -51,48 +50,33 @@ public class EternalTaunt extends TauntGadget
C.cWhite + "Use /taunt in game to show how long you've been waiting.",
C.cRed + "Cannot be used while in PvP!"}, LineFormat.LORE),
-15, Material.WATCH, (byte) 0);
-
setCanPlayWithPvp(false);
setPvpCooldown(PVP_COOLDOWN);
setShouldPlay(true);
setEventType(UpdateType.FAST);
- addDisabledGames(GameDisplay.Smash, GameDisplay.SmashTeams, GameDisplay.SmashDomination, GameDisplay.SmashTraining);
+ addDisabledGames(GameDisplay.Smash, GameDisplay.SmashTeams, GameDisplay.SmashDomination);
}
@Override
- public boolean onStart(Player player)
+ public void onStart(Player player)
{
if (!Recharge.Instance.use(player, getName(), COOLDOWN, true, false, "Cosmetics"))
- {
- return false;
- }
-
+ return;
UtilFirework.playFirework(player.getLocation(), FireworkEffect.builder().with(FireworkEffect.Type.BALL_LARGE).withColor(Color.fromRGB(255, 175, 175)).withFade(Color.RED).build());
_clocks.put(player.getUniqueId(), new ArrayList<>());
Bukkit.broadcastMessage(F.main("Taunt", F.name(player.getName()) + " waited so long they turned to bones."));
- if (!Manager.getDisguiseManager().isDisguised(player))
- {
- DisguiseSkeleton disguiseSkeleton = new DisguiseSkeleton(player);
- disguiseSkeleton.setName(player.getName());
- disguiseSkeleton.setCustomNameVisible(true);
- disguiseSkeleton.showArmor();
- Manager.getDisguiseManager().disguise(disguiseSkeleton);
- _disguises.put(player.getUniqueId(), disguiseSkeleton);
- }
-
- return true;
+ DisguiseSkeleton disguiseSkeleton = new DisguiseSkeleton(player);
+ UtilMorph.disguise(player, disguiseSkeleton, Manager);
}
@Override
public void onPlay(Player player)
{
if (!_clocks.containsKey(player.getUniqueId()))
- {
return;
- }
int i = getPlayerTicks(player);
@@ -130,11 +114,7 @@ public class EternalTaunt extends TauntGadget
@Override
public void onFinish(Player player)
{
- if (_disguises.containsKey(player.getUniqueId()))
- {
- Manager.getDisguiseManager().undisguise(_disguises.remove(player.getUniqueId()));
- }
-
+ UtilMorph.undisguise(player, Manager.getDisguiseManager());
if (_clocks.containsKey(player.getUniqueId()))
{
_clocks.get(player.getUniqueId()).forEach(c -> c.remove());
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java
index 6a49fe8c4..de81b6a1b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java
@@ -36,12 +36,10 @@ public class RainbowTaunt extends TauntGadget
}
@Override
- public boolean onStart(Player player)
+ public void onStart(Player player)
{
if (!Recharge.Instance.use(player, getName(), COOLDOWN, true, false, "Cosmetics"))
- {
- return false;
- }
+ return;
Vector dir = player.getLocation().getDirection();
Vector sideA = dir.clone().setX(-dir.getZ()).setZ(dir.getX());
@@ -53,8 +51,6 @@ public class RainbowTaunt extends TauntGadget
RainbowTauntEffect rainbowTauntEffect = new RainbowTauntEffect(start, Manager.getPlugin());
rainbowTauntEffect.setTargetLocation(new EffectLocation(end));
rainbowTauntEffect.start();
-
- return true;
}
@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCanadian.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCanadian.java
deleted file mode 100644
index 0b18eca18..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCanadian.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package mineplex.core.gadget.set;
-
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailRedWhite;
-import mineplex.core.gadget.gadgets.death.DeathMapleLeaf;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpMaple;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleCanadian;
-import mineplex.core.gadget.types.GadgetSet;
-
-public class SetCanadian extends GadgetSet
-{
-
- public SetCanadian(GadgetManager manager)
- {
- super(manager, "Canadian", "2x Holiday Points while active (Titles)",
- manager.getGadget(ArrowTrailRedWhite.class),
- manager.getGadget(DeathMapleLeaf.class),
- manager.getGadget(DoubleJumpMaple.class),
- manager.getGadget(ParticleCanadian.class));
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java
index c9b059480..e6f6f5707 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCandyCane;
-import mineplex.core.gadget.gadgets.death.DeathCandyCane;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpCandyCane;
-import mineplex.core.gadget.gadgets.particle.ParticleCandyCane;
+import mineplex.core.gadget.gadgets.arrowtrail.candycane.ArrowTrailCandyCane;
+import mineplex.core.gadget.gadgets.death.candycane.DeathCandyCane;
+import mineplex.core.gadget.gadgets.doublejump.candycane.DoubleJumpCandyCane;
+import mineplex.core.gadget.gadgets.particle.candycane.ParticleCandyCane;
import mineplex.core.gadget.types.GadgetSet;
public class SetCandyCane extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java
index dca2f191c..ccbaf0863 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCupid;
-import mineplex.core.gadget.gadgets.death.DeathCupidsBrokenHeart;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpCupidsWings;
-import mineplex.core.gadget.gadgets.particle.ParticleHeart;
+import mineplex.core.gadget.gadgets.arrowtrail.cupidslove.ArrowTrailCupid;
+import mineplex.core.gadget.gadgets.death.cupidslove.DeathCupidsBrokenHeart;
+import mineplex.core.gadget.gadgets.doublejump.cupidslove.DoubleJumpCupidsWings;
+import mineplex.core.gadget.gadgets.particle.cupidslove.ParticleHeart;
import mineplex.core.gadget.types.GadgetSet;
public class SetCupidsLove extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java
index 26df2fd6f..b34a8f88e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailEmerald;
-import mineplex.core.gadget.gadgets.death.DeathEmerald;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpEmerald;
-import mineplex.core.gadget.gadgets.particle.ParticleEmerald;
+import mineplex.core.gadget.gadgets.arrowtrail.emerald.ArrowTrailEmerald;
+import mineplex.core.gadget.gadgets.death.emerald.DeathEmerald;
+import mineplex.core.gadget.gadgets.doublejump.emerald.DoubleJumpEmerald;
+import mineplex.core.gadget.gadgets.particle.emerald.ParticleEmerald;
import mineplex.core.gadget.types.GadgetSet;
public class SetEmerald extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFreedom.java
index a64e2caf3..6196a145b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFreedom.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFreedom.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailFreedom;
-import mineplex.core.gadget.gadgets.death.DeathFreedom;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFreedom;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleStarSpangled;
+import mineplex.core.gadget.gadgets.arrowtrail.freedom.ArrowTrailFreedom;
+import mineplex.core.gadget.gadgets.death.freedom.DeathFreedom;
+import mineplex.core.gadget.gadgets.doublejump.freedom.DoubleJumpFreedom;
+import mineplex.core.gadget.gadgets.particle.freedom.ParticleFreedom;
import mineplex.core.gadget.types.GadgetSet;
public class SetFreedom extends GadgetSet
@@ -16,7 +16,7 @@ public class SetFreedom extends GadgetSet
manager.getGadget(ArrowTrailFreedom.class),
manager.getGadget(DeathFreedom.class),
manager.getGadget(DoubleJumpFreedom.class),
- manager.getGadget(ParticleStarSpangled.class));
+ manager.getGadget(ParticleFreedom.class));
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFrostLord.java
index 311600e5e..6112655a0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFrostLord.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFrostLord.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailFrostLord;
-import mineplex.core.gadget.gadgets.death.DeathFrostLord;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFrostLord;
-import mineplex.core.gadget.gadgets.particle.ParticleFrostLord;
+import mineplex.core.gadget.gadgets.arrowtrail.frostlord.ArrowTrailFrostLord;
+import mineplex.core.gadget.gadgets.death.frostlord.DeathFrostLord;
+import mineplex.core.gadget.gadgets.doublejump.frostlord.DoubleJumpFrostLord;
+import mineplex.core.gadget.gadgets.particle.frostlord.ParticleFrostLord;
import mineplex.core.gadget.types.GadgetSet;
public class SetFrostLord extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java
index 668503111..120a35c95 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailStorm;
-import mineplex.core.gadget.gadgets.death.DeathStorm;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpStorm;
-import mineplex.core.gadget.gadgets.particle.ParticleRain;
+import mineplex.core.gadget.gadgets.arrowtrail.howlingwinds.ArrowTrailStorm;
+import mineplex.core.gadget.gadgets.death.howlingwinds.DeathStorm;
+import mineplex.core.gadget.gadgets.doublejump.howlingwinds.DoubleJumpStorm;
+import mineplex.core.gadget.gadgets.particle.howlingwinds.ParticleRain;
import mineplex.core.gadget.types.GadgetSet;
public class SetHowlingWinds extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java
index 50eef82a0..9e606f0e2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailMusic;
-import mineplex.core.gadget.gadgets.death.DeathMusic;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpMusic;
-import mineplex.core.gadget.gadgets.particle.ParticleMusic;
+import mineplex.core.gadget.gadgets.arrowtrail.music.ArrowTrailMusic;
+import mineplex.core.gadget.gadgets.death.music.DeathMusic;
+import mineplex.core.gadget.gadgets.doublejump.music.DoubleJumpMusic;
+import mineplex.core.gadget.gadgets.particle.music.ParticleMusic;
import mineplex.core.gadget.types.GadgetSet;
public class SetMusic extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetParty.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetParty.java
index f22ce959e..f9debaef0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetParty.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetParty.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailConfetti;
-import mineplex.core.gadget.gadgets.death.DeathPinataBurst;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFirecracker;
-import mineplex.core.gadget.gadgets.particle.ParticlePartyTime;
+import mineplex.core.gadget.gadgets.arrowtrail.party.ArrowTrailConfetti;
+import mineplex.core.gadget.gadgets.death.party.DeathPinataBurst;
+import mineplex.core.gadget.gadgets.doublejump.party.DoubleJumpFirecracker;
+import mineplex.core.gadget.gadgets.particle.party.ParticlePartyTime;
import mineplex.core.gadget.types.GadgetSet;
public class SetParty extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java
index 80b751d7d..befc2e27c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailShadow;
-import mineplex.core.gadget.gadgets.death.DeathShadow;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpShadow;
-import mineplex.core.gadget.gadgets.particle.ParticleFoot;
+import mineplex.core.gadget.gadgets.arrowtrail.shadow.ArrowTrailShadow;
+import mineplex.core.gadget.gadgets.death.shadow.DeathShadow;
+import mineplex.core.gadget.gadgets.doublejump.shadow.DoubleJumpShadow;
+import mineplex.core.gadget.gadgets.particle.shadow.ParticleFoot;
import mineplex.core.gadget.types.GadgetSet;
public class SetShadow extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpring.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpring.java
index fb21b5f9e..77727b480 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpring.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpring.java
@@ -1,9 +1,9 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailSpring;
-import mineplex.core.gadget.gadgets.death.DeathSpring;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpSpring;
+import mineplex.core.gadget.gadgets.arrowtrail.spring.ArrowTrailSpring;
+import mineplex.core.gadget.gadgets.death.spring.DeathSpring;
+import mineplex.core.gadget.gadgets.doublejump.spring.DoubleJumpSpring;
import mineplex.core.gadget.gadgets.particle.spring.ParticleSpringHalo;
import mineplex.core.gadget.types.GadgetSet;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetTitan.java
index 360d86270..7c66a8f6c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetTitan.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailTitan;
-import mineplex.core.gadget.gadgets.death.DeathTitan;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpTitan;
-import mineplex.core.gadget.gadgets.particle.ParticleTitan;
+import mineplex.core.gadget.gadgets.arrowtrail.titan.ArrowTrailTitan;
+import mineplex.core.gadget.gadgets.death.titan.DeathTitan;
+import mineplex.core.gadget.gadgets.doublejump.titan.DoubleJumpTitan;
+import mineplex.core.gadget.gadgets.particle.titan.ParticleTitan;
import mineplex.core.gadget.types.GadgetSet;
public class SetTitan extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java
index 1a5541085..b070122de 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailBlood;
-import mineplex.core.gadget.gadgets.death.DeathBlood;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpBlood;
-import mineplex.core.gadget.gadgets.particle.ParticleBlood;
+import mineplex.core.gadget.gadgets.arrowtrail.vampire.ArrowTrailBlood;
+import mineplex.core.gadget.gadgets.death.vampire.DeathBlood;
+import mineplex.core.gadget.gadgets.doublejump.vampire.DoubleJumpBlood;
+import mineplex.core.gadget.gadgets.particle.vampire.ParticleBlood;
import mineplex.core.gadget.types.GadgetSet;
public class SetVampire extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java
index 5bbae55da..2d2ff0693 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java
@@ -1,10 +1,10 @@
package mineplex.core.gadget.set;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailEnchant;
-import mineplex.core.gadget.gadgets.death.DeathEnchant;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpEnchant;
-import mineplex.core.gadget.gadgets.particle.ParticleEnchant;
+import mineplex.core.gadget.gadgets.arrowtrail.wisdom.ArrowTrailEnchant;
+import mineplex.core.gadget.gadgets.death.wisdom.DeathEnchant;
+import mineplex.core.gadget.gadgets.doublejump.wisdom.DoubleJumpEnchant;
+import mineplex.core.gadget.gadgets.particle.wisdom.ParticleEnchant;
import mineplex.core.gadget.types.GadgetSet;
public class SetWisdom extends GadgetSet
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/FlagGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/FlagGadget.java
deleted file mode 100644
index 7b7d71883..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/FlagGadget.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package mineplex.core.gadget.types;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.LineFormat;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.flag.FlagType;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
-/**
- * Flags which sit upon players head.
- */
-public class FlagGadget extends Gadget
-{
- private final FlagType _flag;
-
- public FlagGadget(GadgetManager manager, FlagType flag)
- {
- super(manager, GadgetType.FLAG, flag.getFlag().getCountryAdjective() + " Flag",
- UtilText.splitLineToArray(C.cGray + "The flag of " + C.cWhite + flag.getFlag().getCountryName(), LineFormat.LORE),
- flag.getCost(), Material.WOOL, (byte) 0);
-
- setDisplayItem(flag.getFlag().getBanner());
- _flag = flag;
- }
-
- public void applyArmor(Player player, boolean message)
- {
- Manager.removeGadgetType(player, GadgetType.MORPH, this);
- Manager.removeGadgetType(player, GadgetType.FLAG, this);
- Manager.removeOutfit(player, OutfitGadget.ArmorSlot.HELMET);
-
- _active.add(player);
-
- if (message)
- {
- UtilPlayer.message(player, F.main("Gadget", "You unfurled your " + F.elem(getName()) + "."));
- }
- }
-
- public void removeArmor(Player player)
- {
- if (_active.remove(player))
- {
- UtilPlayer.message(player, F.main("Gadget", "You put away your " + F.elem(getName()) + "."));
- }
- }
-
- @Override
- public void enableCustom(Player player, boolean message)
- {
- applyArmor(player, message);
- ItemStack flag = _flag.getFlag().getBanner();
- ItemMeta meta = flag.getItemMeta();
- meta.setDisplayName(getDisplayName());
- flag.setItemMeta(meta);
- player.getInventory().setHelmet(flag);
- player.updateInventory();
- }
-
- @Override
- public void disableCustom(Player player, boolean message)
- {
- removeArmor(player);
- player.getInventory().setHelmet(new ItemStack(Material.AIR));
- player.updateInventory();
- }
-
- @EventHandler(priority = EventPriority.LOWEST)
- public void playerDeath(PlayerDeathEvent event)
- {
- disable(event.getEntity());
- }
-
- /**
- * @return The specific gadget which this represents.
- */
- public FlagType getFlagType()
- {
- return _flag;
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/GadgetType.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/GadgetType.java
index 386f764a4..edc823e6d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/GadgetType.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/GadgetType.java
@@ -18,8 +18,7 @@ public enum GadgetType
WIN_EFFECT("Win Effects", "activeWinEffect"),
GAME_MODIFIER("Game Modifiers", ""),
BALLOON("Balloons", ""),
- KIT_SELECTOR("Kit Selectors", "activeKitSelector"),
- FLAG("Flags", "activeFlag");
+ KIT_SELECTOR("Kit Selectors", "activeKitSelector");
private String _name;
private String _databaseKey;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java
index 38df4c367..b6becadc1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java
@@ -47,7 +47,7 @@ public abstract class HatGadget extends OutfitGadget
public void applyArmor(Player player, boolean message)
{
Manager.removeGadgetType(player, GadgetType.MORPH, this);
- Manager.removeGadgetType(player, GadgetType.FLAG, this);
+
Manager.removeOutfit(player, _slot);
_active.add(player);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java
index 7240ed1d5..4fb2b5ed9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java
@@ -26,8 +26,7 @@ public abstract class MorphGadget extends Gadget
public void applyArmor(Player player, boolean message)
{
Manager.removeGadgetType(player, GadgetType.MORPH, this);
- Manager.removeGadgetType(player, GadgetType.COSTUME, this);
- Manager.removeGadgetType(player, GadgetType.FLAG, this);
+ Manager.removeGadgetType(player, GadgetType.COSTUME);
_active.add(player);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java
index 78471a943..6ce4d70b7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java
@@ -60,12 +60,7 @@ public abstract class OutfitGadget extends Gadget
public void applyArmor(Player player, boolean message)
{
Manager.removeGadgetType(player, GadgetType.MORPH, this);
-
- if (_slot == ArmorSlot.HELMET)
- {
- Manager.removeGadgetType(player, GadgetType.FLAG, this);
- }
-
+
Manager.removeOutfit(player, _slot);
_active.add(player);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/TauntGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/TauntGadget.java
index c0b11870d..991a7425b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/TauntGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/TauntGadget.java
@@ -76,13 +76,11 @@ public abstract class TauntGadget extends Gadget
public void start(Player player)
{
- if (onStart(player))
- {
- _ticksPerPlayer.put(player.getUniqueId(), 0);
- }
+ onStart(player);
+ _ticksPerPlayer.put(player.getUniqueId(), 0);
}
- public abstract boolean onStart(Player player);
+ public abstract void onStart(Player player);
public void play(Player player)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
index ff998efee..137ae9bbe 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
@@ -39,7 +39,7 @@ public class MountTitanData extends MountData
//Nodes
_nodes = new ArrayList();
- for (int i=0 ; i<20 ; i++)
+ for (int i=0 ; i<30 ; i++)
{
ArmorStand node = loc.getWorld().spawn(loc, ArmorStand.class);
@@ -81,7 +81,7 @@ public class MountTitanData extends MountData
Location infront = _head.getLocation().add(0, -1.5, 0);
//Move
- for (int i=0 ; i<20 ; i++)
+ for (int i=0 ; i<30 ; i++)
{
ArmorStand node = _nodes.get(i);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/Reward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/Reward.java
index 281374325..ef209276e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/Reward.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/Reward.java
@@ -6,6 +6,9 @@ import org.bukkit.entity.Player;
import mineplex.core.common.util.Callback;
+/**
+ * Created by Shaun on 9/2/2014.
+ */
public abstract class Reward
{
protected static final Random RANDOM = new Random();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardData.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardData.java
index 6f3acd00b..8179dbb98 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardData.java
@@ -2,6 +2,9 @@ package mineplex.core.reward;
import org.bukkit.inventory.ItemStack;
+/**
+ * Created by shaun on 14-09-18.
+ */
public class RewardData
{
private final String _header;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
index 783e16317..5f4e5fb16 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
@@ -5,14 +5,6 @@ import java.util.EnumMap;
import java.util.List;
import java.util.Random;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailRedWhite;
-import mineplex.core.gadget.gadgets.death.DeathMapleLeaf;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpMaple;
-import mineplex.core.gadget.gadgets.flag.FlagType;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleAuraNiceness;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleCanadian;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleFreedomFireworks;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleStarSpangled;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@@ -23,46 +15,46 @@ import mineplex.core.common.Rank;
import mineplex.core.common.util.banner.CountryFlag;
import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailHalloween;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCandyCane;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCupid;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailEmerald;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailFreedom;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailFrostLord;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailStorm;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailMusic;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailConfetti;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailShadow;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailSpring;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailBlood;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailEnchant;
+import mineplex.core.gadget.gadgets.arrowtrail.halloween.ArrowTrailHalloween;
+import mineplex.core.gadget.gadgets.arrowtrail.candycane.ArrowTrailCandyCane;
+import mineplex.core.gadget.gadgets.arrowtrail.cupidslove.ArrowTrailCupid;
+import mineplex.core.gadget.gadgets.arrowtrail.emerald.ArrowTrailEmerald;
+import mineplex.core.gadget.gadgets.arrowtrail.freedom.ArrowTrailFreedom;
+import mineplex.core.gadget.gadgets.arrowtrail.frostlord.ArrowTrailFrostLord;
+import mineplex.core.gadget.gadgets.arrowtrail.howlingwinds.ArrowTrailStorm;
+import mineplex.core.gadget.gadgets.arrowtrail.music.ArrowTrailMusic;
+import mineplex.core.gadget.gadgets.arrowtrail.party.ArrowTrailConfetti;
+import mineplex.core.gadget.gadgets.arrowtrail.shadow.ArrowTrailShadow;
+import mineplex.core.gadget.gadgets.arrowtrail.spring.ArrowTrailSpring;
+import mineplex.core.gadget.gadgets.arrowtrail.vampire.ArrowTrailBlood;
+import mineplex.core.gadget.gadgets.arrowtrail.wisdom.ArrowTrailEnchant;
import mineplex.core.gadget.gadgets.balloons.BalloonType;
-import mineplex.core.gadget.gadgets.death.DeathCandyCane;
-import mineplex.core.gadget.gadgets.death.DeathPresentDanger;
-import mineplex.core.gadget.gadgets.death.DeathCupidsBrokenHeart;
-import mineplex.core.gadget.gadgets.death.DeathEmerald;
-import mineplex.core.gadget.gadgets.death.DeathFreedom;
-import mineplex.core.gadget.gadgets.death.DeathFrostLord;
-import mineplex.core.gadget.gadgets.death.DeathStorm;
-import mineplex.core.gadget.gadgets.death.DeathMusic;
-import mineplex.core.gadget.gadgets.death.DeathPinataBurst;
-import mineplex.core.gadget.gadgets.death.DeathShadow;
-import mineplex.core.gadget.gadgets.death.DeathSpring;
-import mineplex.core.gadget.gadgets.death.DeathBlood;
-import mineplex.core.gadget.gadgets.death.DeathEnchant;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpHalloween;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpCandyCane;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpCupidsWings;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpEmerald;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFreedom;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFrostLord;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpStorm;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpMusic;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFirecracker;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpShadow;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpSpring;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpBlood;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpEnchant;
+import mineplex.core.gadget.gadgets.death.candycane.DeathCandyCane;
+import mineplex.core.gadget.gadgets.death.christmas.DeathPresentDanger;
+import mineplex.core.gadget.gadgets.death.cupidslove.DeathCupidsBrokenHeart;
+import mineplex.core.gadget.gadgets.death.emerald.DeathEmerald;
+import mineplex.core.gadget.gadgets.death.freedom.DeathFreedom;
+import mineplex.core.gadget.gadgets.death.frostlord.DeathFrostLord;
+import mineplex.core.gadget.gadgets.death.howlingwinds.DeathStorm;
+import mineplex.core.gadget.gadgets.death.music.DeathMusic;
+import mineplex.core.gadget.gadgets.death.party.DeathPinataBurst;
+import mineplex.core.gadget.gadgets.death.shadow.DeathShadow;
+import mineplex.core.gadget.gadgets.death.spring.DeathSpring;
+import mineplex.core.gadget.gadgets.death.vampire.DeathBlood;
+import mineplex.core.gadget.gadgets.death.wisdom.DeathEnchant;
+import mineplex.core.gadget.gadgets.doublejump.halloween.DoubleJumpHalloween;
+import mineplex.core.gadget.gadgets.doublejump.candycane.DoubleJumpCandyCane;
+import mineplex.core.gadget.gadgets.doublejump.cupidslove.DoubleJumpCupidsWings;
+import mineplex.core.gadget.gadgets.doublejump.emerald.DoubleJumpEmerald;
+import mineplex.core.gadget.gadgets.doublejump.freedom.DoubleJumpFreedom;
+import mineplex.core.gadget.gadgets.doublejump.frostlord.DoubleJumpFrostLord;
+import mineplex.core.gadget.gadgets.doublejump.howlingwinds.DoubleJumpStorm;
+import mineplex.core.gadget.gadgets.doublejump.music.DoubleJumpMusic;
+import mineplex.core.gadget.gadgets.doublejump.party.DoubleJumpFirecracker;
+import mineplex.core.gadget.gadgets.doublejump.shadow.DoubleJumpShadow;
+import mineplex.core.gadget.gadgets.doublejump.spring.DoubleJumpSpring;
+import mineplex.core.gadget.gadgets.doublejump.vampire.DoubleJumpBlood;
+import mineplex.core.gadget.gadgets.doublejump.wisdom.DoubleJumpEnchant;
import mineplex.core.gadget.gadgets.gamemodifiers.minestrike.MineStrikeSkin;
import mineplex.core.gadget.gadgets.hat.HatType;
import mineplex.core.gadget.gadgets.item.ItemBatGun;
@@ -124,18 +116,18 @@ import mineplex.core.gadget.gadgets.particle.ParticleWingsInfernal;
import mineplex.core.gadget.gadgets.particle.ParticleWingsLove;
import mineplex.core.gadget.gadgets.particle.ParticleWingsPixie;
import mineplex.core.gadget.gadgets.particle.ParticleYinYang;
-import mineplex.core.gadget.gadgets.particle.ParticleCandyCane;
-import mineplex.core.gadget.gadgets.particle.ParticleHeart;
-import mineplex.core.gadget.gadgets.particle.ParticleEmerald;
+import mineplex.core.gadget.gadgets.particle.candycane.ParticleCandyCane;
+import mineplex.core.gadget.gadgets.particle.cupidslove.ParticleHeart;
+import mineplex.core.gadget.gadgets.particle.emerald.ParticleEmerald;
import mineplex.core.gadget.gadgets.particle.freedom.ParticleFreedom;
-import mineplex.core.gadget.gadgets.particle.ParticleFrostLord;
-import mineplex.core.gadget.gadgets.particle.ParticleRain;
-import mineplex.core.gadget.gadgets.particle.ParticleMusic;
-import mineplex.core.gadget.gadgets.particle.ParticlePartyTime;
-import mineplex.core.gadget.gadgets.particle.ParticleFoot;
+import mineplex.core.gadget.gadgets.particle.frostlord.ParticleFrostLord;
+import mineplex.core.gadget.gadgets.particle.howlingwinds.ParticleRain;
+import mineplex.core.gadget.gadgets.particle.music.ParticleMusic;
+import mineplex.core.gadget.gadgets.particle.party.ParticlePartyTime;
+import mineplex.core.gadget.gadgets.particle.shadow.ParticleFoot;
import mineplex.core.gadget.gadgets.particle.spring.ParticleSpringHalo;
-import mineplex.core.gadget.gadgets.particle.ParticleBlood;
-import mineplex.core.gadget.gadgets.particle.ParticleEnchant;
+import mineplex.core.gadget.gadgets.particle.vampire.ParticleBlood;
+import mineplex.core.gadget.gadgets.particle.wisdom.ParticleEnchant;
import mineplex.core.gadget.gadgets.taunts.BlowAKissTaunt;
import mineplex.core.gadget.gadgets.taunts.RainbowTaunt;
import mineplex.core.gadget.gadgets.wineffect.WinEffectBabyChicken;
@@ -326,10 +318,6 @@ public class RewardManager
addHat(Type.WINTER_HOLIDAY, HatType.PRESENT, rarity, 5);
addHat(Type.WINTER_HOLIDAY, HatType.SNOWMAN, rarity, 5);
- // FREEDOM
- addGadget(Type.FREEDOM, getGadget(ArrowTrailRedWhite.class), rarity, 150);
- addGadget(Type.FREEDOM, getGadget(ArrowTrailFreedom.class), rarity, 150);
-
// Omega items
addMusicReward(Type.OMEGA, "Blocks Disc", rarity, 25);
addMusicReward(Type.OMEGA, "Cat Disc", rarity, 25);
@@ -496,12 +484,9 @@ public class RewardManager
// FREEDOM
addHat(Type.FREEDOM, HatType.UNCLE_SAM, rarity, 100);
- addHat(Type.FREEDOM, HatType.AMERICA, rarity, 120);
- addHat(Type.FREEDOM, HatType.CANADA, rarity, 120);
addGadget(Type.FREEDOM, getGadget(DoubleJumpFreedom.class), rarity, 50);
- addGadget(Type.FREEDOM, getGadget(DoubleJumpMaple.class), rarity, 50);
+ addGadget(Type.FREEDOM, getGadget(ArrowTrailFreedom.class), rarity, 10);
addGadget(Type.FREEDOM, getGadget(DeathFreedom.class), rarity, 75);
- addGadget(Type.FREEDOM, getGadget(DeathMapleLeaf.class), rarity, 75);
// Omega Chest
addGadget(Type.OMEGA, getGadget(DoubleJumpFreedom.class), rarity, 5);
@@ -773,12 +758,6 @@ public class RewardManager
addMount(Type.FREEDOM, getMount(MountFreedomHorse.class), rarity, 1);
addGadget(Type.FREEDOM, getGadget(MorphUncleSam.class), rarity, 5);
addGadget(Type.FREEDOM, getGadget(ParticleFreedom.class), rarity, 50);
- addGadget(Type.FREEDOM, getGadget(ParticleFreedomFireworks.class), rarity, 95);
- addGadget(Type.FREEDOM, getGadget(ParticleAuraNiceness.class), rarity, 40);
- addGadget(Type.FREEDOM, getGadget(ParticleCanadian.class), rarity, 10);
- addGadget(Type.FREEDOM, getGadget(ParticleStarSpangled.class), rarity, 10);
- addFlag(Type.FREEDOM, FlagType.CANADA, rarity, 35);
- addFlag(Type.FREEDOM, FlagType.UNITED_STATES, rarity, 35);
// Omega items
addPetReward(Type.OMEGA, PetType.VILLAGER, rarity, 1);
@@ -1034,17 +1013,6 @@ public class RewardManager
return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards);
}
- public UnknownPackageReward addFlag(Type type, FlagType flagType, RewardRarity rarity, int weight)
- {
- return addFlag(type, flagType, rarity, weight, getShards(rarity));
- }
-
- public UnknownPackageReward addFlag(Type type, FlagType flagType, RewardRarity rarity, int weight, int shards)
- {
- Gadget gadget = _gadgetManager.getFlagGadget(flagType);
- return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards);
- }
-
public UnknownPackageReward addBalloon(Type type, BalloonType balloonType, RewardRarity rarity, int weight)
{
return addBalloon(type, balloonType, rarity, weight, getShards(rarity));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java
index eff019430..759769234 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardRarity.java
@@ -7,6 +7,9 @@ import org.bukkit.inventory.meta.ItemMeta;
import mineplex.core.common.util.C;
import static mineplex.core.common.util.C.*;
+/**
+ * Created by Shaun on 9/2/2014.
+ */
public enum RewardRarity
{
/**
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureFinishEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureFinishEvent.java
index 15a85c4dd..ca001e6a5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureFinishEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureFinishEvent.java
@@ -7,7 +7,7 @@ import org.bukkit.event.HandlerList;
import mineplex.core.treasure.Treasure;
/**
- * Called once a player has finished with the treasure opening process.
+ * Created by shaun on 14-09-12.
*/
public class TreasureFinishEvent extends Event
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasurePreStartEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasurePreStartEvent.java
index 29355cfd1..d384c61db 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasurePreStartEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasurePreStartEvent.java
@@ -7,7 +7,7 @@ import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/**
- * Called when a player selects a chest to open.
+ * Created by shaun on 14-09-12.
*/
public class TreasurePreStartEvent extends Event implements Cancellable
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureStartEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureStartEvent.java
index 37d59dc74..70c891f52 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureStartEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/event/TreasureStartEvent.java
@@ -10,9 +10,6 @@ import org.bukkit.event.HandlerList;
import mineplex.core.reward.Reward;
import mineplex.core.treasure.Treasure;
-/**
- * Called when a player is able to begin opening chests.
- */
public class TreasureStartEvent extends Event
{
private static final HandlerList handlers = new HandlerList();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
index 6c79d08c8..030e3dc1d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
@@ -4,15 +4,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailRedWhite;
-import mineplex.core.gadget.gadgets.death.DeathMapleLeaf;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpMaple;
-import mineplex.core.gadget.gadgets.flag.FlagType;
-import mineplex.core.gadget.gadgets.hat.HatType;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleAuraNiceness;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleCanadian;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleFreedomFireworks;
-import mineplex.core.gadget.gadgets.particle.freedom.ParticleStarSpangled;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@@ -29,9 +20,9 @@ import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailFreedom;
-import mineplex.core.gadget.gadgets.death.DeathFreedom;
-import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFreedom;
+import mineplex.core.gadget.gadgets.arrowtrail.freedom.ArrowTrailFreedom;
+import mineplex.core.gadget.gadgets.death.freedom.DeathFreedom;
+import mineplex.core.gadget.gadgets.doublejump.freedom.DoubleJumpFreedom;
import mineplex.core.gadget.gadgets.morph.MorphUncleSam;
import mineplex.core.gadget.gadgets.particle.freedom.ParticleFreedom;
import mineplex.core.gadget.types.Gadget;
@@ -150,7 +141,7 @@ public class TreasurePage extends ShopPageBase
int springCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.SPRING.getItemName());
boolean availableChristmas = false;
- boolean availableFreedom = true;
+ boolean availableFreedom = false;
boolean availableHaunted = false;
boolean availableTrick = false;
boolean availableThank = false;
@@ -161,8 +152,8 @@ public class TreasurePage extends ShopPageBase
List shardLore = new ArrayList<>();
shardLore.add(" ");
- shardLore.add(C.cGray + "These seem like they might come in");
- shardLore.add(C.cGray + "handy. Maybe I should collect more!");
+ shardLore.add(C.cGray + "This seems like it might come in");
+ shardLore.add(C.cGray + "handy. Maybe I can collect more!");
List basicLore = new ArrayList<>();
basicLore.add(" ");
@@ -263,36 +254,14 @@ public class TreasurePage extends ShopPageBase
freedomLore.add(C.cGray + "carved this chest himself from the wood");
freedomLore.add(C.cGray + "of the apple tree he cut down...");
freedomLore.add(" ");
-
- if (freedomCount > 0)
- {
- if (hasAllFreedomItems(getPlayer()))
- {
- freedomLore.add(C.cWhite + "You own all treasures from this chest.");
- }
- else
- {
- freedomLore.add(C.cGreen + "Click to Open!");
- }
- }
+ if (freedomCount > 0 && !hasAllFreedomItems(getPlayer()))
+ freedomLore.add(C.cGreen + "Click to Open!");
else
{
- if (!availableFreedom)
- {
- freedomLore.add(C.cRed + "This item is no longer available!");
- }
- else if (hasAllFreedomItems(getPlayer()))
- {
- freedomLore.add(C.cWhite + "You own all treasures from this chest.");
- }
- else
- {
- freedomLore.add(ChatColor.RESET + "Purchase at: " + C.cYellow + "www.mineplex.com/shop");
- }
+ freedomLore.add(C.cRed + "This item is no longer available!");
}
-
freedomLore.add(" ");
- freedomLore.add(ChatColor.RESET + C.cGreen + getFreedomUnlockedAmount(getPlayer()) + "/18 Unlocked");
+ freedomLore.add(ChatColor.RESET + C.cGreen + getFreedomUnlockedAmount(getPlayer()) + "/7 Unlocked");
List omegaLore = new ArrayList<>();
omegaLore.add(" ");
@@ -730,7 +699,7 @@ public class TreasurePage extends ShopPageBase
public int getFreedomUnlockedAmount(Player player)
{
if (hasAllFreedomItems(player))
- return 18;
+ return 7;
int amount = 0;
Gadget[] gadgets = new Gadget[]
{
@@ -739,18 +708,7 @@ public class TreasurePage extends ShopPageBase
_gadgetManager.getGadget(ArrowTrailFreedom.class),
_gadgetManager.getGadget(DoubleJumpFreedom.class),
_gadgetManager.getGadget(DeathFreedom.class),
- _gadgetManager.getGadget(MorphUncleSam.class),
- _gadgetManager.getGadget(ArrowTrailRedWhite.class),
- _gadgetManager.getGadget(DeathMapleLeaf.class),
- _gadgetManager.getGadget(DoubleJumpMaple.class),
- _gadgetManager.getGadget(ParticleAuraNiceness.class),
- _gadgetManager.getGadget(ParticleCanadian.class),
- _gadgetManager.getGadget(ParticleFreedomFireworks.class),
- _gadgetManager.getGadget(ParticleStarSpangled.class),
- _gadgetManager.getHatGadget(HatType.AMERICA),
- _gadgetManager.getHatGadget(HatType.CANADA),
- _gadgetManager.getFlagGadget(FlagType.CANADA),
- _gadgetManager.getFlagGadget(FlagType.UNITED_STATES),
+ _gadgetManager.getGadget(MorphUncleSam.class)
};
Mount freedomMount = _gadgetManager.getMountManager().getMount("Freedom Mount");
if (freedomMount != null)
diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java
index b02d21718..29e6ab472 100644
--- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java
+++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java
@@ -233,7 +233,7 @@ public class HubManager extends MiniPlugin implements IChatMessageFormatter
_treasureManager.addTreasureLocation(loc);
}
- new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager, boosterManager, punish);
+ new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager, boosterManager);
new MenuManager(_plugin);
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index eb7242bde..bc02c3628 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -235,7 +235,7 @@ public class HubManager extends MiniClientPlugin implements IChatMess
_bonusManager = new BonusManager(plugin, null, playWireManager, clientManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _gadgetManager, thankManager, "Carl");
_treasureManager = new TreasureManager(_plugin, clientManager, serverStatusManager, donationManager, _inventoryManager, petManager, _gadgetManager, _blockRestore, hologramManager, statsManager, _bonusManager.getRewardManager());
- CosmeticManager cosmeticManager = new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager, boosterManager, punish);
+ CosmeticManager cosmeticManager = new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager, boosterManager);
_mavericksManager = new MavericksManager(plugin, cosmeticManager, hologramManager, this);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
index 5f75dde80..ebf57b8d0 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
@@ -201,7 +201,7 @@ public class Arcade extends JavaPlugin
GadgetManager gadgetManager = new GadgetManager(this, _clientManager, _donationManager, inventoryManager, mountManager, petManager, preferenceManager, disguiseManager, blockRestore, projectileManager, achievementManager, packetHandler, hologramManager, incognito, castleManager);
ThankManager thankManager = new ThankManager(this, _clientManager, _donationManager);
BoosterManager boosterManager = new BoosterManager(this, _serverConfiguration.getServerGroup().getBoosterGroup(), _clientManager, _donationManager, inventoryManager, thankManager);
- CosmeticManager cosmeticManager = new CosmeticManager(this, _clientManager, _donationManager, inventoryManager, gadgetManager, mountManager, petManager, null, boosterManager, punish);
+ CosmeticManager cosmeticManager = new CosmeticManager(this, _clientManager, _donationManager, inventoryManager, gadgetManager, mountManager, petManager, null, boosterManager);
cosmeticManager.setInterfaceSlot(6);
gadgetManager.setActiveItemSlot(3);
cosmeticManager.disableTeamArmor();
diff --git a/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java b/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java
index 4fbb830fa..ebc01ac9c 100644
--- a/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java
+++ b/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java
@@ -138,7 +138,7 @@ public class Hub extends JavaPlugin
RewardManager rewardManager = new RewardManager(_clientManager, _donationManager, inventoryManager, petManager, gadgetManager, statsManager);
TreasureManager treasureManager = new TreasureManager(this, _clientManager, serverStatusManager, _donationManager, inventoryManager, petManager, gadgetManager, blockRestore, hologramManager, statsManager, rewardManager);
CosmeticManager cosmeticManager = new CosmeticManager(this, _clientManager, _donationManager, inventoryManager, gadgetManager,
- mountManager, petManager, treasureManager, boosterManager, punish);
+ mountManager, petManager, treasureManager, boosterManager);
cosmeticManager.setInterfaceSlot(7);
cosmeticManager.disableTeamArmor();
diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java
index b0df81d54..d4e557763 100644
--- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java
+++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java
@@ -258,7 +258,7 @@ public class GemHunters extends JavaPlugin
GadgetManager gadgetManager = new GadgetManager(this, clientManager, donationManager, inventoryManager, mountManager, petManager, preferenceManager, disguiseManager, blockRestore, projectileManager, achievementManager, packetHandler, hologramManager, incognito, castleManager);
ThankManager thankManager = new ThankManager(this, clientManager, donationManager);
BoosterManager boosterManager = new BoosterManager(this, null, clientManager, donationManager, inventoryManager, thankManager);
- CosmeticManager cosmeticManager = new CosmeticManager(this, clientManager, donationManager, inventoryManager, gadgetManager, mountManager, petManager, null, boosterManager, punish);
+ CosmeticManager cosmeticManager = new CosmeticManager(this, clientManager, donationManager, inventoryManager, gadgetManager, mountManager, petManager, null, boosterManager);
cosmeticManager.setActive(false);
cosmeticManager.setHideParticles(true);