From cbce84add8cfa52106638896fa24905fb1ed5ded Mon Sep 17 00:00:00 2001 From: StrangePerch Date: Wed, 9 Feb 2022 20:24:22 +0400 Subject: [PATCH 1/7] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20string=20=D0=BD=D0=B0=20string=20builder=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B4=D0=B8=20=D0=BE=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../igorlink/command/DonateSubCommand.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/igorlink/command/DonateSubCommand.java b/src/main/java/igorlink/command/DonateSubCommand.java index 1d06e87..7af5ba6 100644 --- a/src/main/java/igorlink/command/DonateSubCommand.java +++ b/src/main/java/igorlink/command/DonateSubCommand.java @@ -6,38 +6,40 @@ public class DonateSubCommand { public static void onDonateCommand(CommandSender sender, String[] args) { - int i; - - //Getting donation's amount - String donationAmount = new String(); - String donationUsername = new String(); - String donationMessage = new String(); //Getting donation's amount - donationAmount = args[0]; + String donationAmount = args[0]; + StringBuilder donationUsernameBuilder = new StringBuilder(); + StringBuilder donationMessageBuilder = new StringBuilder(); + int i; //Получаем имя донатера for (i = 1; i <= args.length - 1; i++) { if (args[i].equals("##")) { break; - } - else { - if (i==1) { - donationUsername = donationUsername + args[i]; - } - else { - donationUsername = ' ' + donationUsername + args[i]; + } else { + if (i == 1) { + donationUsernameBuilder.append(args[i]); + } else { + donationUsernameBuilder.append(" ").append(args[i]); } } } //Все, что после символов ## - это сообщение - for (i = i+1; i <= args.length - 1; i++) - { - donationMessage = donationMessage + args[i] + ' '; + for (i++; i <= args.length - 1; i++) { + donationMessageBuilder.append(args[i]).append(' '); } + String donationUsername = donationUsernameBuilder.toString(); + String donationMessage = donationMessageBuilder.toString(); + //Отправляем донат на исполнение - DonationExecutor.getInstance().streamerPlayersManager.addToDonationsQueue(new Donation(sender, donationUsername, donationAmount+".00", donationMessage)); + DonationExecutor.getInstance().streamerPlayersManager.addToDonationsQueue( + new Donation( + sender, + donationUsername, + donationAmount + ".00", + donationMessage)); } } From f67e80b58422575c7f69a3ccc5a48a80bfebf688 Mon Sep 17 00:00:00 2001 From: StrangePerch Date: Wed, 9 Feb 2022 20:27:41 +0400 Subject: [PATCH 2/7] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BA=D1=83=D1=87=D1=83=20if'=D0=BE=D0=B2=20=D0=BD=D0=B0=20?= =?UTF-8?q?switch=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?log=20=D0=B2=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=B8=D0=B7=D0=B2=D0=B5=D1=81=D1=82=D0=BD=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/DonationExecutorCommand.java | 69 ++++++++++--------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/src/main/java/igorlink/command/DonationExecutorCommand.java b/src/main/java/igorlink/command/DonationExecutorCommand.java index 3b50c5b..b7bc589 100644 --- a/src/main/java/igorlink/command/DonationExecutorCommand.java +++ b/src/main/java/igorlink/command/DonationExecutorCommand.java @@ -1,6 +1,7 @@ package igorlink.command; import org.bukkit.command.CommandSender; + import static igorlink.service.Utils.logToConsole; public class DonationExecutorCommand extends AbstractCommand { @@ -18,46 +19,50 @@ public Boolean execute(CommandSender sender, String label, String[] args) { } try { - //Если команда - это reload, где не должно быть доп аргументов, то вызываем функцию релоуда конфига - if (args[0].equals("reload")) { - if (args.length == 1) { - ReloadSubCommand.onReloadCommand(sender); - return true; - } - } else if (args[0].equals("donate")) { - //Инициализируем список аргментов для новой сабфункции - //Если команда - donate, где нужен минимум 1 доп аргумент, создаем новый массив аргументов со смещением 1, и вызываем функцию обработки доната - if (args.length >= 2) { - //Инициализируем список новых аргументов для субкоманды - newArgs = new String[args.length - 1]; - //Создаем новый список аргументов, копируя старый со смещением 1 - System.arraycopy(args, 1, newArgs, 0, args.length - 1); - //Вызываем обработку доната - DonateSubCommand.onDonateCommand(sender, newArgs); - //Возвращаем true, к все прошло успешно - return true; - } - } else if (args[0].equals("filter")) { - if ((args.length == 2) && (args[1].equals("on")) || (args[1].equals("off"))) { - //Инициализируем список новых аргументов для субкоманды - newArgs = new String[args.length - 1]; - //Создаем новый список аргументов, копируя старый со смещением 1 - System.arraycopy(args, 1, newArgs, 0, args.length - 1); - //Вызываем обработку доната - FilterSubCommand.onFilterCommand(sender, newArgs); - //Возвращаем true, к все прошло успешно - return true; - } + switch (args[0]) { + case "reload": + if (args.length == 1) { + ReloadSubCommand.onReloadCommand(sender); + return true; + } + break; + case "donate": + //Инициализируем список аргументов для новой сабфункции + //Если команда - donate, где нужен минимум 1 доп аргумент, создаем новый массив аргументов со смещением 1, и вызываем функцию обработки доната + if (args.length >= 2) { + //Инициализируем список новых аргументов для субкоманды + newArgs = new String[args.length - 1]; + //Создаем новый список аргументов, копируя старый со смещением 1 + System.arraycopy(args, 1, newArgs, 0, args.length - 1); + //Вызываем обработку доната + DonateSubCommand.onDonateCommand(sender, newArgs); + //Возвращаем true, к все прошло успешно + return true; + } + break; + case "filter": + if ((args.length == 2) && (args[1].equals("on")) || (args[1].equals("off"))) { + //Инициализируем список новых аргументов для субкоманды + newArgs = new String[args.length - 1]; + //Создаем новый список аргументов, копируя старый со смещением 1 + System.arraycopy(args, 1, newArgs, 0, args.length - 1); + //Вызываем обработку доната + FilterSubCommand.onFilterCommand(sender, newArgs); + //Возвращаем true, к все прошло успешно + return true; + } + break; + default: + logToConsole("Неизвестная команда: " + args[0]); + return false; } } catch (Exception e) { - //Если получили exception, сообщаем о нем и выдаем сообщение об ошибке в консоль e.printStackTrace(); logToConsole("Произошла неизвестная ошибка при выполнении команды!"); return false; - } //Если ничего не выполнилось - в команде была ошибка From 97335d2af95d44623401a2c2fdac9b18ab900b03 Mon Sep 17 00:00:00 2001 From: StrangePerch Date: Wed, 9 Feb 2022 20:29:54 +0400 Subject: [PATCH 3/7] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20toLowerCase().equals=20=D0=BD=D0=B0=20equalsIgnoreCase=20?= =?UTF-8?q?=D0=98=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8=D1=88?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20cast=20=D0=B8=D0=B7=20Sender=20=D0=B2=20Pl?= =?UTF-8?q?ayer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/igorlink/command/FilterSubCommand.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/igorlink/command/FilterSubCommand.java b/src/main/java/igorlink/command/FilterSubCommand.java index b6c8402..b18a868 100644 --- a/src/main/java/igorlink/command/FilterSubCommand.java +++ b/src/main/java/igorlink/command/FilterSubCommand.java @@ -8,17 +8,17 @@ public class FilterSubCommand { public static void onFilterCommand(CommandSender sender, String[] args) { - if (args[0].toLowerCase().equals("on")) { + if (args[0].equalsIgnoreCase("on")) { MainConfig.turnFilterOn(); Utils.logToConsole("Фильтр никнеймов донатеров §bВКЛЮЧЕН"); - if (sender instanceof Player) { - Utils.sendSysMsgToPlayer((Player) sender, "Фильтр никнеймов донатеров §bВКЛЮЧЕН"); + if (sender instanceof Player player) { + Utils.sendSysMsgToPlayer(player, "Фильтр никнеймов донатеров §bВКЛЮЧЕН"); } } else { MainConfig.turnFilterOff(); Utils.logToConsole("Фильтр никнеймов донатеров §bВЫКЛЮЧЕН"); - if (sender instanceof Player) { - Utils.sendSysMsgToPlayer((Player) sender,"Фильтр никнеймов донатеров §bВЫКЛЮЧЕН"); + if (sender instanceof Player player) { + Utils.sendSysMsgToPlayer(player,"Фильтр никнеймов донатеров §bВЫКЛЮЧЕН"); } } From c264ce4e9daea1a9ecff36549d930cbd07eae739 Mon Sep 17 00:00:00 2001 From: StrangePerch Date: Wed, 9 Feb 2022 20:36:32 +0400 Subject: [PATCH 4/7] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../igorlink/command/ReloadSubCommand.java | 4 +- .../executions/inventory/DropActiveItem.java | 2 +- .../executions/inventory/ShitToInventory.java | 3 +- .../executionsstaff/giantmobs/GiantMob.java | 38 +++++++++---------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/java/igorlink/command/ReloadSubCommand.java b/src/main/java/igorlink/command/ReloadSubCommand.java index 96fa731..a123849 100644 --- a/src/main/java/igorlink/command/ReloadSubCommand.java +++ b/src/main/java/igorlink/command/ReloadSubCommand.java @@ -11,8 +11,8 @@ public static void onReloadCommand(CommandSender sender) throws InterruptedExcep MainConfig.loadMainConfig(true); DonationExecutor.getInstance().streamerPlayersManager.reload(); Utils.logToConsole("Настройки успешно обновлены!"); - if (sender instanceof Player) { - Utils.sendSysMsgToPlayer(((Player) sender).getPlayer(), "Настройки успешно обновлены!"); + if (sender instanceof Player player) { + Utils.sendSysMsgToPlayer(player.getPlayer(), "Настройки успешно обновлены!"); } } } diff --git a/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/DropActiveItem.java b/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/DropActiveItem.java index 9dfc14c..c97482f 100644 --- a/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/DropActiveItem.java +++ b/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/DropActiveItem.java @@ -15,7 +15,7 @@ public Boolean execute(String donationUsername, Player player) { announce(donationUsername, "безуспешно пытался выбить у тебя предмет из рук", "безуспешно пытался выбить предмет из рук", player, true); } else { announce(donationUsername, "выбил у тебя предмет из рук", "выбил предмет из рук", player, true); - ((HumanEntity) player).dropItem(true); + player.dropItem(true); player.updateInventory(); } return true; diff --git a/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/ShitToInventory.java b/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/ShitToInventory.java index 6d93d5e..f1a3f6a 100644 --- a/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/ShitToInventory.java +++ b/src/main/java/igorlink/donationexecutor/executionsstaff/executionsmanagement/executions/inventory/ShitToInventory.java @@ -8,6 +8,7 @@ import org.bukkit.inventory.meta.ItemMeta; import java.util.Arrays; +import java.util.List; import static igorlink.service.Utils.announce; @@ -20,7 +21,7 @@ public Boolean execute(String donationUsername, Player player) { ItemStack itemStack = new ItemStack(itemType, 64); ItemMeta meta = itemStack.getItemMeta(); meta.setDisplayName("§cГОВНО ОТ §f" + donationUsername.toUpperCase()); - meta.setLore(Arrays.asList("§7Это говно ужасно вонюче и занимает много места")); + meta.setLore(List.of("§7Это говно ужасно вонюче и занимает много места")); itemStack.setItemMeta(meta); for (int i = 0; i < MainConfig.dirtAmount; i++) { player.getInventory().addItem(itemStack); diff --git a/src/main/java/igorlink/donationexecutor/executionsstaff/giantmobs/GiantMob.java b/src/main/java/igorlink/donationexecutor/executionsstaff/giantmobs/GiantMob.java index 74c639d..8b466a7 100644 --- a/src/main/java/igorlink/donationexecutor/executionsstaff/giantmobs/GiantMob.java +++ b/src/main/java/igorlink/donationexecutor/executionsstaff/giantmobs/GiantMob.java @@ -26,11 +26,11 @@ class GiantMob { private LivingEntity giantMobLivingEntity = null; private UUID thisGiantMobUUID = null; - final private int NUMBER_OF_SNOWBALLS_AT_ONE_LAUNCH = 4; - final private Boolean SnowballsFollowingTarget = false; - final private int GIANT_MOBS_TRACKING_RANGE = 40; - final private static int TIME_BEFORE_THIS_GIANT_MOB_FORGET_HIS_TARGET = 4; - final private static int TICKS_BETWEEN_SNOWBALLS_SHOTS = 7; + private static final Boolean SnowballsFollowingTarget = false; + private static final int NUMBER_OF_SNOWBALLS_AT_ONE_LAUNCH = 4; + private static final int GIANT_MOBS_TRACKING_RANGE = 40; + private static final int TIME_BEFORE_THIS_GIANT_MOB_FORGET_HIS_TARGET = 4; + private static final int TICKS_BETWEEN_SNOWBALLS_SHOTS = 7; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -44,7 +44,7 @@ class GiantMob { playerDirection.setY(0); playerDirection.normalize(); this.giantMobLivingEntity = (LivingEntity) playerLocation.getWorld().spawnEntity(playerLocation.clone().add(playerDirection.clone().multiply(5)).setDirection(playerDirection.multiply(-1)), EntityType.GIANT); - if (!(mobName == null)) { + if (mobName != null) { this.giantMobLivingEntity.setCustomName(mobName); } this.giantMobLivingEntity.setRemoveWhenFarAway(false); @@ -82,7 +82,7 @@ public UUID getUUID() { //Поиск ближайшей цели ( приоритете - игроки) private LivingEntity findGiantMobTarget() { //получаем список ближайших врагов dв радиусе sralinShootingRadius - Double sralinShootingRadius = (double) GIANT_MOBS_TRACKING_RANGE; + double sralinShootingRadius = GIANT_MOBS_TRACKING_RANGE; List listOfNearbyEntities = giantMobLivingEntity.getNearbyEntities(sralinShootingRadius, sralinShootingRadius, sralinShootingRadius); List listOfNearbyPlayers = new ArrayList<>(); List listOfNearbyLivingEntities = new ArrayList<>(); @@ -98,7 +98,7 @@ private LivingEntity findGiantMobTarget() { RayTraceResult rtRes7 = null; RayTraceResult rtRes8 = null; - if (e instanceof LivingEntity) { + if (e instanceof LivingEntity livingEntity) { //Позиции псевдоглаз вокруг головы с каждой стороны Location rtGiantMobPseudoEyesPos1 = giantMobLivingEntity.getLocation().clone().add(2, 11, 0); Location rtGiantMobPseudoEyesPos2 = giantMobLivingEntity.getLocation().clone().add(-2, 11, 0); @@ -106,21 +106,21 @@ private LivingEntity findGiantMobTarget() { Location rtGiantMobPseudoEyesPos4 = giantMobLivingEntity.getLocation().clone().add(0, 11, -2); //Пускаем лучи из каждой точки псевдоглаз до верха и низа каждой сущности - rtRes1 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos1, genVec(rtGiantMobPseudoEyesPos1, ((LivingEntity) e).getEyeLocation()), rtGiantMobPseudoEyesPos1.distance(((LivingEntity) e).getEyeLocation()), FluidCollisionMode.NEVER, true); - rtRes2 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos2, genVec(rtGiantMobPseudoEyesPos2, ((LivingEntity) e).getEyeLocation()), rtGiantMobPseudoEyesPos2.distance(((LivingEntity) e).getEyeLocation()), FluidCollisionMode.NEVER, true); - rtRes3 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos3, genVec(rtGiantMobPseudoEyesPos3, ((LivingEntity) e).getEyeLocation()), rtGiantMobPseudoEyesPos3.distance(((LivingEntity) e).getEyeLocation()), FluidCollisionMode.NEVER, true); - rtRes4 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos4, genVec(rtGiantMobPseudoEyesPos4, ((LivingEntity) e).getEyeLocation()), rtGiantMobPseudoEyesPos4.distance(((LivingEntity) e).getEyeLocation()), FluidCollisionMode.NEVER, true); - rtRes5 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos1, genVec(rtGiantMobPseudoEyesPos1, ((LivingEntity) e).getLocation()), rtGiantMobPseudoEyesPos1.distance(((LivingEntity) e).getLocation()), FluidCollisionMode.NEVER, true); - rtRes6 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos2, genVec(rtGiantMobPseudoEyesPos2, ((LivingEntity) e).getLocation()), rtGiantMobPseudoEyesPos2.distance(((LivingEntity) e).getLocation()), FluidCollisionMode.NEVER, true); - rtRes7 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos3, genVec(rtGiantMobPseudoEyesPos3, ((LivingEntity) e).getLocation()), rtGiantMobPseudoEyesPos3.distance(((LivingEntity) e).getLocation()), FluidCollisionMode.NEVER, true); - rtRes8 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos4, genVec(rtGiantMobPseudoEyesPos4, ((LivingEntity) e).getLocation()), rtGiantMobPseudoEyesPos4.distance(((LivingEntity) e).getLocation()), FluidCollisionMode.NEVER, true); + rtRes1 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos1, genVec(rtGiantMobPseudoEyesPos1, (livingEntity).getEyeLocation()), rtGiantMobPseudoEyesPos1.distance((livingEntity).getEyeLocation()), FluidCollisionMode.NEVER, true); + rtRes2 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos2, genVec(rtGiantMobPseudoEyesPos2, (livingEntity).getEyeLocation()), rtGiantMobPseudoEyesPos2.distance((livingEntity).getEyeLocation()), FluidCollisionMode.NEVER, true); + rtRes3 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos3, genVec(rtGiantMobPseudoEyesPos3, (livingEntity).getEyeLocation()), rtGiantMobPseudoEyesPos3.distance((livingEntity).getEyeLocation()), FluidCollisionMode.NEVER, true); + rtRes4 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos4, genVec(rtGiantMobPseudoEyesPos4, (livingEntity).getEyeLocation()), rtGiantMobPseudoEyesPos4.distance((livingEntity).getEyeLocation()), FluidCollisionMode.NEVER, true); + rtRes5 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos1, genVec(rtGiantMobPseudoEyesPos1, (livingEntity).getLocation()), rtGiantMobPseudoEyesPos1.distance((livingEntity).getLocation()), FluidCollisionMode.NEVER, true); + rtRes6 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos2, genVec(rtGiantMobPseudoEyesPos2, (livingEntity).getLocation()), rtGiantMobPseudoEyesPos2.distance((livingEntity).getLocation()), FluidCollisionMode.NEVER, true); + rtRes7 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos3, genVec(rtGiantMobPseudoEyesPos3, (livingEntity).getLocation()), rtGiantMobPseudoEyesPos3.distance((livingEntity).getLocation()), FluidCollisionMode.NEVER, true); + rtRes8 = giantMobLivingEntity.getWorld().rayTraceBlocks(rtGiantMobPseudoEyesPos4, genVec(rtGiantMobPseudoEyesPos4, (livingEntity).getLocation()), rtGiantMobPseudoEyesPos4.distance((livingEntity).getLocation()), FluidCollisionMode.NEVER, true); //Если Сталин может из любой позиции поврота голвоы увидеть верх или низ цели, то эта цель вносится в список кандидатов if ((rtRes1 == null) || (rtRes2 == null) || (rtRes3 == null) || (rtRes4 == null) || (rtRes5 == null) || (rtRes6 == null) || (rtRes7 == null) || (rtRes8 == null)) { - if ((e instanceof Player) && (!(((Player) e).getGameMode() == GameMode.SPECTATOR)) ) { - listOfNearbyPlayers.add((LivingEntity) e); + if ((e instanceof Player player) && (player.getGameMode() != GameMode.SPECTATOR)) { + listOfNearbyPlayers.add(livingEntity); } else if (!(e instanceof Player)) { - listOfNearbyLivingEntities.add((LivingEntity) e); + listOfNearbyLivingEntities.add(livingEntity); } } } From 54ccea2fcb3387f0f07d0f53675c0500fdadb14d Mon Sep 17 00:00:00 2001 From: StrangePerch Date: Wed, 9 Feb 2022 20:37:26 +0400 Subject: [PATCH 5/7] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20new=20Emitter.Listener()=20=D0=BD=D0=B0=20=D0=BB=D1=8F=D0=BC?= =?UTF-8?q?=D0=B1=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DonationAlertsConnection.java | 63 +++++++------------ 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsConnection.java b/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsConnection.java index c35a69a..a85c7a6 100644 --- a/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsConnection.java +++ b/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsConnection.java @@ -29,55 +29,38 @@ public DonationAlertsConnection(DonationAlertsToken donationAlertsToken) throws url = new URI(DASERVER); socket = IO.socket(url); - connectListener = new Emitter.Listener() { - @Override - public void call(Object... arg0) { - logToConsole("Произведено успешное подключение для токена §b" + donationAlertsToken.getToken()); - } - }; - - disconectListener = new Emitter.Listener() { - @Override - public void call(Object... arg0) { - logToConsole("Произведено отключение для токена §b" + donationAlertsToken.getToken()); - } - }; + connectListener = + arg0 -> logToConsole("Произведено успешное подключение для токена §b" + donationAlertsToken.getToken()); - donationListener = new Emitter.Listener() { - @Override - public void call(Object... arg0) { + disconectListener = + arg0 -> logToConsole("Произведено отключение для токена §b" + donationAlertsToken.getToken()); - JSONObject json = new JSONObject((String) arg0[0]); - //logToConsole((String) arg0[0]); - new BukkitRunnable() { - @Override - public void run() { + donationListener = arg0 -> { + JSONObject json = new JSONObject((String) arg0[0]); + //logToConsole((String) arg0[0]); + new BukkitRunnable() { + @Override + public void run() { - if ( (json.isNull("username")) || (json.isNull("amount_formatted"))) { - return; - } + if ( (json.isNull("username")) || (json.isNull("amount_formatted"))) { + return; + } - if ((json.getString("amount_formatted")).length() <= 1) { - return; - } + if ((json.getString("amount_formatted")).length() <= 1) { + return; + } - DonationAlertsConnection.this.donationAlertsToken.addToDonationsQueue(new Donation(Bukkit.getConsoleSender(), - json.getString("username"), - json.getString("amount_formatted"), - json.getString("message"))); + DonationAlertsConnection.this.donationAlertsToken.addToDonationsQueue(new Donation(Bukkit.getConsoleSender(), + json.getString("username"), + json.getString("amount_formatted"), + json.getString("message"))); - } - }.runTask(DonationExecutor.getInstance()); + } + }.runTask(DonationExecutor.getInstance()); - } }; - errorListener = new Emitter.Listener() { - @Override - public void call(Object... arg0) { - logToConsole("Произошла ошибка подключения к Donation Alerts!"); - } - }; + errorListener = arg0 -> logToConsole("Произошла ошибка подключения к Donation Alerts!"); socket.on(Socket.EVENT_CONNECT, connectListener) .on(Socket.EVENT_DISCONNECT, disconectListener) From 297808b699e87d2b8cc9a42c1e9e37e32958ffb5 Mon Sep 17 00:00:00 2001 From: StrangePerch Date: Wed, 9 Feb 2022 20:40:11 +0400 Subject: [PATCH 6/7] =?UTF-8?q?=D0=92=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20!(a?= =?UTF-8?q?=20=3D=3D=20null)=20=D0=BB=D1=83=D1=87=D1=88=D0=B5=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20a=20!=3D=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../playersmanagement/donationalerts/DonationAlertsToken.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsToken.java b/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsToken.java index ec93cde..41bb39a 100644 --- a/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsToken.java +++ b/src/main/java/igorlink/donationexecutor/playersmanagement/donationalerts/DonationAlertsToken.java @@ -36,7 +36,7 @@ public String getToken() { public void executeDonationsInQueues() { for (StreamerPlayer sp : listOfStreamerPlayers) { - if ( !(Bukkit.getPlayerExact(sp.getName()) == null) ) { + if ( Bukkit.getPlayerExact(sp.getName()) != null ) { if (!(Bukkit.getPlayerExact(sp.getName()).isDead())) { Donation donation = sp.takeDonationFromQueue(); if (donation==null) { @@ -68,7 +68,7 @@ public void addToDonationsQueue(Donation donation) { String execution; for (StreamerPlayer sp : listOfStreamerPlayers) { execution = sp.checkExecution(Utils.cutOffKopeykis(donation.getAmount())); - if (!(execution == null)) { + if (execution != null) { donation.setexecutionName(execution); sp.putDonationToQueue(donation); Utils.logToConsole("Донат от §b" + donation.getName() + "§f в размере §b" + donation.getAmount() + " руб.§f был обработан и отправлен в очередь на выполнение."); From 8c98fabab7dc2304bc17f3644d5293db2eef1298 Mon Sep 17 00:00:00 2001 From: StrangePerch Date: Wed, 9 Feb 2022 20:45:19 +0400 Subject: [PATCH 7/7] =?UTF-8?q?StringBuilder=20=D0=B2=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=BE=20String=20!=3D=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=BE=20!(=3D=3D)=20=D0=98=20=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BA=D1=82=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?switch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../igorlink/donationexecutor/Executor.java | 91 +++++++------------ .../playersmanagement/StreamerPlayer.java | 4 +- 2 files changed, 33 insertions(+), 62 deletions(-) diff --git a/src/main/java/igorlink/donationexecutor/Executor.java b/src/main/java/igorlink/donationexecutor/Executor.java index f92e62e..3c6c394 100644 --- a/src/main/java/igorlink/donationexecutor/Executor.java +++ b/src/main/java/igorlink/donationexecutor/Executor.java @@ -26,7 +26,7 @@ public class Executor { public static void DoExecute(CommandSender sender, String streamerName, String donationUsername, String fullDonationAmount, String donationMessage, String executionName) { Player streamerPlayer = getPlayerExact(streamerName); - Boolean canContinue = true; + boolean canContinue = true; //Определяем игрока (если он оффлайн - не выполняем донат и пишем об этом в консоль), а также определяем мир, местоположение и направление игрока if (streamerPlayer == null) { canContinue = false; @@ -56,56 +56,23 @@ public static void DoExecute(CommandSender sender, String streamerName, String d Vector direction = streamerPlayerLocation.getDirection(); - switch (executionName) { - case "ShitToInventory": - shitToInventory(streamerPlayer, validDonationUsername); - break; - case "Lesch": - lesch(streamerPlayer, validDonationUsername); - break; - case "DropActiveItem": - dropActiveItem(streamerPlayer, validDonationUsername); - break; - case "PowerKick": - powerKick(streamerPlayer, validDonationUsername); - break; - case "ClearLastDeathDrop": - clearLastDeathDrop(streamerPlayer, validDonationUsername); - break; - case "SpawnCreeper": - spawnCreeper(streamerPlayer, validDonationUsername); - break; - case "GiveDiamonds": - giveDiamonds(streamerPlayer, validDonationUsername); - break; - case "GiveStackOfDiamonds": - giveStackOfDiamonds(streamerPlayer, validDonationUsername); - break; - case "GiveBread": - giveBread(streamerPlayer, validDonationUsername); - break; - case "CallNKVD": - callNKVD(streamerPlayer, validDonationUsername); - break; - case "CallStalin": - callStalin(streamerPlayer, validDonationUsername); - break; - case "RandomChange": - randomChange(streamerPlayer, validDonationUsername); - break; - case "TamedBecomesEnemies": - tamedBecomesEnemies(streamerPlayer, validDonationUsername); - break; - case "HalfHeart": - halfHeart(streamerPlayer, validDonationUsername); - break; - case "BigBoom": - bigBoom(streamerPlayer, validDonationUsername); - break; - case "Nekoglai": - nekoglai(streamerPlayer, validDonationUsername); - break; + case "ShitToInventory" -> shitToInventory(streamerPlayer, validDonationUsername); + case "Lesch" -> lesch(streamerPlayer, validDonationUsername); + case "DropActiveItem" -> dropActiveItem(streamerPlayer, validDonationUsername); + case "PowerKick" -> powerKick(streamerPlayer, validDonationUsername); + case "ClearLastDeathDrop" -> clearLastDeathDrop(streamerPlayer, validDonationUsername); + case "SpawnCreeper" -> spawnCreeper(streamerPlayer, validDonationUsername); + case "GiveDiamonds" -> giveDiamonds(streamerPlayer, validDonationUsername); + case "GiveStackOfDiamonds" -> giveStackOfDiamonds(streamerPlayer, validDonationUsername); + case "GiveBread" -> giveBread(streamerPlayer, validDonationUsername); + case "CallNKVD" -> callNKVD(streamerPlayer, validDonationUsername); + case "CallStalin" -> callStalin(streamerPlayer, validDonationUsername); + case "RandomChange" -> randomChange(streamerPlayer, validDonationUsername); + case "TamedBecomesEnemies" -> tamedBecomesEnemies(streamerPlayer, validDonationUsername); + case "HalfHeart" -> halfHeart(streamerPlayer, validDonationUsername); + case "BigBoom" -> bigBoom(streamerPlayer, validDonationUsername); + case "Nekoglai" -> nekoglai(streamerPlayer, validDonationUsername); } } @@ -265,7 +232,7 @@ public static void randomChange (Player player, String donationUsername) { for (int i = 0; i <= 4; i++) { int temp = 0; - Boolean isUnique = false; + boolean isUnique = false; while (!isUnique) { temp = (int) (round(random() * 35)); isUnique = true; @@ -281,15 +248,19 @@ public static void randomChange (Player player, String donationUsername) { } - String replacedItems = new String(""); + StringBuilder replacedItemsBuilder = new StringBuilder(); int replacedCounter = 0; for (int i = 0; i <= 4; i++) { - if (!(player.getInventory().getItem(randoms[i]) == null)) { + if (player.getInventory().getItem(randoms[i]) != null) { replacedCounter++; if (replacedCounter > 1) { - replacedItems = replacedItems + "§f, "; + replacedItemsBuilder.append("§f, "); } - replacedItems = replacedItems + "§b" + player.getInventory().getItem(randoms[i]).getAmount() + " §f" + player.getInventory().getItem(randoms[i]).getI18NDisplayName().toString(); + replacedItemsBuilder + .append("§b") + .append(player.getInventory().getItem(randoms[i]).getAmount()) + .append(" §f") + .append(player.getInventory().getItem(randoms[i]).getI18NDisplayName()); } player.getInventory().setItem(randoms[i], new ItemStack(Material.STONE, 1)); } @@ -297,7 +268,7 @@ public static void randomChange (Player player, String donationUsername) { if (replacedCounter == 0) { sendSysMsgToPlayer(player,"§cТебе повезло: все камни попали в пустые слоты!"); } else { - sendSysMsgToPlayer(player,"§cБыли заменены следующие предметусы: §f" + replacedItems); + sendSysMsgToPlayer(player,"§cБыли заменены следующие предметусы: §f" + replacedItemsBuilder.toString()); } } @@ -310,10 +281,10 @@ public static void tamedBecomesEnemies (Player player, String donationUsername) announce(donationUsername, "настроил твоих питомцев против тебя!", "настроил прирученных питомцев против", player, true); for (Entity e : player.getWorld().getEntitiesByClasses(Wolf.class, Cat.class)) { if (((Tameable) e).isTamed() && ((Tameable) e).getOwner().getName().equals(player.getName())) { - if (e instanceof Cat) { - ((Tameable) e).setOwner(null); - ((Cat) e).setSitting(false); - ((Cat) e).setTarget(player); + if (e instanceof Cat cat) { + cat.setOwner(null); + cat.setSitting(false); + cat.setTarget(player); player.sendMessage("+"); } else { ((Wolf) e).setSitting(false); diff --git a/src/main/java/igorlink/donationexecutor/playersmanagement/StreamerPlayer.java b/src/main/java/igorlink/donationexecutor/playersmanagement/StreamerPlayer.java index 5567b27..e7a980e 100644 --- a/src/main/java/igorlink/donationexecutor/playersmanagement/StreamerPlayer.java +++ b/src/main/java/igorlink/donationexecutor/playersmanagement/StreamerPlayer.java @@ -35,7 +35,7 @@ public StreamerPlayer(@NotNull String _streamerPlayerName, DonationAlertsToken d String amount; for (String execName : Executor.executionsNamesList) { amount = config.getString("donation-amounts." + donationAlertsToken.getToken() + "." + streamerPlayerName + "." + execName); - if (!(amount==null)) { + if (amount != null) { listOfAmounts.put(amount, execName); } else { Utils.logToConsole("Сумма доната, необходимая для " + execName + " для стримера " + streamerPlayerName + " не найдена. Проверьте правильность заполнения файла конфигурации DonationExecutor.yml в папке с именем плагина."); @@ -72,7 +72,7 @@ public Donation takeDonationFromQueue() { //Удалить дроп игрока после смерти public Boolean removeDeathDrop() { - Boolean wasAnythingDeleted = false; + boolean wasAnythingDeleted = false; for (Item i : listOfDeathDropItems) { if (i.isDead()) { continue;