From ef230a47c44bf0e890cfd3add9c5f05f3abddb3e Mon Sep 17 00:00:00 2001 From: mathiascode Date: Tue, 17 Dec 2019 17:12:51 +0200 Subject: [PATCH] Code formatting fixes --- .checkstyle | 14 + .classpath | 32 ++ .project | 29 + .settings/org.eclipse.jdt.core.prefs | 8 + build.sh | 2 - checkstyle.xml | 521 ------------------ pom.xml | 22 +- src/main/java/pw/kaboom/weapons/Main.java | 29 +- .../weapons/commands/CommandWeapons.java | 35 +- .../modules/player/PlayerReceiveWeapon.java | 9 +- .../modules/player/PlayerUseWeapon.java | 23 +- .../modules/weapons/WeaponAnvilDropper.java | 23 +- .../weapons/modules/weapons/WeaponArcher.java | 25 +- .../modules/weapons/WeaponArmageddon.java | 32 +- .../modules/weapons/WeaponBlobinator.java | 42 +- .../modules/weapons/WeaponGrenade.java | 22 +- .../weapons/modules/weapons/WeaponLaser.java | 30 +- .../modules/weapons/WeaponLightningStick.java | 17 +- .../modules/weapons/WeaponMachineGun.java | 123 ++--- .../weapons/modules/weapons/WeaponNuker.java | 34 +- .../weapons/modules/weapons/WeaponSniper.java | 25 +- suppressions.xml | 13 + 22 files changed, 332 insertions(+), 778 deletions(-) create mode 100755 .checkstyle create mode 100755 .classpath create mode 100755 .project create mode 100755 .settings/org.eclipse.jdt.core.prefs delete mode 100755 build.sh delete mode 100644 checkstyle.xml mode change 100644 => 100755 pom.xml mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/Main.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/commands/CommandWeapons.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/modules/weapons/WeaponBlobinator.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/modules/weapons/WeaponGrenade.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLaser.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLightningStick.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/modules/weapons/WeaponNuker.java mode change 100644 => 100755 src/main/java/pw/kaboom/weapons/modules/weapons/WeaponSniper.java create mode 100755 suppressions.xml diff --git a/.checkstyle b/.checkstyle new file mode 100755 index 0000000..f6865c9 --- /dev/null +++ b/.checkstyle @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/.classpath b/.classpath new file mode 100755 index 0000000..2613fe1 --- /dev/null +++ b/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100755 index 0000000..9d3ee2a --- /dev/null +++ b/.project @@ -0,0 +1,29 @@ + + + weapons + + + + + + org.eclipse.jdt.core.javabuilder + + + + + net.sf.eclipsecs.core.CheckstyleBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + net.sf.eclipsecs.core.CheckstyleNature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 0000000..fbcdb7f --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/build.sh b/build.sh deleted file mode 100755 index 628a9f5..0000000 --- a/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -mvn package \ No newline at end of file diff --git a/checkstyle.xml b/checkstyle.xml deleted file mode 100644 index e350ceb..0000000 --- a/checkstyle.xml +++ /dev/null @@ -1,521 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 297b26e..234e24f --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,8 @@ 1.7 1.7 + true + UTF-8 @@ -31,11 +33,6 @@ org.apache.maven.plugins maven-checkstyle-plugin 3.1.0 - - ${basedir}/checkstyle.xml - true - false - checkstyle @@ -44,21 +41,14 @@ check - false + + suppressions.xml + + true - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - - -Xlint:all - - - diff --git a/src/main/java/pw/kaboom/weapons/Main.java b/src/main/java/pw/kaboom/weapons/Main.java old mode 100644 new mode 100755 index dda6bad..0a21287 --- a/src/main/java/pw/kaboom/weapons/Main.java +++ b/src/main/java/pw/kaboom/weapons/Main.java @@ -4,23 +4,24 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.UUID; import org.bukkit.Material; - import org.bukkit.block.BlockFace; - import org.bukkit.plugin.java.JavaPlugin; -public class Main extends JavaPlugin { - HashSet faces = new HashSet<>(); - HashSet machineGunActive = new HashSet<>(); - List colors = new ArrayList<>(); +import pw.kaboom.weapons.commands.CommandWeapons; +import pw.kaboom.weapons.modules.player.PlayerReceiveWeapon; +import pw.kaboom.weapons.modules.player.PlayerUseWeapon; +import pw.kaboom.weapons.modules.weapons.*; + +public final class Main extends JavaPlugin { + private static HashSet blockFaces = new HashSet<>(); + private static List colors = new ArrayList<>(); public void onLoad() { /* Fill lists */ Collections.addAll( - faces, + blockFaces, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.WEST, @@ -61,8 +62,16 @@ public class Main extends JavaPlugin { /* Weapon Events */ this.getServer().getPluginManager().registerEvents(new WeaponArcher(), this); this.getServer().getPluginManager().registerEvents(new WeaponArmageddon(), this); - this.getServer().getPluginManager().registerEvents(new WeaponBlobinator(this), this); + this.getServer().getPluginManager().registerEvents(new WeaponBlobinator(), this); this.getServer().getPluginManager().registerEvents(new WeaponGrenade(), this); - this.getServer().getPluginManager().registerEvents(new WeaponMachineGun(this), this); + this.getServer().getPluginManager().registerEvents(new WeaponMachineGun(), this); + } + + public static HashSet getBlockFaces() { + return blockFaces; + } + + public static List getColors() { + return colors; } } diff --git a/src/main/java/pw/kaboom/weapons/commands/CommandWeapons.java b/src/main/java/pw/kaboom/weapons/commands/CommandWeapons.java old mode 100644 new mode 100755 index 8e44fb6..33dbe54 --- a/src/main/java/pw/kaboom/weapons/commands/CommandWeapons.java +++ b/src/main/java/pw/kaboom/weapons/commands/CommandWeapons.java @@ -1,22 +1,19 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.commands; import org.bukkit.Bukkit; import org.bukkit.Material; - import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; - import org.bukkit.entity.Player; - import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -class CommandWeapons implements CommandExecutor { - private void addWeapon(Inventory inventory, Material material, String name) { - final ItemStack item = new ItemStack​(material, 1); +public final class CommandWeapons implements CommandExecutor { + private void addWeapon(final Inventory inventory, final Material material, final String name) { + final ItemStack item = new ItemStack(material, 1); final ItemMeta itemMeta = item.getItemMeta(); itemMeta.setDisplayName(name); @@ -24,23 +21,23 @@ class CommandWeapons implements CommandExecutor { inventory.addItem(item); } - public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { + public boolean onCommand(final CommandSender sender, final Command cmd, final String label, final String[] args) { if (sender instanceof ConsoleCommandSender) { sender.sendMessage("Command has to be run by a player"); } else { final Player player = (Player) sender; final Inventory inventory = Bukkit.createInventory(null, 18, "Weapons"); - - addWeapon(inventory, Material.ANVIL, "§rAnvil Dropper"); - addWeapon(inventory, Material.SPECTRAL_ARROW, "§rArcher"); - addWeapon(inventory, Material.FIRE_CHARGE, "§rArmageddon"); - addWeapon(inventory, Material.MAGMA_CREAM, "§rBlobinator"); - addWeapon(inventory, Material.EGG, "§rGrenade"); - addWeapon(inventory, Material.BLAZE_POWDER, "§rLaser"); - addWeapon(inventory, Material.STICK, "§rLightning Stick"); - addWeapon(inventory, Material.GOLDEN_HORSE_ARMOR, "§rMachine Gun"); - addWeapon(inventory, Material.BLAZE_ROD, "§rNuker"); - addWeapon(inventory, Material.IRON_HORSE_ARMOR, "§rSniper"); + + addWeapon(inventory, Material.ANVIL, "\\\\u00A7rAnvil Dropper"); + addWeapon(inventory, Material.SPECTRAL_ARROW, "\\\\u00A7rArcher"); + addWeapon(inventory, Material.FIRE_CHARGE, "\\\\u00A7rArmageddon"); + addWeapon(inventory, Material.MAGMA_CREAM, "\\\\u00A7rBlobinator"); + addWeapon(inventory, Material.EGG, "\\\\u00A7rGrenade"); + addWeapon(inventory, Material.BLAZE_POWDER, "\\\\u00A7rLaser"); + addWeapon(inventory, Material.STICK, "\\\\u00A7rLightning Stick"); + addWeapon(inventory, Material.GOLDEN_HORSE_ARMOR, "\\\\u00A7rMachine Gun"); + addWeapon(inventory, Material.BLAZE_ROD, "\\\\u00A7rNuker"); + addWeapon(inventory, Material.IRON_HORSE_ARMOR, "\\\\u00A7rSniper"); player.openInventory(inventory); } return true; diff --git a/src/main/java/pw/kaboom/weapons/modules/player/PlayerReceiveWeapon.java b/src/main/java/pw/kaboom/weapons/modules/player/PlayerReceiveWeapon.java index 00750c1..ab18327 100755 --- a/src/main/java/pw/kaboom/weapons/modules/player/PlayerReceiveWeapon.java +++ b/src/main/java/pw/kaboom/weapons/modules/player/PlayerReceiveWeapon.java @@ -1,16 +1,14 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.player; import org.bukkit.entity.Player; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; - import org.bukkit.inventory.ItemStack; -class PlayerReceiveWeapon implements Listener { +public final class PlayerReceiveWeapon implements Listener { @EventHandler - void onInventoryClick(InventoryClickEvent event) { + void onInventoryClick(final InventoryClickEvent event) { if ("Weapons".equals(event.getView().getTitle())) { final ItemStack item = event.getCurrentItem(); final Player player = (Player) event.getWhoClicked(); @@ -21,3 +19,4 @@ class PlayerReceiveWeapon implements Listener { } } } + diff --git a/src/main/java/pw/kaboom/weapons/modules/player/PlayerUseWeapon.java b/src/main/java/pw/kaboom/weapons/modules/player/PlayerUseWeapon.java index 6ca8e95..359aaf0 100755 --- a/src/main/java/pw/kaboom/weapons/modules/player/PlayerUseWeapon.java +++ b/src/main/java/pw/kaboom/weapons/modules/player/PlayerUseWeapon.java @@ -1,25 +1,24 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.player; import org.bukkit.Material; - -import org.bukkit.entity.Player; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -class PlayerUseWeapon implements Listener { +import pw.kaboom.weapons.modules.weapons.*; + +public final class PlayerUseWeapon implements Listener { @EventHandler - void onPlayerInteract(PlayerInteractEvent event) { - if (event.hasItem() && - event.getItem().getItemMeta().hasDisplayName()) { + void onPlayerInteract(final PlayerInteractEvent event) { + if (event.hasItem() + && event.getItem().getItemMeta().hasDisplayName()) { final Action action = event.getAction(); final Material item = event.getMaterial(); final String name = event.getItem().getItemMeta().getDisplayName(); - if (action == Action.LEFT_CLICK_AIR || - action == Action.LEFT_CLICK_BLOCK) { + if (action == Action.LEFT_CLICK_AIR + || action == Action.LEFT_CLICK_BLOCK) { WeaponAnvilDropper.leftClick(item, name, event); WeaponArcher.leftClick(item, name, event); WeaponArmageddon.leftClick(item, name, event); @@ -27,8 +26,8 @@ class PlayerUseWeapon implements Listener { WeaponLightningStick.leftClick(item, name, event); WeaponNuker.leftClick(item, name, event); WeaponSniper.leftClick(item, name, event); - } else if (action == Action.RIGHT_CLICK_AIR || - action == Action.RIGHT_CLICK_BLOCK) { + } else if (action == Action.RIGHT_CLICK_AIR + || action == Action.RIGHT_CLICK_BLOCK) { WeaponGrenade.rightClick(item, name, event); WeaponLaser.rightClick(item, name, event); WeaponMachineGun.rightClick(item, name, event); diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponAnvilDropper.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponAnvilDropper.java index c6bdff0..1ed88c6 100755 --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponAnvilDropper.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponAnvilDropper.java @@ -1,17 +1,22 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; - import org.bukkit.event.player.PlayerInteractEvent; -class WeaponAnvilDropper { - static void leftClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.ANVIL && - "§rAnvil Dropper".equals(name)) { - for (int x = -2; x <= 2; x++) { - for (int z = -2; z <= 2; z++) { +public final class WeaponAnvilDropper { + private WeaponAnvilDropper() { + } + + public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.ANVIL + && "\\\\u00A7rAnvil Dropper".equals(name)) { + final int min = -2; + final int max = 2; + + for (int x = min; x <= max; x++) { + for (int z = min; z <= max; z++) { final Location blockLocation = event.getPlayer().getLocation().subtract(x, 0, z); final World world = event.getPlayer().getWorld(); @@ -24,4 +29,4 @@ class WeaponAnvilDropper { event.setCancelled(true); } } -} \ No newline at end of file +} diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArcher.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArcher.java index 79f1d42..e959aba 100755 --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArcher.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArcher.java @@ -1,32 +1,31 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.World; - import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.entity.SpectralArrow; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerInteractEvent; - import org.bukkit.util.Vector; import com.destroystokyo.paper.event.entity.ProjectileCollideEvent; -class WeaponArcher implements Listener { - static void leftClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.SPECTRAL_ARROW && - "§rArcher".equals(name)) { +public final class WeaponArcher implements Listener { + public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.SPECTRAL_ARROW + && "\\\\u00A7rArcher".equals(name)) { final Player player = event.getPlayer(); final World world = player.getWorld(); - for (int i = 0; i <= 20; i++) { + final int maxArrowCount = 20; + + for (int i = 0; i <= maxArrowCount; i++) { final double randomX = (Math.random() * ((15 + 15) + 1)) - 15; final double randomY = (Math.random() * ((15 + 15) + 1)) - 15; final double randomZ = (Math.random() * ((15 + 15) + 1)) - 15; @@ -61,16 +60,16 @@ class WeaponArcher implements Listener { /* Make shooter invulnerable to weapon projectiles */ @EventHandler - void onProjectileCollide(ProjectileCollideEvent event) { + private void onProjectileCollide(final ProjectileCollideEvent event) { if (event.getEntityType() == EntityType.SPECTRAL_ARROW) { final Projectile projectile = event.getEntity(); if ("WeaponArcherArrow".equals(projectile.getCustomName())) { final Entity collidedWith = event.getCollidedWith(); - if (collidedWith.getType() == EntityType.PLAYER && - projectile.getShooter() instanceof Player && - ((Player) projectile.getShooter()).getUniqueId().equals(collidedWith.getUniqueId())) { + if (collidedWith.getType() == EntityType.PLAYER + && projectile.getShooter() instanceof Player + && ((Player) projectile.getShooter()).getUniqueId().equals(collidedWith.getUniqueId())) { event.setCancelled(true); } } diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArmageddon.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArmageddon.java index fc455c8..64c2902 100755 --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArmageddon.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArmageddon.java @@ -1,38 +1,40 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.World; - import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Fireball; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerInteractEvent; - import org.bukkit.util.Vector; import com.destroystokyo.paper.event.entity.ProjectileCollideEvent; -class WeaponArmageddon implements Listener { - static void leftClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.FIRE_CHARGE && - "§rArmageddon".equals(name)) { +public final class WeaponArmageddon implements Listener { + public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.FIRE_CHARGE + && "\\\\u00A7rArmageddon".equals(name)) { final Player player = event.getPlayer(); final World world = player.getWorld(); - for (int i = -12; i <= 12; i += 4) { + final int min = -12; + final int max = 12; + final int iteratorSpacing = 4; + + for (int i = min; i <= max; i += iteratorSpacing) { final Location eyeLocation = player.getEyeLocation(); final double x = i * Math.cos(Math.toRadians(eyeLocation.getYaw())); final double z = i * Math.sin(Math.toRadians(eyeLocation.getYaw())); final Vector velocity = eyeLocation.getDirection().multiply(12); + final int yield = 5; final Fireball fireball = (Fireball) world.spawnEntity( eyeLocation.add(x, 0, z), @@ -43,7 +45,7 @@ class WeaponArmageddon implements Listener { fireball.setCustomName("WeaponArmegaddonCharge"); fireball.setDirection(velocity); fireball.setShooter(player); - fireball.setYield(5); + fireball.setYield(yield); } final Location eyeLocation = player.getEyeLocation(); @@ -62,17 +64,17 @@ class WeaponArmageddon implements Listener { /* Make shooter invulnerable to weapon projectiles, and prevent charges from colliding with each other */ @EventHandler - void onProjectileCollide(ProjectileCollideEvent event) { + private void onProjectileCollide(final ProjectileCollideEvent event) { if (event.getEntityType() == EntityType.FIREBALL) { final Projectile projectile = event.getEntity(); if ("WeaponArmegaddonCharge".equals(projectile.getCustomName())) { final Entity collidedWith = event.getCollidedWith(); - if ((collidedWith.getType() == EntityType.PLAYER && - projectile.getShooter() instanceof Player && - ((Player) projectile.getShooter()).getUniqueId().equals(collidedWith.getUniqueId())) || - collidedWith.getType() == EntityType.FIREBALL) { + if ((collidedWith.getType() == EntityType.PLAYER + && projectile.getShooter() instanceof Player + && ((Player) projectile.getShooter()).getUniqueId().equals(collidedWith.getUniqueId())) + || collidedWith.getType() == EntityType.FIREBALL) { event.setCancelled(true); } } diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponBlobinator.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponBlobinator.java old mode 100644 new mode 100755 index 62a7d26..3bcf808 --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponBlobinator.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponBlobinator.java @@ -1,4 +1,4 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import java.util.Random; @@ -6,33 +6,25 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.World; - import org.bukkit.block.Block; import org.bukkit.block.BlockFace; - import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.entity.Snowball; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.player.PlayerInteractEvent; - import org.bukkit.util.Vector; import com.destroystokyo.paper.event.entity.ProjectileCollideEvent; +import pw.kaboom.weapons.Main; -class WeaponBlobinator implements Listener { - Main main; - WeaponBlobinator(Main main) { - this.main = main; - } - - static void leftClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.MAGMA_CREAM && - "§rBlobinator".equals(name)) { +public final class WeaponBlobinator implements Listener { + public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.MAGMA_CREAM + && "\\\\u00A7rBlobinator".equals(name)) { final Player player = event.getPlayer(); final Location eyeLocation = player.getEyeLocation(); final Vector velocity = eyeLocation.getDirection().multiply(8); @@ -56,17 +48,17 @@ class WeaponBlobinator implements Listener { } } - private void createBlobSplash(World world, int x, int y, int z, int radius, Block hitBlock, Material color) { + private void createBlobSplash(final World world, final int x, final int y, final int z, final int radius, final Block hitBlock, final Material color) { final Location blockLocation = hitBlock.getLocation().add(x, y, z); if (blockLocation.distance(hitBlock.getLocation()) <= radius) { final Block block = world.getBlockAt(blockLocation); - if (block.getType() != Material.AIR && - block.getType() != Material.CAVE_AIR) { - for (BlockFace face : main.faces) { - if (block.getRelative(face).getType() == Material.AIR || - block.getRelative(face).getType() == Material.CAVE_AIR) { + if (block.getType() != Material.AIR + && block.getType() != Material.CAVE_AIR) { + for (BlockFace face : Main.getBlockFaces()) { + if (block.getRelative(face).getType() == Material.AIR + || block.getRelative(face).getType() == Material.CAVE_AIR) { block.setType(color); } } @@ -75,7 +67,7 @@ class WeaponBlobinator implements Listener { } @EventHandler - void onProjectileCollide(ProjectileCollideEvent event) { + private void onProjectileCollide(final ProjectileCollideEvent event) { if (event.getEntityType() == EntityType.SNOWBALL) { final Projectile projectile = event.getEntity(); @@ -86,17 +78,17 @@ class WeaponBlobinator implements Listener { } @EventHandler - void onProjectileHit(ProjectileHitEvent event) { + private void onProjectileHit(final ProjectileHitEvent event) { if (event.getEntityType() == EntityType.SNOWBALL) { final Block hitBlock = event.getHitBlock(); final Projectile projectile = event.getEntity(); - if (hitBlock != null && - "WeaponBlobinatorBall".equals(projectile.getCustomName())) { + if (hitBlock != null + && "WeaponBlobinatorBall".equals(projectile.getCustomName())) { final int radius = 4; final World world = projectile.getWorld(); final Random random = new Random(); - final Material color = main.colors.get(random.nextInt(main.colors.size())); + final Material color = Main.getColors().get(random.nextInt(Main.getColors().size())); for (int x = -radius; x < radius; x++) { for (int y = -radius; y < radius; y++) { diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponGrenade.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponGrenade.java old mode 100644 new mode 100755 index e9784e0..b46311e --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponGrenade.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponGrenade.java @@ -1,27 +1,23 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.World; - import org.bukkit.entity.Egg; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.player.PlayerEggThrowEvent; import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.util.Vector; - -class WeaponGrenade implements Listener { - static void rightClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.EGG && - "§rGrenade".equals(name)) { +public final class WeaponGrenade implements Listener { + public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.EGG + && "\\u00A7rGrenade".equals(name)) { event.setCancelled(true); final Player player = event.getPlayer(); @@ -30,7 +26,7 @@ class WeaponGrenade implements Listener { final Egg egg = player.launchProjectile(Egg.class); egg.setCustomName("WeaponGrenade"); egg.setShooter(player); - + final World world = player.getWorld(); final float volume = 1.0F; final float pitch = 1.0F; @@ -45,14 +41,14 @@ class WeaponGrenade implements Listener { } @EventHandler - void onPlayerEggThrow(PlayerEggThrowEvent event) { + private void onPlayerEggThrow(final PlayerEggThrowEvent event) { if ("WeaponGrenade".equals(event.getEgg().getCustomName())) { event.setHatching(false); } } - + @EventHandler - void onProjectileHit(ProjectileHitEvent event) { + private void onProjectileHit(final ProjectileHitEvent event) { if (event.getEntityType() == EntityType.EGG) { final Projectile projectile = event.getEntity(); diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLaser.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLaser.java old mode 100644 new mode 100755 index 4bd883f..f10375e --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLaser.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLaser.java @@ -1,8 +1,6 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import java.util.Random; -import java.util.Set; - import org.bukkit.Color; import org.bukkit.Location; import org.bukkit.Material; @@ -11,16 +9,18 @@ import org.bukkit.Sound; import org.bukkit.World; import org.bukkit.entity.Player; - import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.util.BlockIterator; import org.bukkit.util.Vector; -class WeaponLaser { - static void rightClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.BLAZE_POWDER && - "§rLaser".equals(name)) { +public final class WeaponLaser { + private WeaponLaser() { + } + + public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.BLAZE_POWDER + && "\\\\u00A7rLaser".equals(name)) { final Player player = event.getPlayer(); final Location eyeLocation = player.getEyeLocation(); final Vector direction = eyeLocation.getDirection(); @@ -64,13 +64,13 @@ class WeaponLaser { yOffset, distance ); - + while (blockIterator.hasNext()) { blockIterator.next().breakNaturally(); } - float volume = 0.8F; - float pitch = 63.0F; + final float volume = 0.8F; + final float pitch = 63.0F; world.playSound( eyeLocation, @@ -79,14 +79,14 @@ class WeaponLaser { pitch ); - volume = 1.0F; - pitch = 20.0F; + final float volume2 = 1.0F; + final float pitch2 = 20.0F; world.playSound( eyeLocation, Sound.ENTITY_FIREWORK_ROCKET_BLAST, - volume, - pitch + volume2, + pitch2 ); event.setCancelled(true); } diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLightningStick.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLightningStick.java old mode 100644 new mode 100755 index 9b9ce06..f2abb1a --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLightningStick.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLightningStick.java @@ -1,18 +1,21 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import java.util.Set; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; - import org.bukkit.event.player.PlayerInteractEvent; -class WeaponLightningStick { - static void leftClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.STICK && - "§rLightning Stick".equals(name)) { - final Location lookLocation = event.getPlayer().getTargetBlock((Set) null, 100).getLocation(); +public final class WeaponLightningStick { + private WeaponLightningStick() { + } + + public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.STICK + && "\\\\u00A7rLightning Stick".equals(name)) { + final int maxDistance = 100; + final Location lookLocation = event.getPlayer().getTargetBlock((Set) null, maxDistance).getLocation(); final World world = event.getPlayer().getWorld(); world.strikeLightning(lookLocation); diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java old mode 100644 new mode 100755 index 80412f6..14b1d1c --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java @@ -1,95 +1,84 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; +import java.util.HashSet; import java.util.UUID; -import org.bukkit.Color; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.Particle; import org.bukkit.Sound; import org.bukkit.World; - import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.entity.TippedArrow; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.player.PlayerInteractEvent; - +import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; - import org.bukkit.scheduler.BukkitRunnable; - import org.bukkit.util.Vector; import com.destroystokyo.paper.event.entity.ProjectileCollideEvent; +import pw.kaboom.weapons.Main; -class WeaponMachineGun implements Listener { - static Main main; - WeaponMachineGun(Main main) { - this.main = main; - } +public final class WeaponMachineGun implements Listener { + private static HashSet machineGunActive = new HashSet<>(); - static void rightClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.GOLDEN_HORSE_ARMOR && - "§rMachine Gun".equals(name)) { + public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.GOLDEN_HORSE_ARMOR + && "\\\\u00A7rMachine Gun".equals(name)) { final UUID playerUUID = event.getPlayer().getUniqueId(); - if (!main.machineGunActive.contains(playerUUID)) { - main.machineGunActive.add(playerUUID); - final PlayerInteractEvent eventMachine = event; + if (!machineGunActive.contains(playerUUID)) { + machineGunActive.add(playerUUID); + final int maxBulletCount = 20; - new BukkitRunnable() { - int i = 0; - public void run() { - i++; + for (int i = 0; i < maxBulletCount; i++) { + new BukkitRunnable() { + public void run() { + final Player player = event.getPlayer(); + final Location eyeLocation = player.getEyeLocation(); + final World world = player.getWorld(); + final Vector velocity = eyeLocation.getDirection().multiply(12); - final Player player = eventMachine.getPlayer(); - final Location eyeLocation = player.getEyeLocation(); - final World world = player.getWorld(); - final Vector velocity = eyeLocation.getDirection().multiply(12); + final TippedArrow arrow = player.launchProjectile(TippedArrow.class); - final TippedArrow arrow = player.launchProjectile(TippedArrow.class); - - final int duration = 90000; - final int amplifier = 3; - final boolean ambient = true; - final boolean particles = false; - - final PotionEffect harm = new PotionEffect( - PotionEffectType.HARM, - duration, - amplifier, - ambient, - particles - ); - - arrow.setCustomName("WeaponMachineGunBullet"); - arrow.addCustomEffect(harm, true); - arrow.setShooter(player); - arrow.setVelocity(velocity); - - final float volume = 1.0F; - final float pitch = 63.0F; - - world.playSound( - eyeLocation, - Sound.ENTITY_GENERIC_EXPLODE, - volume, - pitch - ); - - if (i == 20) { - main.machineGunActive.remove(playerUUID); - cancel(); + final int duration = 90000; + final int amplifier = 3; + final boolean ambient = true; + final boolean particles = false; + + final PotionEffect harm = new PotionEffect( + PotionEffectType.HARM, + duration, + amplifier, + ambient, + particles + ); + + arrow.setCustomName("WeaponMachineGunBullet"); + arrow.addCustomEffect(harm, true); + arrow.setShooter(player); + arrow.setVelocity(velocity); + + final float volume = 1.0F; + final float pitch = 63.0F; + + world.playSound( + eyeLocation, + Sound.ENTITY_GENERIC_EXPLODE, + volume, + pitch + ); } - } - }.runTaskTimer(main, 0L, 1L); + }.runTask(JavaPlugin.getPlugin(Main.class)); + } + + machineGunActive.remove(playerUUID); } event.setCancelled(true); } @@ -97,16 +86,16 @@ class WeaponMachineGun implements Listener { /* Make shooter invulnerable to weapon projectiles */ @EventHandler - void onProjectileCollide(ProjectileCollideEvent event) { + private void onProjectileCollide(final ProjectileCollideEvent event) { if (event.getEntityType() == EntityType.TIPPED_ARROW) { final Projectile projectile = event.getEntity(); if ("WeaponMachineGunBullet".equals(projectile.getCustomName())) { final Entity collidedWith = event.getCollidedWith(); - if (collidedWith.getType() == EntityType.PLAYER && - projectile.getShooter() instanceof Player && - ((Player) projectile.getShooter()).getUniqueId().equals(collidedWith.getUniqueId())) { + if (collidedWith.getType() == EntityType.PLAYER + && projectile.getShooter() instanceof Player + && ((Player) projectile.getShooter()).getUniqueId().equals(collidedWith.getUniqueId())) { event.setCancelled(true); } } @@ -114,7 +103,7 @@ class WeaponMachineGun implements Listener { } @EventHandler - void onProjectileHit(ProjectileHitEvent event) { + private void onProjectileHit(final ProjectileHitEvent event) { if (event.getEntityType() == EntityType.TIPPED_ARROW) { final Projectile projectile = event.getEntity(); diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponNuker.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponNuker.java old mode 100644 new mode 100755 index cb55ba1..86d1e3d --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponNuker.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponNuker.java @@ -1,43 +1,45 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.World; - import org.bukkit.entity.Fireball; import org.bukkit.entity.Player; - import org.bukkit.event.player.PlayerInteractEvent; - import org.bukkit.util.Vector; -class WeaponNuker { - static void leftClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.BLAZE_ROD && - "§rNuker".equals(name)) { +public final class WeaponNuker { + private WeaponNuker() { + } + + public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.BLAZE_ROD + && "\\\\u00A7rNuker".equals(name)) { final Player player = event.getPlayer(); final Location eyeLocation = player.getEyeLocation(); final Vector velocity = eyeLocation.getDirection().multiply(10); + final int yield = 8; final Fireball fireball = player.launchProjectile(Fireball.class); fireball.setShooter(player); fireball.setVelocity(velocity); - fireball.setYield(8); + fireball.setYield(yield); final World world = player.getWorld(); - final float volume1 = 0.9F; - final float pitch1 = 1.5F; - final float volume2 = 0.8F; - final float pitch2 = 2.0F; + final float volume = 0.9F; + final float pitch = 1.5F; world.playSound( eyeLocation, Sound.ENTITY_GHAST_SHOOT, - volume1, - pitch1 + volume, + pitch ); - + + final float volume2 = 0.8F; + final float pitch2 = 2.0F; + world.playSound( eyeLocation, Sound.ENTITY_BAT_TAKEOFF, diff --git a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponSniper.java b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponSniper.java old mode 100644 new mode 100755 index 584d183..0badd0f --- a/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponSniper.java +++ b/src/main/java/pw/kaboom/weapons/modules/weapons/WeaponSniper.java @@ -1,24 +1,23 @@ -package pw.kaboom.weapons; +package pw.kaboom.weapons.modules.weapons; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.World; - import org.bukkit.entity.Player; import org.bukkit.entity.Snowball; - import org.bukkit.event.player.PlayerInteractEvent; - import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; - import org.bukkit.util.Vector; -class WeaponSniper { - static void leftClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.IRON_HORSE_ARMOR && - "§rSniper".equals(name)) { +public final class WeaponSniper { + private WeaponSniper() { + } + + public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.IRON_HORSE_ARMOR + && "\\\\u00A7rSniper".equals(name)) { final Player player = event.getPlayer(); final Location eyeLocation = player.getEyeLocation(); final Vector velocity = eyeLocation.getDirection().multiply(12); @@ -41,11 +40,11 @@ class WeaponSniper { } } - static void rightClick(Material item, String name, PlayerInteractEvent event) { - if (item == Material.IRON_HORSE_ARMOR && - "§rSniper".equals(name)) { + public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) { + if (item == Material.IRON_HORSE_ARMOR + && "\\\\u00A7rSniper".equals(name)) { final Player player = event.getPlayer(); - + if (player.hasPotionEffect(PotionEffectType.SLOW)) { player.removePotionEffect(PotionEffectType.SLOW); } else { diff --git a/suppressions.xml b/suppressions.xml new file mode 100755 index 0000000..3b75716 --- /dev/null +++ b/suppressions.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file