diff --git a/.gitignore b/.gitignore index e19d689..f4b312e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ local.properties .settings/ .loadpath .recommenders +.checkstyle # External tool builders .externalToolBuilders/ diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 0000000..d47e1d3 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index a146a68..4703b35 100644 --- a/pom.xml +++ b/pom.xml @@ -1,100 +1,125 @@ - - 4.0.0 - me.choco - AlchemicalArrows - 3.2.1 - AlchemicalArrows - Arrows with alchemical properties, each performing thematic in-world effects + + 4.0.0 + me.choco + AlchemicalArrows + 3.2.1 + AlchemicalArrows + Arrows with alchemical properties, each performing thematic in-world effects - - 1.8 - 1.8 - + + 1.8 + 1.8 + - - - - src/main/resources - true - - + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.1 + + + + checkstyle + + + + + checkstyle.xml + UTF-8 + true + true + + + + - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - - org.bstats - wtf.choco.arrows.utils.metrics - - - - - - package - - shade - - - - - - + + + + src/main/resources + true + + - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - worldedit-repo - http://maven.sk89q.com/repo/ - - - bstats-repo - https://repo.codemc.org/repository/maven-public - - - jitpack.io - https://jitpack.io - - + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + + org.bstats + wtf.choco.arrows.utils.metrics + + + + + + package + + shade + + + + + + - - - org.bukkit - bukkit - 1.16.4-R0.1-SNAPSHOT - provided - - - org.jetbrains - annotations - 17.0.0 - provided - + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + worldedit-repo + http://maven.sk89q.com/repo/ + + + bstats-repo + https://repo.codemc.org/repository/maven-public + + + jitpack.io + https://jitpack.io + + - - org.bstats - bstats-bukkit - 1.4 - compile - + + + org.bukkit + bukkit + 1.16.4-R0.1-SNAPSHOT + provided + + + org.jetbrains + annotations + 17.0.0 + provided + - - com.sk89q.worldguard - worldguard-bukkit - 7.0.5-SNAPSHOT - provided - - - com.github.2008Choco - Alchema - 1.0.2.0 - provided - - + + org.bstats + bstats-bukkit + 1.4 + compile + + + + com.sk89q.worldguard + worldguard-bukkit + 7.0.5-SNAPSHOT + provided + + + com.github.2008Choco + Alchema + 1.0.2.0 + provided + + \ No newline at end of file diff --git a/src/main/java/wtf/choco/arrows/AlchemicalArrows.java b/src/main/java/wtf/choco/arrows/AlchemicalArrows.java index ae014b0..7131b6f 100644 --- a/src/main/java/wtf/choco/arrows/AlchemicalArrows.java +++ b/src/main/java/wtf/choco/arrows/AlchemicalArrows.java @@ -19,7 +19,6 @@ import org.bukkit.inventory.ShapedRecipe; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -316,4 +315,4 @@ private Block blockFromString(@NotNull String value) { return (x != Integer.MIN_VALUE && y != Integer.MIN_VALUE && z != Integer.MIN_VALUE) ? world.getBlockAt(x, y, z) : null; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/api/AlchemicalArrow.java b/src/main/java/wtf/choco/arrows/api/AlchemicalArrow.java index 33c901a..e0b8c0b 100644 --- a/src/main/java/wtf/choco/arrows/api/AlchemicalArrow.java +++ b/src/main/java/wtf/choco/arrows/api/AlchemicalArrow.java @@ -17,7 +17,6 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.projectiles.BlockProjectileSource; - import org.jetbrains.annotations.NotNull; import wtf.choco.arrows.AlchemicalArrows; @@ -261,4 +260,4 @@ public boolean equals(Object object) { return object == this || (object instanceof AlchemicalArrow && Objects.equals(getKey(), ((AlchemicalArrow) object).getKey())); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/api/AlchemicalArrowEntity.java b/src/main/java/wtf/choco/arrows/api/AlchemicalArrowEntity.java index 6570c41..9f1eeeb 100644 --- a/src/main/java/wtf/choco/arrows/api/AlchemicalArrowEntity.java +++ b/src/main/java/wtf/choco/arrows/api/AlchemicalArrowEntity.java @@ -1,9 +1,9 @@ package wtf.choco.arrows.api; -import java.util.Objects; - import com.google.common.base.Preconditions; +import java.util.Objects; + import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Arrow; @@ -103,4 +103,4 @@ public boolean equals(Object object) { return Objects.equals(implementation, other.implementation) && Objects.equals(arrow, other.arrow); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowEvent.java b/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowEvent.java index e0083e3..4c3d0f1 100644 --- a/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowEvent.java +++ b/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowEvent.java @@ -28,4 +28,4 @@ public AlchemicalArrowEntity getArrow() { return arrow; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowShootEvent.java b/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowShootEvent.java index f64a8d4..57fedd6 100644 --- a/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowShootEvent.java +++ b/src/main/java/wtf/choco/arrows/api/event/AlchemicalArrowShootEvent.java @@ -60,4 +60,4 @@ public static HandlerList getHandlerList() { return HANDLERS; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/api/property/ArrowProperty.java b/src/main/java/wtf/choco/arrows/api/property/ArrowProperty.java index 62d6f88..8d27245 100644 --- a/src/main/java/wtf/choco/arrows/api/property/ArrowProperty.java +++ b/src/main/java/wtf/choco/arrows/api/property/ArrowProperty.java @@ -1,9 +1,9 @@ package wtf.choco.arrows.api.property; -import java.util.Objects; - import com.google.common.base.Preconditions; +import java.util.Objects; + import org.bukkit.Keyed; import org.bukkit.NamespacedKey; import org.jetbrains.annotations.NotNull; @@ -93,7 +93,7 @@ public boolean equals(Object object) { } private static NamespacedKey key(String value) { - return new NamespacedKey(AlchemicalArrows.getInstance(), value); + return new NamespacedKey(AlchemicalArrows.getInstance(), value); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/api/property/PropertyMap.java b/src/main/java/wtf/choco/arrows/api/property/PropertyMap.java index 7e3f790..c63a1b3 100644 --- a/src/main/java/wtf/choco/arrows/api/property/PropertyMap.java +++ b/src/main/java/wtf/choco/arrows/api/property/PropertyMap.java @@ -94,7 +94,7 @@ public T getPropertyValue(@NotNull ArrowProperty property) { */ @NotNull public Optional getProperty(@NotNull ArrowProperty property, @Nullable T defaultValue) { - return Optional.ofNullable(property.getType().cast(properties.getOrDefault(property, defaultValue))); + return Optional.ofNullable(property.getType().cast(properties.getOrDefault(property, defaultValue))); } /** @@ -111,7 +111,7 @@ public Optional getProperty(@NotNull ArrowProperty property, @Nullable */ @NotNull public Optional getProperty(@NotNull ArrowProperty property) { - return getProperty(property, property.getDefaultValue()); + return getProperty(property, property.getDefaultValue()); } /** @@ -131,4 +131,4 @@ public void clearProperties() { this.properties.clear(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowAir.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowAir.java index dcfa4c9..27eb2e4 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowAir.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowAir.java @@ -107,4 +107,4 @@ public void hitEntityEventHandler(AlchemicalArrowEntity arrow, EntityDamageByEnt arrow.getArrow().remove(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowChain.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowChain.java index a9b3951..5a3fc92 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowChain.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowChain.java @@ -96,4 +96,4 @@ private void attemptChain(Arrow source, ProjectileSource shooter, LivingEntity h } } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowConfusion.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowConfusion.java index 13ec2db..f4481d6 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowConfusion.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowConfusion.java @@ -55,4 +55,4 @@ public void onHitEntity(AlchemicalArrowEntity arrow, Entity entity) { ((Creature) entity).setTarget(null); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDarkness.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDarkness.java index 438f035..d3bc66a 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDarkness.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDarkness.java @@ -45,4 +45,4 @@ public void onHitPlayer(AlchemicalArrowEntity arrow, Player player) { world.spawnParticle(Particle.EXPLOSION_NORMAL, player.getLocation(), 10, 0, 0, 0); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDeath.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDeath.java index 127d0b6..952303d 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDeath.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowDeath.java @@ -80,4 +80,4 @@ private void attemptInstantDeath(Arrow source, LivingEntity entity) { entity.damage(entity.getHealth(), source); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEarth.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEarth.java index 8d24c70..ad06211 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEarth.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEarth.java @@ -70,4 +70,4 @@ private void burryEntity(LivingEntity entity) { entity.addPotionEffect(SLOWNESS_EFFECT); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEnder.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEnder.java index 14bc2fd..2be6fbc 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEnder.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowEnder.java @@ -99,4 +99,4 @@ private void swapLocations(Arrow source, LivingEntity shooter, LivingEntity targ world.spawnParticle(Particle.PORTAL, target.getLocation(), 5, 1, 1, 1); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowExplosive.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowExplosive.java index da4feb2..797ef04 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowExplosive.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowExplosive.java @@ -59,4 +59,4 @@ public AlchemicalArrowEntity createNewArrow(Arrow arrow) { return new ArrowEntityFused(this, arrow, properties.getProperty(PROPERTY_FUSE_TICKS).orElse(40)); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFire.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFire.java index c42e745..a2f161b 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFire.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFire.java @@ -47,4 +47,4 @@ public void onHitEntity(AlchemicalArrowEntity arrow, Entity entity) { entity.setFireTicks(40 + RANDOM.nextInt(61)); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFrost.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFrost.java index 685f70c..1450cd0 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFrost.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowFrost.java @@ -107,4 +107,4 @@ private void freezeRadius(AlchemicalArrowEntity arrow, Location location) { } } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowGrapple.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowGrapple.java index afdad04..79601c2 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowGrapple.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowGrapple.java @@ -61,4 +61,4 @@ public void onHitBlock(AlchemicalArrowEntity arrow, Block block) { bukkitArrow.remove(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowInternal.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowInternal.java index 600df93..75b2138 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowInternal.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowInternal.java @@ -27,7 +27,7 @@ abstract class AlchemicalArrowInternal extends AlchemicalArrow { private final String name; protected AlchemicalArrowInternal(AlchemicalArrows plugin, String key, String defaultName, int defaultModelData) { - FileConfiguration config = plugin.getConfig(); + FileConfiguration config = plugin.getConfig(); this.key = new NamespacedKey(plugin, key.toLowerCase()); String nameRaw = config.getString("Arrow." + key + ".Item.DisplayName", defaultName); @@ -88,4 +88,4 @@ public boolean onShootFromPlayer(AlchemicalArrowEntity arrow, Player player) { return player.hasPermission("arrows.shoot." + key.getKey()); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLife.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLife.java index aba490e..fccc83b 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLife.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLife.java @@ -1,9 +1,9 @@ package wtf.choco.arrows.arrow; -import java.util.concurrent.ThreadLocalRandom; - import com.sk89q.worldguard.bukkit.WorldGuardPlugin; +import java.util.concurrent.ThreadLocalRandom; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -126,4 +126,4 @@ public void hitEntityEventHandler(AlchemicalArrowEntity arrow, EntityDamageByEnt event.setDamage(0); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLight.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLight.java index 6ff1819..d55d2f4 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLight.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowLight.java @@ -61,4 +61,4 @@ private void applyEffect(LivingEntity entity) { entity.teleport(upwards); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagic.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagic.java index 161dddd..c3e43e4 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagic.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagic.java @@ -62,4 +62,4 @@ private void launchEntity(Arrow source, LivingEntity entity) { entity.getWorld().playSound(entity.getLocation(), Sound.ENTITY_BAT_TAKEOFF, 1, 2); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagnetic.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagnetic.java index 94d4cea..f6e64bf 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagnetic.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowMagnetic.java @@ -115,4 +115,4 @@ private void pullEntity(Arrow source, LivingEntity entity) { entity.getWorld().playSound(entity.getLocation(), Sound.ENTITY_BAT_TAKEOFF, 1, 2); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowNecrotic.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowNecrotic.java index a13758d..17524c7 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowNecrotic.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowNecrotic.java @@ -70,4 +70,4 @@ private void lifeSap(Entity shooter, double damage) { source.setHealth(Math.max(source.getHealth() + (damage / 2), (attributeMaxHealth != null) ? attributeMaxHealth.getValue() : 20)); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowWater.java b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowWater.java index 290e562..34d5472 100644 --- a/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowWater.java +++ b/src/main/java/wtf/choco/arrows/arrow/AlchemicalArrowWater.java @@ -47,4 +47,4 @@ public AlchemicalArrowEntity createNewArrow(Arrow arrow) { return new ArrowEntityWater(this, arrow, arrow.getVelocity()); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityFused.java b/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityFused.java index 8facf6d..8565323 100644 --- a/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityFused.java +++ b/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityFused.java @@ -37,4 +37,4 @@ public boolean isFuseFinished() { return fuse >= maxFuseTicks; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityWater.java b/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityWater.java index 6cb3cd4..1526b18 100644 --- a/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityWater.java +++ b/src/main/java/wtf/choco/arrows/arrow/entity/ArrowEntityWater.java @@ -29,4 +29,4 @@ public Vector getVelocity() { return velocity.clone(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/commands/AlchemicalArrowsCommand.java b/src/main/java/wtf/choco/arrows/commands/AlchemicalArrowsCommand.java index 3c7c80a..1d5006a 100644 --- a/src/main/java/wtf/choco/arrows/commands/AlchemicalArrowsCommand.java +++ b/src/main/java/wtf/choco/arrows/commands/AlchemicalArrowsCommand.java @@ -1,7 +1,5 @@ package wtf.choco.arrows.commands; -import static wtf.choco.arrows.AlchemicalArrows.CHAT_PREFIX; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -13,7 +11,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; import org.bukkit.util.StringUtil; - import org.jetbrains.annotations.NotNull; import wtf.choco.arrows.AlchemicalArrows; @@ -22,6 +19,8 @@ import wtf.choco.arrows.util.UpdateChecker; import wtf.choco.arrows.util.UpdateChecker.UpdateResult; +import static wtf.choco.arrows.AlchemicalArrows.CHAT_PREFIX; + public class AlchemicalArrowsCommand implements TabExecutor { private final AlchemicalArrows plugin; @@ -63,7 +62,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String else if (args[0].equalsIgnoreCase("version") || args[0].equalsIgnoreCase("info")) { sender.sendMessage(ChatColor.GOLD.toString() + ChatColor.BOLD.toString() + ChatColor.STRIKETHROUGH + "--------------------------------------------"); - sender.sendMessage(ChatColor.DARK_AQUA.toString() + ChatColor.BOLD + "Version: " + ChatColor.GRAY + plugin.getDescription().getVersion()); + sender.sendMessage(ChatColor.DARK_AQUA.toString() + ChatColor.BOLD + "Version: " + ChatColor.GRAY + plugin.getDescription().getVersion()); sender.sendMessage(ChatColor.DARK_AQUA.toString() + ChatColor.BOLD + "Developer / Maintainer: " + ChatColor.GRAY + "2008Choco" + ChatColor.YELLOW + "( https://choco.gg/ )"); sender.sendMessage(ChatColor.DARK_AQUA.toString() + ChatColor.BOLD + "Development Page: " + ChatColor.GRAY + "https://www.spigotmc.org/resources/alchemicalarrows.11693/"); sender.sendMessage(ChatColor.DARK_AQUA.toString() + ChatColor.BOLD + "Report Bugs To: " + ChatColor.GRAY + "https://github.com/2008Choco/AlchemicalArrows/issues/"); @@ -100,4 +99,4 @@ public List onTabComplete(CommandSender sender, Command command, String return args.length == 1 ? StringUtil.copyPartialMatches(args[0], BASE_ARGS, new ArrayList<>()) : Collections.emptyList(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/commands/GiveArrowCommand.java b/src/main/java/wtf/choco/arrows/commands/GiveArrowCommand.java index 2ba64ad..02efcc7 100644 --- a/src/main/java/wtf/choco/arrows/commands/GiveArrowCommand.java +++ b/src/main/java/wtf/choco/arrows/commands/GiveArrowCommand.java @@ -1,7 +1,5 @@ package wtf.choco.arrows.commands; -import static wtf.choco.arrows.AlchemicalArrows.CHAT_PREFIX; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -18,7 +16,6 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; - import org.jetbrains.annotations.NotNull; import wtf.choco.alchema.util.NamespacedKeyUtil; @@ -27,6 +24,8 @@ import wtf.choco.arrows.registry.ArrowRegistry; import wtf.choco.arrows.util.MathUtil; +import static wtf.choco.arrows.AlchemicalArrows.CHAT_PREFIX; + public class GiveArrowCommand implements TabExecutor { private final AlchemicalArrows plugin; @@ -129,4 +128,4 @@ else if (args.length == 3) { return Collections.emptyList(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/commands/SummonArrowCommand.java b/src/main/java/wtf/choco/arrows/commands/SummonArrowCommand.java index 5342da9..94857d1 100644 --- a/src/main/java/wtf/choco/arrows/commands/SummonArrowCommand.java +++ b/src/main/java/wtf/choco/arrows/commands/SummonArrowCommand.java @@ -1,7 +1,5 @@ package wtf.choco.arrows.commands; -import static wtf.choco.arrows.AlchemicalArrows.CHAT_PREFIX; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -23,7 +21,6 @@ import org.bukkit.projectiles.ProjectileSource; import org.bukkit.util.StringUtil; import org.bukkit.util.Vector; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,6 +32,8 @@ import wtf.choco.arrows.util.MathUtil; import wtf.choco.arrows.util.NamespacedKeyUtil; +import static wtf.choco.arrows.AlchemicalArrows.CHAT_PREFIX; + public class SummonArrowCommand implements TabExecutor { // /summonarrow [x] [y] [z] [world] [velocityX] [velocityY] [velocityZ] @@ -154,4 +153,4 @@ private List buildTupleSuggestions(String[] args, int startIndex, String return suggestions; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/ArrowHitEntityListener.java b/src/main/java/wtf/choco/arrows/listeners/ArrowHitEntityListener.java index 9555fec..9ea3932 100644 --- a/src/main/java/wtf/choco/arrows/listeners/ArrowHitEntityListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/ArrowHitEntityListener.java @@ -5,7 +5,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.jetbrains.annotations.NotNull; import wtf.choco.arrows.AlchemicalArrows; import wtf.choco.arrows.api.AlchemicalArrow; @@ -15,7 +14,7 @@ public final class ArrowHitEntityListener implements Listener { private final AlchemicalArrows plugin; - public ArrowHitEntityListener(@NotNull AlchemicalArrows plugin) { + public ArrowHitEntityListener(AlchemicalArrows plugin) { this.plugin = plugin; } @@ -35,4 +34,4 @@ public void onAlchemicalArrowHitEntity(EntityDamageByEntityEvent event) { type.onHitEntity(alchemicalArrow, event.getEntity()); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/ArrowHitGroundListener.java b/src/main/java/wtf/choco/arrows/listeners/ArrowHitGroundListener.java index 273fd57..1ebd911 100644 --- a/src/main/java/wtf/choco/arrows/listeners/ArrowHitGroundListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/ArrowHitGroundListener.java @@ -5,7 +5,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.ProjectileHitEvent; -import org.jetbrains.annotations.NotNull; import wtf.choco.arrows.AlchemicalArrows; import wtf.choco.arrows.api.AlchemicalArrow; @@ -15,7 +14,7 @@ public final class ArrowHitGroundListener implements Listener { private final AlchemicalArrows plugin; - public ArrowHitGroundListener(@NotNull AlchemicalArrows plugin) { + public ArrowHitGroundListener(AlchemicalArrows plugin) { this.plugin = plugin; } @@ -40,4 +39,4 @@ public void onAlchemicalArrowHitGround(ProjectileHitEvent event) { type.onHitBlock(alchemicalArrow, hit); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/ArrowHitPlayerListener.java b/src/main/java/wtf/choco/arrows/listeners/ArrowHitPlayerListener.java index d6cbe9f..10c39ca 100644 --- a/src/main/java/wtf/choco/arrows/listeners/ArrowHitPlayerListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/ArrowHitPlayerListener.java @@ -64,7 +64,7 @@ public void onAlchemicalArrowHitPlayer(EntityDamageByEntityEvent event) { // Check state of damaged if (event.isCancelled() || !query.testState(BukkitAdapter.adapt(player.getLocation()), null, Flags.PVP)) { - if (arrow.getShooter() instanceof Player){ + if (arrow.getShooter() instanceof Player) { ((Player) source).sendMessage(AlchemicalArrows.CHAT_PREFIX + "This player is protected from PvP"); } @@ -79,4 +79,4 @@ public void onAlchemicalArrowHitPlayer(EntityDamageByEntityEvent event) { type.onHitPlayer(alchemicalArrow, player); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/ArrowRecipeDiscoverListener.java b/src/main/java/wtf/choco/arrows/listeners/ArrowRecipeDiscoverListener.java index 906dfca..e7c128e 100644 --- a/src/main/java/wtf/choco/arrows/listeners/ArrowRecipeDiscoverListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/ArrowRecipeDiscoverListener.java @@ -30,4 +30,4 @@ public void clearRecipeKeys() { this.recipeKeys.clear(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/CraftingPermissionListener.java b/src/main/java/wtf/choco/arrows/listeners/CraftingPermissionListener.java index 12d1e14..faa6f85 100644 --- a/src/main/java/wtf/choco/arrows/listeners/CraftingPermissionListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/CraftingPermissionListener.java @@ -4,7 +4,6 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.PrepareItemCraftEvent; import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; import wtf.choco.arrows.AlchemicalArrows; import wtf.choco.arrows.api.AlchemicalArrow; @@ -13,12 +12,12 @@ public final class CraftingPermissionListener implements Listener { private final AlchemicalArrows plugin; - public CraftingPermissionListener(@NotNull AlchemicalArrows plugin) { + public CraftingPermissionListener(AlchemicalArrows plugin) { this.plugin = plugin; } @EventHandler - public void onPrepareCraftingRecipe(PrepareItemCraftEvent event){ + public void onPrepareCraftingRecipe(PrepareItemCraftEvent event) { ItemStack item = event.getInventory().getResult(); if (item == null || event.getViewers().isEmpty()) { return; @@ -34,4 +33,4 @@ public void onPrepareCraftingRecipe(PrepareItemCraftEvent event){ } } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/CustomDeathMessageListener.java b/src/main/java/wtf/choco/arrows/listeners/CustomDeathMessageListener.java index 9be0267..cbceb54 100644 --- a/src/main/java/wtf/choco/arrows/listeners/CustomDeathMessageListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/CustomDeathMessageListener.java @@ -12,7 +12,6 @@ import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.projectiles.BlockProjectileSource; import org.bukkit.projectiles.ProjectileSource; -import org.jetbrains.annotations.NotNull; import wtf.choco.arrows.AlchemicalArrows; import wtf.choco.arrows.api.AlchemicalArrowEntity; @@ -21,7 +20,7 @@ public final class CustomDeathMessageListener implements Listener { private final AlchemicalArrows plugin; - public CustomDeathMessageListener(@NotNull AlchemicalArrows plugin) { + public CustomDeathMessageListener(AlchemicalArrows plugin) { this.plugin = plugin; } @@ -68,4 +67,4 @@ else if (source instanceof BlockProjectileSource) { } } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/PickupArrowListener.java b/src/main/java/wtf/choco/arrows/listeners/PickupArrowListener.java index 4feb896..f33e1a1 100644 --- a/src/main/java/wtf/choco/arrows/listeners/PickupArrowListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/PickupArrowListener.java @@ -6,8 +6,6 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerPickupArrowEvent; -import org.jetbrains.annotations.NotNull; - import wtf.choco.arrows.AlchemicalArrows; import wtf.choco.arrows.api.AlchemicalArrowEntity; @@ -15,7 +13,7 @@ public final class PickupArrowListener implements Listener { private final AlchemicalArrows plugin; - public PickupArrowListener(@NotNull AlchemicalArrows plugin) { + public PickupArrowListener(AlchemicalArrows plugin) { this.plugin = plugin; } @@ -35,4 +33,4 @@ public void onPickupArrow(PlayerPickupArrowEvent event) { event.getItem().setItemStack(alchemicalArrow.getImplementation().createItemStack()); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/ProjectileShootListener.java b/src/main/java/wtf/choco/arrows/listeners/ProjectileShootListener.java index acf0628..9a9bcb8 100644 --- a/src/main/java/wtf/choco/arrows/listeners/ProjectileShootListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/ProjectileShootListener.java @@ -26,8 +26,6 @@ import org.bukkit.projectiles.BlockProjectileSource; import org.bukkit.projectiles.ProjectileSource; -import org.jetbrains.annotations.NotNull; - import wtf.choco.arrows.AlchemicalArrows; import wtf.choco.arrows.api.AlchemicalArrow; import wtf.choco.arrows.api.AlchemicalArrowEntity; @@ -42,7 +40,7 @@ public final class ProjectileShootListener implements Listener { private final AlchemicalArrows plugin; - public ProjectileShootListener(@NotNull AlchemicalArrows plugin) { + public ProjectileShootListener(AlchemicalArrows plugin) { this.plugin = plugin; } @@ -158,4 +156,4 @@ else if (entity instanceof Skeleton) { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/listeners/SkeletonKillListener.java b/src/main/java/wtf/choco/arrows/listeners/SkeletonKillListener.java index 787bc8c..e98f405 100644 --- a/src/main/java/wtf/choco/arrows/listeners/SkeletonKillListener.java +++ b/src/main/java/wtf/choco/arrows/listeners/SkeletonKillListener.java @@ -11,8 +11,6 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; - -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import wtf.choco.arrows.AlchemicalArrows; @@ -25,7 +23,7 @@ public final class SkeletonKillListener implements Listener { private final AlchemicalArrows plugin; - public SkeletonKillListener(@NotNull AlchemicalArrows plugin) { + public SkeletonKillListener(AlchemicalArrows plugin) { this.plugin = plugin; } @@ -76,4 +74,4 @@ public ItemStack getWeightedRandom() { return item; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/persistence/PersistentDataTypeNamespacedKey.java b/src/main/java/wtf/choco/arrows/persistence/PersistentDataTypeNamespacedKey.java index 01fb0fb..c28378c 100644 --- a/src/main/java/wtf/choco/arrows/persistence/PersistentDataTypeNamespacedKey.java +++ b/src/main/java/wtf/choco/arrows/persistence/PersistentDataTypeNamespacedKey.java @@ -3,7 +3,6 @@ import org.bukkit.NamespacedKey; import org.bukkit.persistence.PersistentDataAdapterContext; import org.bukkit.persistence.PersistentDataType; - import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/wtf/choco/arrows/registry/ArrowRegistry.java b/src/main/java/wtf/choco/arrows/registry/ArrowRegistry.java index 54a775a..62434ea 100644 --- a/src/main/java/wtf/choco/arrows/registry/ArrowRegistry.java +++ b/src/main/java/wtf/choco/arrows/registry/ArrowRegistry.java @@ -17,7 +17,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataContainer; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/wtf/choco/arrows/registry/ArrowStateManager.java b/src/main/java/wtf/choco/arrows/registry/ArrowStateManager.java index 2ec6ce7..815271a 100644 --- a/src/main/java/wtf/choco/arrows/registry/ArrowStateManager.java +++ b/src/main/java/wtf/choco/arrows/registry/ArrowStateManager.java @@ -1,5 +1,7 @@ package wtf.choco.arrows.registry; +import com.google.common.base.Preconditions; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -7,8 +9,6 @@ import java.util.UUID; import java.util.stream.Collectors; -import com.google.common.base.Preconditions; - import org.bukkit.World; import org.bukkit.entity.Arrow; import org.bukkit.entity.Entity; @@ -152,4 +152,4 @@ public void clear() { this.entities.clear(); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/util/ArrowUpdateTask.java b/src/main/java/wtf/choco/arrows/util/ArrowUpdateTask.java index 68a3179..ae0b0fa 100644 --- a/src/main/java/wtf/choco/arrows/util/ArrowUpdateTask.java +++ b/src/main/java/wtf/choco/arrows/util/ArrowUpdateTask.java @@ -7,7 +7,6 @@ import org.bukkit.entity.Arrow; import org.bukkit.scheduler.BukkitRunnable; - import org.jetbrains.annotations.NotNull; import wtf.choco.arrows.AlchemicalArrows; @@ -55,4 +54,4 @@ public static ArrowUpdateTask startArrowUpdateTask(@NotNull AlchemicalArrows plu return instance; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/util/ItemBuilder.java b/src/main/java/wtf/choco/arrows/util/ItemBuilder.java index 14ee783..0cc997b 100644 --- a/src/main/java/wtf/choco/arrows/util/ItemBuilder.java +++ b/src/main/java/wtf/choco/arrows/util/ItemBuilder.java @@ -1,13 +1,13 @@ package wtf.choco.arrows.util; +import com.google.common.base.Preconditions; + import java.util.Arrays; import java.util.EnumSet; import java.util.List; import java.util.Set; import java.util.function.Consumer; -import com.google.common.base.Preconditions; - import org.bukkit.Material; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; @@ -310,4 +310,4 @@ public ItemStack build() { return item; } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/util/MathUtil.java b/src/main/java/wtf/choco/arrows/util/MathUtil.java index 86638d0..59932c5 100644 --- a/src/main/java/wtf/choco/arrows/util/MathUtil.java +++ b/src/main/java/wtf/choco/arrows/util/MathUtil.java @@ -37,4 +37,4 @@ public static float clamp(float value, float min, float max) { return (value < min ? min : (value > max ? max : value)); } -} \ No newline at end of file +} diff --git a/src/main/java/wtf/choco/arrows/util/NamespacedKeyUtil.java b/src/main/java/wtf/choco/arrows/util/NamespacedKeyUtil.java index 101aa7b..b0c789f 100644 --- a/src/main/java/wtf/choco/arrows/util/NamespacedKeyUtil.java +++ b/src/main/java/wtf/choco/arrows/util/NamespacedKeyUtil.java @@ -7,7 +7,6 @@ import org.bukkit.NamespacedKey; import org.bukkit.plugin.Plugin; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/wtf/choco/arrows/util/UpdateChecker.java b/src/main/java/wtf/choco/arrows/util/UpdateChecker.java index e2f7a0d..8263e05 100644 --- a/src/main/java/wtf/choco/arrows/util/UpdateChecker.java +++ b/src/main/java/wtf/choco/arrows/util/UpdateChecker.java @@ -15,7 +15,6 @@ import org.apache.commons.lang.math.NumberUtils; import org.bukkit.plugin.java.JavaPlugin; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 6196b24..2fb9724 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -65,7 +65,7 @@ Arrow: - "&dThis arrow is so... confusing" - "&dWhat does this do again?" CustomModelData: 133 - + Darkness: RecipeYield: 8 AllowInfinity: false @@ -79,7 +79,7 @@ Arrow: - "&8Who turned off the lights!?" - "&8Applies a temporary blindness effect to players" CustomModelData: 134 - + Death: RecipeYield: 8 AllowInfinity: false @@ -96,7 +96,7 @@ Arrow: - "&8Are you sure holding this is a good idea?" - "&8A sinister arrow. May instantly kill targets" CustomModelData: 135 - + Earth: RecipeYield: 8 AllowInfinity: false @@ -110,7 +110,7 @@ Arrow: - "&7Better than the Moon in my opinion" - "&7Burries damaged entities into the ground" CustomModelData: 136 - + Ender: RecipeYield: 8 AllowInfinity: false @@ -126,7 +126,7 @@ Arrow: - "&dIt's almost like a portal gun, but cooler" - "&dSwaps positions with damaged entities" CustomModelData: 137 - + Explosive: RecipeYield: 8 AllowInfinity: false @@ -143,7 +143,7 @@ Arrow: - "&4&lBoom!" - "&4Ignites a fuse and explodes after hitting ground" CustomModelData: 138 - + Fire: RecipeYield: 8 AllowInfinity: false @@ -157,7 +157,7 @@ Arrow: - "&cGather around the campfire..." - "&cIgnites damaged entities for 2 - 3 seconds" CustomModelData: 139 - + Frost: RecipeYield: 8 AllowInfinity: false @@ -173,7 +173,7 @@ Arrow: - "&bChill out. Snow reason to be angry" - "&bDamaged entities cannot move temporarily" CustomModelData: 140 - + Grapple: RecipeYield: 8 AllowInfinity: false @@ -189,7 +189,7 @@ Arrow: - "&eNa na na na, na na na na, na na na na..." - "&e&lBATMAN!" CustomModelData: 141 - + Life: RecipeYield: 8 AllowInfinity: false @@ -205,7 +205,7 @@ Arrow: - "&aThe gift of life embewed within an arrow" - "&aA harmless arrow. Inflicts no damage & applies regen" CustomModelData: 142 - + Light: RecipeYield: 8 AllowInfinity: false @@ -221,7 +221,7 @@ Arrow: - "&eMay the power of Zeus be upon you!" - "&eStrikes damaged entities with lightning" CustomModelData: 143 - + Magic: RecipeYield: 8 AllowInfinity: false @@ -235,7 +235,7 @@ Arrow: - "&dIt's almost... &k| &dMAGICAL &k|" - "&dLaunches entities backwards with great force" CustomModelData: 144 - + Magnetic: RecipeYield: 8 AllowInfinity: false @@ -251,7 +251,7 @@ Arrow: - "&7Opposites attract, likes repel" - "&7Pulls damaged entities closer to you" CustomModelData: 145 - + Necrotic: RecipeYield: 8 AllowInfinity: false @@ -265,7 +265,7 @@ Arrow: - "&2Count Dracula would be proud" - "&2Nearby hostile entities target damaged entities" CustomModelData: 146 - + Water: RecipeYield: 8 AllowInfinity: false @@ -278,4 +278,4 @@ Arrow: Lore: - "&9Navigates quite well underwater" - "&9It's as though it doesn't lose any velocity" - CustomModelData: 147 \ No newline at end of file + CustomModelData: 147 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d096b96..1bdeb96 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -78,4 +78,4 @@ permissions: arrows.command.killallarrows: true arrows.command.reload: true arrows.command.givearrow: true - arrows.command.summonarrow: true \ No newline at end of file + arrows.command.summonarrow: true