mirror of
https://github.com/kaboomserver/weapons.git
synced 2024-06-02 18:31:22 +00:00
Replace legacy message strings with components
This commit is contained in:
parent
d987bf8c7e
commit
eab0d51e58
|
@ -10,13 +10,15 @@ import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class CommandWeapons implements CommandExecutor {
|
public final class CommandWeapons implements CommandExecutor {
|
||||||
private void addWeapon(final Inventory inventory, final Material material, final String name) {
|
private void addWeapon(final Inventory inventory, final Material material,
|
||||||
|
final Component name) {
|
||||||
final ItemStack item = new ItemStack(material, 1);
|
final ItemStack item = new ItemStack(material, 1);
|
||||||
final ItemMeta itemMeta = item.getItemMeta();
|
final ItemMeta itemMeta = item.getItemMeta();
|
||||||
|
|
||||||
itemMeta.setDisplayName(name);
|
itemMeta.displayName(name);
|
||||||
item.setItemMeta(itemMeta);
|
item.setItemMeta(itemMeta);
|
||||||
inventory.addItem(item);
|
inventory.addItem(item);
|
||||||
}
|
}
|
||||||
|
@ -25,21 +27,21 @@ public final class CommandWeapons implements CommandExecutor {
|
||||||
public boolean onCommand(final CommandSender sender, final Command cmd, final String label,
|
public boolean onCommand(final CommandSender sender, final Command cmd, final String label,
|
||||||
final String[] args) {
|
final String[] args) {
|
||||||
if (sender instanceof ConsoleCommandSender) {
|
if (sender instanceof ConsoleCommandSender) {
|
||||||
sender.sendMessage("Command has to be run by a player");
|
sender.sendMessage(Component.text("Command has to be run by a player"));
|
||||||
} else {
|
} else {
|
||||||
final Player player = (Player) sender;
|
final Player player = (Player) sender;
|
||||||
final Inventory inventory = Bukkit.createInventory(null, 18, "Weapons");
|
final Inventory inventory = Bukkit.createInventory(null, 18, Component.text("Weapons"));
|
||||||
|
|
||||||
addWeapon(inventory, Material.ANVIL, "§rAnvil Dropper");
|
addWeapon(inventory, Material.ANVIL, Component.text("Anvil Dropper"));
|
||||||
addWeapon(inventory, Material.SPECTRAL_ARROW, "§rArcher");
|
addWeapon(inventory, Material.SPECTRAL_ARROW, Component.text("Archer"));
|
||||||
addWeapon(inventory, Material.FIRE_CHARGE, "§rArmageddon");
|
addWeapon(inventory, Material.FIRE_CHARGE, Component.text("Armageddon"));
|
||||||
addWeapon(inventory, Material.MAGMA_CREAM, "§rBlobinator");
|
addWeapon(inventory, Material.MAGMA_CREAM, Component.text("Blobinator"));
|
||||||
addWeapon(inventory, Material.EGG, "§rGrenade");
|
addWeapon(inventory, Material.EGG, Component.text("Grenade"));
|
||||||
addWeapon(inventory, Material.BLAZE_POWDER, "§rLaser");
|
addWeapon(inventory, Material.BLAZE_POWDER, Component.text("Laser"));
|
||||||
addWeapon(inventory, Material.STICK, "§rLightning Stick");
|
addWeapon(inventory, Material.STICK, Component.text("Lightning Stick"));
|
||||||
addWeapon(inventory, Material.GOLDEN_HORSE_ARMOR, "§rMachine Gun");
|
addWeapon(inventory, Material.GOLDEN_HORSE_ARMOR, Component.text("Machine Gun"));
|
||||||
addWeapon(inventory, Material.BLAZE_ROD, "§rNuker");
|
addWeapon(inventory, Material.BLAZE_ROD, Component.text("Nuker"));
|
||||||
addWeapon(inventory, Material.IRON_HORSE_ARMOR, "§rSniper");
|
addWeapon(inventory, Material.IRON_HORSE_ARMOR, Component.text("Sniper"));
|
||||||
player.openInventory(inventory);
|
player.openInventory(inventory);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -6,20 +6,26 @@ import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class PlayerReceiveWeapon implements Listener {
|
public final class PlayerReceiveWeapon implements Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onInventoryClick(final InventoryClickEvent event) {
|
void onInventoryClick(final InventoryClickEvent event) {
|
||||||
if (event.isCancelled() || !"Weapons".equals(event.getView().getTitle())) {
|
if (event.isCancelled() || !Component.text("Weapons").equals(event.getView().title())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final ItemStack item = event.getCurrentItem();
|
final ItemStack item = event.getCurrentItem();
|
||||||
final String weaponName = item.getItemMeta().getDisplayName().toLowerCase();
|
final Component weaponName = item.getItemMeta().displayName();
|
||||||
final Player player = (Player) event.getWhoClicked();
|
final Player player = (Player) event.getWhoClicked();
|
||||||
|
|
||||||
player.getInventory().addItem(item);
|
player.getInventory().addItem(item);
|
||||||
player.closeInventory();
|
player.closeInventory();
|
||||||
player.sendMessage("You have received the " + weaponName + "!");
|
player.sendMessage(
|
||||||
|
Component.text("You have received the ")
|
||||||
|
.append(weaponName)
|
||||||
|
.append(Component.text("!"))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,8 @@ import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
import pw.kaboom.weapons.modules.weapons.WeaponAnvilDropper;
|
import pw.kaboom.weapons.modules.weapons.WeaponAnvilDropper;
|
||||||
import pw.kaboom.weapons.modules.weapons.WeaponArcher;
|
import pw.kaboom.weapons.modules.weapons.WeaponArcher;
|
||||||
import pw.kaboom.weapons.modules.weapons.WeaponArmageddon;
|
import pw.kaboom.weapons.modules.weapons.WeaponArmageddon;
|
||||||
|
@ -26,10 +28,10 @@ public final class PlayerUseWeapon implements Listener {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
String name = "";
|
Component name = Component.empty();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
name = event.getItem().getItemMeta().getDisplayName();
|
name = event.getItem().getItemMeta().displayName();
|
||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,14 +5,15 @@ import org.bukkit.Material;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponAnvilDropper {
|
public final class WeaponAnvilDropper {
|
||||||
private WeaponAnvilDropper() {
|
private WeaponAnvilDropper() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void leftClick(final Material item, final String name,
|
public static void leftClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.ANVIL
|
if (item == Material.ANVIL && Component.text("Anvil Dropper").equals(name)) {
|
||||||
&& ("§rAnvil Dropper".equals(name) || "Anvil Dropper".equals(name))) {
|
|
||||||
final int min = -2;
|
final int min = -2;
|
||||||
final int max = 2;
|
final int max = 2;
|
||||||
|
|
||||||
|
|
|
@ -16,11 +16,12 @@ import org.bukkit.util.Vector;
|
||||||
|
|
||||||
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponArcher implements Listener {
|
public final class WeaponArcher implements Listener {
|
||||||
public static void leftClick(final Material item, final String name,
|
public static void leftClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.SPECTRAL_ARROW
|
if (item == Material.SPECTRAL_ARROW && Component.text("Archer").equals(name)) {
|
||||||
&& ("§rArcher".equals(name) || "Archer".equals(name))) {
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final World world = player.getWorld();
|
final World world = player.getWorld();
|
||||||
|
|
||||||
|
@ -40,7 +41,7 @@ public final class WeaponArcher implements Listener {
|
||||||
player.getLocation(),
|
player.getLocation(),
|
||||||
EntityType.SPECTRAL_ARROW
|
EntityType.SPECTRAL_ARROW
|
||||||
);
|
);
|
||||||
arrow.setCustomName("WeaponArcherArrow");
|
arrow.customName(Component.text("WeaponArcherArrow"));
|
||||||
arrow.setShooter(player);
|
arrow.setShooter(player);
|
||||||
arrow.setVelocity(randomDirection);
|
arrow.setVelocity(randomDirection);
|
||||||
}
|
}
|
||||||
|
@ -65,7 +66,7 @@ public final class WeaponArcher implements Listener {
|
||||||
if (event.getEntityType() == EntityType.SPECTRAL_ARROW) {
|
if (event.getEntityType() == EntityType.SPECTRAL_ARROW) {
|
||||||
final Projectile projectile = event.getEntity();
|
final Projectile projectile = event.getEntity();
|
||||||
|
|
||||||
if ("WeaponArcherArrow".equals(projectile.getCustomName())) {
|
if (Component.text("WeaponArcherArrow").equals(projectile.customName())) {
|
||||||
final Entity collidedWith = event.getCollidedWith();
|
final Entity collidedWith = event.getCollidedWith();
|
||||||
|
|
||||||
if (collidedWith.getType() == EntityType.PLAYER
|
if (collidedWith.getType() == EntityType.PLAYER
|
||||||
|
|
|
@ -16,11 +16,12 @@ import org.bukkit.util.Vector;
|
||||||
|
|
||||||
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponArmageddon implements Listener {
|
public final class WeaponArmageddon implements Listener {
|
||||||
public static void leftClick(final Material item, final String name,
|
public static void leftClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.FIRE_CHARGE
|
if (item == Material.FIRE_CHARGE && Component.text("Armageddon").equals(name)) {
|
||||||
&& ("§rArmageddon".equals(name) || "Armageddon".equals(name))) {
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final World world = player.getWorld();
|
final World world = player.getWorld();
|
||||||
|
|
||||||
|
@ -43,7 +44,7 @@ public final class WeaponArmageddon implements Listener {
|
||||||
);
|
);
|
||||||
|
|
||||||
fireball.setBounce(false);
|
fireball.setBounce(false);
|
||||||
fireball.setCustomName("WeaponArmegaddonCharge");
|
fireball.customName(Component.text("WeaponArmegaddonCharge"));
|
||||||
fireball.setDirection(velocity);
|
fireball.setDirection(velocity);
|
||||||
fireball.setShooter(player);
|
fireball.setShooter(player);
|
||||||
fireball.setYield(yield);
|
fireball.setYield(yield);
|
||||||
|
@ -70,7 +71,7 @@ public final class WeaponArmageddon implements Listener {
|
||||||
if (event.getEntityType() == EntityType.FIREBALL) {
|
if (event.getEntityType() == EntityType.FIREBALL) {
|
||||||
final Projectile projectile = event.getEntity();
|
final Projectile projectile = event.getEntity();
|
||||||
|
|
||||||
if ("WeaponArmegaddonCharge".equals(projectile.getCustomName())) {
|
if (Component.text("WeaponArmegaddonCharge").equals(projectile.customName())) {
|
||||||
final Entity collidedWith = event.getCollidedWith();
|
final Entity collidedWith = event.getCollidedWith();
|
||||||
|
|
||||||
if ((collidedWith.getType() == EntityType.PLAYER
|
if ((collidedWith.getType() == EntityType.PLAYER
|
||||||
|
|
|
@ -20,19 +20,20 @@ import org.bukkit.util.Vector;
|
||||||
|
|
||||||
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
import pw.kaboom.weapons.Main;
|
import pw.kaboom.weapons.Main;
|
||||||
|
|
||||||
public final class WeaponBlobinator implements Listener {
|
public final class WeaponBlobinator implements Listener {
|
||||||
public static void leftClick(final Material item, final String name,
|
public static void leftClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.MAGMA_CREAM
|
if (item == Material.MAGMA_CREAM && Component.text("Blobinator").equals(name)) {
|
||||||
&& ("§rBlobinator".equals(name) || "Blobinator".equals(name))) {
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final Location eyeLocation = player.getEyeLocation();
|
final Location eyeLocation = player.getEyeLocation();
|
||||||
final Vector velocity = eyeLocation.getDirection().multiply(8);
|
final Vector velocity = eyeLocation.getDirection().multiply(8);
|
||||||
|
|
||||||
final Snowball snowball = player.launchProjectile(Snowball.class);
|
final Snowball snowball = player.launchProjectile(Snowball.class);
|
||||||
snowball.setCustomName("WeaponBlobinatorBall");
|
snowball.customName(Component.text("WeaponBlobinatorBall"));
|
||||||
snowball.setShooter(player);
|
snowball.setShooter(player);
|
||||||
snowball.setVelocity(velocity);
|
snowball.setVelocity(velocity);
|
||||||
|
|
||||||
|
@ -74,7 +75,7 @@ public final class WeaponBlobinator implements Listener {
|
||||||
if (event.getEntityType() == EntityType.SNOWBALL) {
|
if (event.getEntityType() == EntityType.SNOWBALL) {
|
||||||
final Projectile projectile = event.getEntity();
|
final Projectile projectile = event.getEntity();
|
||||||
|
|
||||||
if ("WeaponBlobinatorBall".equals(projectile.getCustomName())) {
|
if (Component.text("WeaponBlobinatorBall").equals(projectile.customName())) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,7 +88,7 @@ public final class WeaponBlobinator implements Listener {
|
||||||
final Projectile projectile = event.getEntity();
|
final Projectile projectile = event.getEntity();
|
||||||
|
|
||||||
if (hitBlock != null
|
if (hitBlock != null
|
||||||
&& "WeaponBlobinatorBall".equals(projectile.getCustomName())) {
|
&& Component.text("WeaponBlobinatorBall").equals(projectile.customName())) {
|
||||||
final int radius = 4;
|
final int radius = 4;
|
||||||
final World world = projectile.getWorld();
|
final World world = projectile.getWorld();
|
||||||
final Material color = Main.getColors().get(
|
final Material color = Main.getColors().get(
|
||||||
|
|
|
@ -14,18 +14,19 @@ import org.bukkit.event.entity.ProjectileHitEvent;
|
||||||
import org.bukkit.event.player.PlayerEggThrowEvent;
|
import org.bukkit.event.player.PlayerEggThrowEvent;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponGrenade implements Listener {
|
public final class WeaponGrenade implements Listener {
|
||||||
public static void rightClick(final Material item, final String name,
|
public static void rightClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.EGG
|
if (item == Material.EGG && Component.text("Grenade").equals(name)) {
|
||||||
&& ("§rGrenade".equals(name) || "Grenade".equals(name))) {
|
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final Location eyeLocation = player.getEyeLocation();
|
final Location eyeLocation = player.getEyeLocation();
|
||||||
|
|
||||||
final Egg egg = player.launchProjectile(Egg.class);
|
final Egg egg = player.launchProjectile(Egg.class);
|
||||||
egg.setCustomName("WeaponGrenade");
|
egg.customName(Component.text("WeaponGrenade"));
|
||||||
egg.setShooter(player);
|
egg.setShooter(player);
|
||||||
|
|
||||||
final World world = player.getWorld();
|
final World world = player.getWorld();
|
||||||
|
@ -43,7 +44,7 @@ public final class WeaponGrenade implements Listener {
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
private void onPlayerEggThrow(final PlayerEggThrowEvent event) {
|
private void onPlayerEggThrow(final PlayerEggThrowEvent event) {
|
||||||
if ("WeaponGrenade".equals(event.getEgg().getCustomName())) {
|
if (Component.text("WeaponGrenade").equals(event.getEgg().customName())) {
|
||||||
event.setHatching(false);
|
event.setHatching(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,7 +54,7 @@ public final class WeaponGrenade implements Listener {
|
||||||
if (event.getEntityType() == EntityType.EGG) {
|
if (event.getEntityType() == EntityType.EGG) {
|
||||||
final Projectile projectile = event.getEntity();
|
final Projectile projectile = event.getEntity();
|
||||||
|
|
||||||
if ("WeaponGrenade".equals(projectile.getCustomName())) {
|
if (Component.text("WeaponGrenade").equals(projectile.customName())) {
|
||||||
final Location location = projectile.getLocation();
|
final Location location = projectile.getLocation();
|
||||||
final World world = location.getWorld();
|
final World world = location.getWorld();
|
||||||
final float power = 6;
|
final float power = 6;
|
||||||
|
|
|
@ -13,14 +13,15 @@ import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.util.BlockIterator;
|
import org.bukkit.util.BlockIterator;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponLaser {
|
public final class WeaponLaser {
|
||||||
private WeaponLaser() {
|
private WeaponLaser() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void rightClick(final Material item, final String name,
|
public static void rightClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.BLAZE_POWDER
|
if (item == Material.BLAZE_POWDER && Component.text("Laser").equals(name)) {
|
||||||
&& ("§rLaser".equals(name) || "Laser".equals(name))) {
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final Location eyeLocation = player.getEyeLocation();
|
final Location eyeLocation = player.getEyeLocation();
|
||||||
final Vector direction = eyeLocation.getDirection();
|
final Vector direction = eyeLocation.getDirection();
|
||||||
|
|
|
@ -7,14 +7,15 @@ import org.bukkit.Material;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponLightningStick {
|
public final class WeaponLightningStick {
|
||||||
private WeaponLightningStick() {
|
private WeaponLightningStick() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void leftClick(final Material item, final String name,
|
public static void leftClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.STICK
|
if (item == Material.STICK && Component.text("Lightning Stick").equals(name)) {
|
||||||
&& ("§rLightning Stick".equals(name) || "Lightning Stick".equals(name))) {
|
|
||||||
final int maxDistance = 100;
|
final int maxDistance = 100;
|
||||||
final Location lookLocation = event.getPlayer().getTargetBlock(
|
final Location lookLocation = event.getPlayer().getTargetBlock(
|
||||||
(Set<Material>) null, maxDistance).getLocation();
|
(Set<Material>) null, maxDistance).getLocation();
|
||||||
|
|
|
@ -25,15 +25,16 @@ import org.bukkit.util.Vector;
|
||||||
|
|
||||||
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
import pw.kaboom.weapons.Main;
|
import pw.kaboom.weapons.Main;
|
||||||
|
|
||||||
public final class WeaponMachineGun implements Listener {
|
public final class WeaponMachineGun implements Listener {
|
||||||
private static HashSet<UUID> machineGunActive = new HashSet<UUID>();
|
private static HashSet<UUID> machineGunActive = new HashSet<UUID>();
|
||||||
|
|
||||||
public static void rightClick(final Material item, final String name,
|
public static void rightClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.GOLDEN_HORSE_ARMOR
|
if (item == Material.GOLDEN_HORSE_ARMOR && Component.text("Machine Gun").equals(name)) {
|
||||||
&& ("§rMachine Gun".equals(name) || "Machine Gun".equals(name))) {
|
|
||||||
final UUID playerUUID = event.getPlayer().getUniqueId();
|
final UUID playerUUID = event.getPlayer().getUniqueId();
|
||||||
|
|
||||||
if (!machineGunActive.contains(playerUUID)) {
|
if (!machineGunActive.contains(playerUUID)) {
|
||||||
|
@ -52,7 +53,7 @@ public final class WeaponMachineGun implements Listener {
|
||||||
|
|
||||||
final Arrow arrow = player.launchProjectile(Arrow.class);
|
final Arrow arrow = player.launchProjectile(Arrow.class);
|
||||||
|
|
||||||
arrow.setCustomName("WeaponMachineGunBullet");
|
arrow.customName(Component.text("WeaponMachineGunBullet"));
|
||||||
arrow.setShooter(player);
|
arrow.setShooter(player);
|
||||||
arrow.setVelocity(velocity);
|
arrow.setVelocity(velocity);
|
||||||
|
|
||||||
|
@ -86,7 +87,7 @@ public final class WeaponMachineGun implements Listener {
|
||||||
if (event.getEntityType() == EntityType.ARROW) {
|
if (event.getEntityType() == EntityType.ARROW) {
|
||||||
final Projectile projectile = event.getEntity();
|
final Projectile projectile = event.getEntity();
|
||||||
|
|
||||||
if ("WeaponMachineGunBullet".equals(projectile.getCustomName())) {
|
if (Component.text("WeaponMachineGunBullet").equals(projectile.customName())) {
|
||||||
final Entity collidedWith = event.getCollidedWith();
|
final Entity collidedWith = event.getCollidedWith();
|
||||||
|
|
||||||
if (collidedWith.getType() == EntityType.PLAYER
|
if (collidedWith.getType() == EntityType.PLAYER
|
||||||
|
@ -119,7 +120,7 @@ public final class WeaponMachineGun implements Listener {
|
||||||
if (event.getEntityType() == EntityType.ARROW) {
|
if (event.getEntityType() == EntityType.ARROW) {
|
||||||
final Projectile projectile = event.getEntity();
|
final Projectile projectile = event.getEntity();
|
||||||
|
|
||||||
if ("WeaponMachineGunBullet".equals(projectile.getCustomName())) {
|
if (Component.text("WeaponMachineGunBullet").equals(projectile.customName())) {
|
||||||
projectile.remove();
|
projectile.remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,14 +9,15 @@ import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponNuker {
|
public final class WeaponNuker {
|
||||||
private WeaponNuker() {
|
private WeaponNuker() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void leftClick(final Material item, final String name,
|
public static void leftClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.BLAZE_ROD
|
if (item == Material.BLAZE_ROD && Component.text("Nuker").equals(name)) {
|
||||||
&& ("§rNuker".equals(name) || "Nuker".equals(name))) {
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final Location eyeLocation = player.getEyeLocation();
|
final Location eyeLocation = player.getEyeLocation();
|
||||||
final Vector velocity = eyeLocation.getDirection().multiply(10);
|
final Vector velocity = eyeLocation.getDirection().multiply(10);
|
||||||
|
|
|
@ -11,14 +11,15 @@ import org.bukkit.potion.PotionEffect;
|
||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
public final class WeaponSniper {
|
public final class WeaponSniper {
|
||||||
private WeaponSniper() {
|
private WeaponSniper() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void leftClick(final Material item, final String name,
|
public static void leftClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.IRON_HORSE_ARMOR
|
if (item == Material.IRON_HORSE_ARMOR && Component.text("Sniper").equals(name)) {
|
||||||
&& ("§rSniper".equals(name) || "Sniper".equals(name))) {
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final Location eyeLocation = player.getEyeLocation();
|
final Location eyeLocation = player.getEyeLocation();
|
||||||
final Vector velocity = eyeLocation.getDirection().multiply(12);
|
final Vector velocity = eyeLocation.getDirection().multiply(12);
|
||||||
|
@ -41,10 +42,9 @@ public final class WeaponSniper {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void rightClick(final Material item, final String name,
|
public static void rightClick(final Material item, final Component name,
|
||||||
final PlayerInteractEvent event) {
|
final PlayerInteractEvent event) {
|
||||||
if (item == Material.IRON_HORSE_ARMOR
|
if (item == Material.IRON_HORSE_ARMOR && Component.text("Sniper").equals(name)) {
|
||||||
&& ("§rSniper".equals(name) || "Sniper".equals(name))) {
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
|
||||||
if (player.hasPotionEffect(PotionEffectType.SLOW)) {
|
if (player.hasPotionEffect(PotionEffectType.SLOW)) {
|
||||||
|
|
Loading…
Reference in a new issue