diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java index 650269296..b0c3740b9 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java @@ -2,13 +2,11 @@ import net.codingarea.challenges.plugin.challenges.custom.settings.action.EntityTargetAction; import net.codingarea.challenges.plugin.challenges.type.helper.SubSettingsHelper; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.DefaultItem; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import net.codingarea.challenges.plugin.utils.misc.MinecraftNameWrapper; import org.bukkit.Material; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java index 5f9fed98a..56dab8b5a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.challenges.custom.settings.sub; +import lombok.Getter; import net.anweisen.utilities.common.misc.StringUtils; import net.codingarea.challenges.plugin.challenges.custom.settings.sub.builder.*; import net.codingarea.challenges.plugin.content.Message; @@ -15,6 +16,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; +@Getter public abstract class SubSettingsBuilder { private String key; @@ -59,11 +61,7 @@ public static EmptySubSettingsBuilder createEmpty() { public abstract boolean hasSettings(); - public SubSettingsBuilder getParent() { - return parent; - } - - public SubSettingsBuilder setParent(SubSettingsBuilder parent) { + public SubSettingsBuilder setParent(SubSettingsBuilder parent) { SubSettingsBuilder parentBuilder = getParent(); if (parentBuilder != null) { @@ -75,15 +73,7 @@ public SubSettingsBuilder setParent(SubSettingsBuilder parent) { } - public SubSettingsBuilder getChild() { - return child; - } - - public String getKey() { - return key; - } - - public SubSettingsBuilder setKey(String key) { + public SubSettingsBuilder setKey(String key) { this.key = key; return this; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java index 60e32c9a8..06e772fbd 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java @@ -21,7 +21,7 @@ public Material getMaterial() { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onPickup(FoodLevelChangeEvent event) { if (!(event.getEntity() instanceof Player)) return; - if (event.getFoodLevel() < ((Player) event.getEntity()).getFoodLevel()) { + if (event.getFoodLevel() < event.getEntity().getFoodLevel()) { createData() .entity(event.getEntity()) .event(event) diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java index 96b126bd4..3836f8921 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java @@ -9,6 +9,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; +import java.util.Objects; + public class StandsOnSpecificBlockTrigger extends ChallengeTrigger { public StandsOnSpecificBlockTrigger(String name) { @@ -24,7 +26,7 @@ public Material getMaterial() { public void onMove(PlayerMoveEvent event) { if (BlockUtils.isSameBlockLocation(event.getTo(), event.getFrom())) return; Block blockBelow = BlockUtils.getBlockBelow( - event.getTo()); + Objects.requireNonNull(event.getTo())); if (blockBelow == null) return; createData() diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java index 593c12203..baca7505e 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java @@ -8,13 +8,11 @@ import net.codingarea.challenges.plugin.content.Prefix; import net.codingarea.challenges.plugin.management.menu.MenuType; import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import net.codingarea.challenges.plugin.utils.misc.NameHelper; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.boss.BarColor; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java index ef714960f..36225f70a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java @@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; +import java.util.Objects; @Since("2.1.3") public class BlockMobsChallenge extends Setting { @@ -45,7 +46,7 @@ public void onBlockBreak(BlockBreakEvent event) { LivingEntity entity = (LivingEntity) event.getBlock().getWorld() .spawnEntity(event.getBlock().getLocation().add(0.5, 0, 0.5), type); - Collection drops = event.getBlock().getDrops(event.getPlayer().getEquipment().getItemInMainHand()); + Collection drops = event.getBlock().getDrops(Objects.requireNonNull(event.getPlayer().getEquipment()).getItemInMainHand()); int i = 0; // Put every stack in a different slot to make sure everything drops properly @@ -56,7 +57,8 @@ public void onBlockBreak(BlockBreakEvent event) { switch (i) { case 0: - equipment.setHelmetDropChance(1); + assert equipment != null; + equipment.setHelmetDropChance(1); break; case 1: slot = EquipmentSlot.CHEST; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java index 67b61ed2a..2f87be910 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java @@ -17,6 +17,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @Since("2.0.2") public class UncraftItemsChallenge extends TimedChallenge { @@ -105,8 +106,8 @@ private static List getIngredientsOfRecipe(@Nonnull Recipe recipe) { ingredients.add(furnace.getInput()); } else if (MinecraftVersion.current().isNewerOrEqualThan(MinecraftVersion.V1_14) && recipe instanceof SmithingRecipe) { SmithingRecipe smithing = (SmithingRecipe) recipe; - ingredients.add(smithing.getBase().getItemStack()); - ingredients.add(smithing.getAddition().getItemStack()); + ingredients.add(Objects.requireNonNull(smithing.getBase()).getItemStack()); + ingredients.add(Objects.requireNonNull(smithing.getAddition()).getItemStack()); } return ingredients; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java index 19239e2d2..23feeba3e 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java @@ -18,6 +18,7 @@ import java.util.LinkedList; import java.util.List; +import java.util.Objects; @Since("2.2.0") public class NoSharedAdvancementsChallenge extends Setting { @@ -51,7 +52,7 @@ public void loadGameState(@NotNull Document document) { List advancementKeys = document.getStringList("advancements"); for (String advancementKey : advancementKeys) { try { - advancementsDone.add(Bukkit.getAdvancement(BukkitReflectionUtils.fromString(advancementKey))); + advancementsDone.add(Bukkit.getAdvancement(Objects.requireNonNull(BukkitReflectionUtils.fromString(advancementKey)))); } catch (Exception exception) { // DON'T EXIST } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java index 8b0e036c3..f49b6e2af 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java @@ -15,14 +15,12 @@ import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask; import net.codingarea.challenges.plugin.spigot.events.PlayerJumpEvent; import net.codingarea.challenges.plugin.utils.bukkit.command.PlayerCommand; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import net.codingarea.challenges.plugin.utils.misc.BlockUtils; import net.codingarea.challenges.plugin.utils.misc.NameHelper; import net.codingarea.challenges.plugin.utils.misc.TriFunction; import org.bukkit.Material; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.boss.BarColor; import org.bukkit.command.Command; @@ -565,8 +563,8 @@ public void onMove(@Nonnull PlayerDropItemEvent event) { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onMove(@Nonnull EntityDamageEvent event) { if (!shouldExecuteEffect()) return; - if (!(event.getEntity() instanceof Player)) return;; - Player player = (Player) event.getEntity(); + if (!(event.getEntity() instanceof Player)) return; + Player player = (Player) event.getEntity(); if (ignorePlayer(player)) return; SavedStatistic.DAMAGE_TAKEN.increaseStatistic(player, event.getCause().name(), ChallengeHelper.getFinalDamage(event)); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java index c27737b95..d39094ba3 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java @@ -34,10 +34,10 @@ public RandomEventChallenge() { setCategory(SettingCategory.RANDOMIZER); events = new Event[]{ new SpeedEvent(), - new SpawnEntitiesEvent(), + new SpawnEntitiesEvent(), new HoleEvent(), new FlyEvent(), - new CobWebEvent(), + new CobWebEvent(), new ReplaceOresEvent(), new SicknessEvent() }; @@ -186,7 +186,7 @@ public void run(@Nonnull Player player) { } } - public class SpawnEntitiesEvent implements Event { + public static class SpawnEntitiesEvent implements Event { @Nonnull @Override @@ -210,7 +210,7 @@ public void run(@Nonnull Player player) { } - public class CobWebEvent implements Event { + public static class CobWebEvent implements Event { @Nonnull @Override diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java index 57b92d418..fd613961d 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java @@ -27,7 +27,7 @@ public RandomItemDroppingChallenge() { } public static void dropRandomItem(Player player) { - if (player.getInventory().getContents().length <= 0) return; + if (player.getInventory().getContents().length == 0) return; dropRandomItem(player.getLocation(), player.getInventory()); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java index 0f6bd79c0..ae705f94f 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java @@ -51,7 +51,7 @@ protected void onTimeActivation() { for (Player player : Bukkit.getOnlinePlayers()) { if (ignorePlayer(player)) continue; - if (player.getInventory().getContents().length <= 0) continue; + if (player.getInventory().getContents().length == 0) continue; Bukkit.getScheduler().runTask(plugin, () -> { InventoryUtils.removeRandomItem(player.getInventory()); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java index 9aef3ef61..9e21a2a80 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java @@ -26,7 +26,7 @@ public RandomItemSwappingChallenge() { } public static void swapRandomItems(Player player) { - if (player.getInventory().getContents().length <= 0) return; + if (player.getInventory().getContents().length == 0) return; int slot = InventoryUtils.getRandomFullSlot(player.getInventory()); if (slot == -1) return; swapItemToRandomSlot( diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java index ca5546d4f..1bb679ef7 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java @@ -6,7 +6,6 @@ import net.codingarea.challenges.plugin.content.Message; import net.codingarea.challenges.plugin.management.menu.MenuType; import net.codingarea.challenges.plugin.management.menu.generator.categorised.SettingCategory; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import net.codingarea.challenges.plugin.utils.item.ItemBuilder.PotionBuilder; @@ -15,7 +14,6 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.World.Environment; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java index e3c0ad6f2..11352c5de 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java @@ -13,7 +13,6 @@ import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask; import net.codingarea.challenges.plugin.management.scheduler.task.TimerTask; import net.codingarea.challenges.plugin.management.scheduler.timer.TimerStatus; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import net.codingarea.challenges.plugin.utils.misc.InventoryUtils; @@ -186,13 +185,11 @@ public void execute() { private static class EntityDamageLoop implements Loop { private final LivingEntity entity; - private final DamageCause damageCause; - private final double damage; + private final double damage; public EntityDamageLoop(LivingEntity entity, DamageCause cause, double damage) { this.entity = entity; - this.damageCause = cause; - this.damage = damage; + this.damage = damage; } @Override @@ -301,7 +298,7 @@ private boolean decreaseDurability() { org.bukkit.inventory.meta.Damageable damageable = (org.bukkit.inventory.meta.Damageable) itemStack.getItemMeta(); if (damageable == null) return false; damageable.setDamage(damageable.getDamage() + 1); - itemStack.setItemMeta((ItemMeta) damageable); + itemStack.setItemMeta(damageable); for (int slot = 0; slot < player.getInventory().getSize(); slot++) { ItemStack item = player.getInventory().getItem(slot); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java index 7e459c445..f494c35dd 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java @@ -39,12 +39,7 @@ public ItemBuilder createDisplayItem() { return new ItemBuilder(Material.BLUE_TERRACOTTA, Message.forName("item-snake-challenge")); } - @Override - protected void onEnable() { - - } - - @Override + @Override protected void onDisable() { blocks.clear(); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java index 4044b6b82..8ddbb8b79 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.challenges.implementation.goal; +import lombok.Getter; import net.anweisen.utilities.bukkit.utils.animation.SoundSample; import net.codingarea.challenges.plugin.utils.item.ItemUtils; import net.anweisen.utilities.common.annotations.Since; @@ -36,11 +37,15 @@ @Since("2.0") public class CollectAllItemsGoal extends SettingGoal implements SenderCommand { - private final int totalItemsCount; + @Getter + private final int totalItemsCount; private SeededRandomWrapper random; - private List allItemsToFind; - private List itemsToFind; - private Material currentItem; + @Getter + private List allItemsToFind; + @Getter + private List itemsToFind; + @Getter + private Material currentItem; public CollectAllItemsGoal() { random = new SeededRandomWrapper(); @@ -168,23 +173,7 @@ public void writeGameState(@Nonnull Document document) { document.set("found", totalItemsCount - itemsToFind.size()); } - public Material getCurrentItem() { - return currentItem; - } - - public List getItemsToFind() { - return itemsToFind; - } - - public List getAllItemsToFind() { - return allItemsToFind; - } - - public int getTotalItemsCount() { - return totalItemsCount; - } - - private String getItemDisplayName(@Nullable Material material) { + private String getItemDisplayName(@Nullable Material material) { if (material == null) return "Unbekannt"; String name = material.name(); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java index 18e3092f6..1cff0e3ff 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java @@ -8,12 +8,10 @@ import net.codingarea.challenges.plugin.management.menu.MenuType; import net.codingarea.challenges.plugin.management.menu.generator.categorised.SettingCategory; import net.codingarea.challenges.plugin.management.server.ChallengeEndCause; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java index 049dd1579..8e846d715 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java @@ -26,7 +26,10 @@ public KillAllMonsterGoal() { static List getAllMobsToKill() { LinkedList list = new LinkedList<>(Arrays.asList(EntityType.values())); list.removeIf(type -> !type.isAlive()); - list.removeIf(type -> !Monster.class.isAssignableFrom(type.getEntityClass())); + list.removeIf(type -> { + assert type.getEntityClass() != null; + return !Monster.class.isAssignableFrom(type.getEntityClass()); + }); list.add(EntityType.PHANTOM); list.add(EntityType.ENDER_DRAGON); list.add(EntityType.SHULKER); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java index 164737ee5..3eab72397 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java @@ -30,10 +30,7 @@ import org.jetbrains.annotations.NotNull; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.function.Function; public class ExtremeForceBattleGoal extends ForceBattleDisplayGoal> { @@ -220,7 +217,7 @@ public enum TargetType { return new DamageTarget(globalRandom.range(1, 19)); }), ADVANCEMENT(object -> { - return new AdvancementTarget(Bukkit.getAdvancement(NamespacedKey.fromString((String) object))); + return new AdvancementTarget(Bukkit.getAdvancement(Objects.requireNonNull(NamespacedKey.fromString((String) object)))); }, player -> { return new AdvancementTarget(globalRandom.choose(AdvancementTarget.getPossibleAdvancements())); }), diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java index ad7364afb..2a637edd4 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; @Since("2.2.0") public class ForceAdvancementBattleGoal extends ForceBattleGoal { @@ -50,8 +51,10 @@ protected AdvancementTarget[] getTargetsPossibleToFind() { public AdvancementTarget getTargetFromDocument(Document document, String path) { String advancementKey = document.getString(path); try { - NamespacedKey namespacedKey = BukkitReflectionUtils.fromString(advancementKey); - return new AdvancementTarget(Bukkit.getAdvancement(namespacedKey)); + assert advancementKey != null; + NamespacedKey namespacedKey = BukkitReflectionUtils.fromString(advancementKey); + assert namespacedKey != null; + return new AdvancementTarget(Bukkit.getAdvancement(namespacedKey)); } catch (Exception exception) { // DON'T EXIST } @@ -64,7 +67,7 @@ public List getListFromDocument(Document document, String pat List advancementTargets = new ArrayList<>(); for (String advancementKey : advancementKeys) { try { - advancementTargets.add(new AdvancementTarget(Bukkit.getAdvancement(BukkitReflectionUtils.fromString(advancementKey)))); + advancementTargets.add(new AdvancementTarget(Bukkit.getAdvancement(Objects.requireNonNull(BukkitReflectionUtils.fromString(advancementKey))))); } catch (Exception exception) { // DON'T EXIST } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java index a04eac918..167bfbd0a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.challenges.implementation.goal.forcebattle.targets; +import lombok.Getter; import net.codingarea.challenges.plugin.challenges.implementation.goal.forcebattle.ExtremeForceBattleGoal; import net.codingarea.challenges.plugin.content.Message; import org.bukkit.Material; @@ -8,6 +9,9 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; +import java.util.Objects; + +@Getter public abstract class ForceTarget { protected final T target; @@ -28,15 +32,11 @@ public String toString() { return target.toString(); } - public T getTarget() { - return target; - } - public void updateDisplayStand(@NotNull ArmorStand armorStand) { if (target instanceof Material) { - armorStand.getEquipment().setHelmet(new ItemStack((Material) target)); + Objects.requireNonNull(armorStand.getEquipment()).setHelmet(new ItemStack((Material) target)); } else { - armorStand.getEquipment().setHelmet(null); + Objects.requireNonNull(armorStand.getEquipment()).setHelmet(null); } } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java index cfe4ed8b8..c333e8307 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; public class MobTarget extends ForceTarget { @@ -70,9 +71,9 @@ public Message getScoreboardDisplayMessage() { public void updateDisplayStand(@NotNull ArmorStand armorStand) { Material spawnEgg = EntityUtils.getSpawnEgg(target); if (spawnEgg == null) { - armorStand.getEquipment().setHelmet(null); + Objects.requireNonNull(armorStand.getEquipment()).setHelmet(null); } else { - armorStand.getEquipment().setHelmet(new ItemStack(spawnEgg)); + Objects.requireNonNull(armorStand.getEquipment()).setHelmet(new ItemStack(spawnEgg)); } } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java index dadd0c9e9..3349bcb63 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java @@ -1,7 +1,7 @@ package net.codingarea.challenges.plugin.challenges.implementation.setting; import javax.annotation.Nonnull; -import net.anweisen.utilities.bukkit.utils.misc.MinecraftVersion; + import net.anweisen.utilities.common.annotations.Since; import net.codingarea.challenges.plugin.Challenges; import net.codingarea.challenges.plugin.challenges.type.abstraction.Setting; @@ -14,7 +14,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.scoreboard.Criteria; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.RenderType; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/LanguageSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/LanguageSetting.java index b912bccc3..ea526cc68 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/LanguageSetting.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/LanguageSetting.java @@ -10,8 +10,7 @@ import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import org.bukkit.Material; import javax.annotation.Nonnull; -import java.net.MalformedURLException; -import java.net.URL; +import java.util.Objects; public class LanguageSetting extends Modifier { @@ -42,11 +41,11 @@ public ItemBuilder createSettingsItem() { public void playValueChangeTitle() { switch (getValue()) { case GERMAN: - Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class).changeLanguage("de"); + Objects.requireNonNull(Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class)).changeLanguage("de"); ChallengeHelper.playChangeChallengeValueTitle(this, Message.forName(getSettingName())); break; case ENGLISH: - Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class).changeLanguage("en"); + Objects.requireNonNull(Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class)).changeLanguage("en"); ChallengeHelper.playChangeChallengeValueTitle(this, Message.forName(getSettingName())); break; default: diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java index 4f385dc6e..0b380bb82 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java @@ -12,7 +12,6 @@ import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.DefaultItem; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java index bb6fc9525..0b756d43d 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java @@ -4,11 +4,9 @@ import net.codingarea.challenges.plugin.challenges.type.abstraction.Setting; import net.codingarea.challenges.plugin.content.Message; import net.codingarea.challenges.plugin.management.menu.MenuType; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import org.bukkit.Material; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java index 9b0a4e1d4..0d2235a39 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java @@ -21,6 +21,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class TimberSetting extends SettingModifier { @@ -60,7 +61,7 @@ public void onBreak(@Nonnull BlockBreakEvent event) { final int[] index = {0}; - boolean damageItem = !item.getItemMeta().isUnbreakable() && !AbstractChallenge.getFirstInstance(NoItemDamageSetting.class).isEnabled(); + boolean damageItem = !Objects.requireNonNull(item.getItemMeta()).isUnbreakable() && !AbstractChallenge.getFirstInstance(NoItemDamageSetting.class).isEnabled(); Bukkit.getScheduler().runTaskTimer(plugin, timer -> { for (int i = 0; i < 2 && !treeBlocks.isEmpty(); i++) { diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java index f0c68f3fe..e35e8bab3 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.challenges.type.abstraction; +import lombok.Setter; import net.anweisen.utilities.bukkit.utils.animation.SoundSample; import net.anweisen.utilities.common.config.Document; import net.codingarea.challenges.plugin.management.menu.MenuType; @@ -10,6 +11,7 @@ import javax.annotation.Nonnull; import java.util.function.BiConsumer; +@Setter public abstract class AbstractForceChallenge extends TimedChallenge { public static final int WAITING = 0, @@ -95,8 +97,4 @@ public final int getState() { return state; } - public void setState(int state) { - this.state = state; - } - } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java index 163fce396..7a8b496b4 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java @@ -56,12 +56,7 @@ private void killFailedPlayers(@Nonnull Iterable failed) { failed.forEach(ChallengeHelper::kill); } - @Override - protected void handleCountdown() { - bossbar.update(); - } - - protected abstract boolean isFailing(@Nonnull Player player); + protected abstract boolean isFailing(@Nonnull Player player); protected abstract void broadcastFailedMessage(@Nonnull Player player); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java index 463dd0ee2..153913c7b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.challenges.type.abstraction; +import lombok.Getter; import net.codingarea.challenges.plugin.ChallengeAPI; import net.codingarea.challenges.plugin.content.Message; import net.codingarea.challenges.plugin.content.Prefix; @@ -14,6 +15,7 @@ import java.util.Collections; import java.util.List; +@Getter public abstract class FirstPlayerAtHeightGoal extends SettingGoal { private int heightToGetTo; @@ -47,11 +49,7 @@ public void onMove(PlayerMoveEvent event) { } } - public int getHeightToGetTo() { - return heightToGetTo; - } - - protected void setHeightToGetTo(int heightToGetTo) { + protected void setHeightToGetTo(int heightToGetTo) { this.heightToGetTo = heightToGetTo; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java index a2e199a58..aeb3455cb 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java @@ -17,6 +17,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Objects; public abstract class ForceBattleDisplayGoal> extends ForceBattleGoal { @@ -62,7 +63,7 @@ public void updateDisplayStand(Player player) { public void handleDisplayStandUpdate(@NotNull Player player, @NotNull ArmorStand armorStand) { if (currentTarget.containsKey(player.getUniqueId())) { currentTarget.get(player.getUniqueId()).updateDisplayStand(armorStand); - } else if (armorStand.getEquipment().getHelmet() != null) { + } else if (Objects.requireNonNull(armorStand.getEquipment()).getHelmet() != null) { armorStand.getEquipment().setHelmet(null); } } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java index 0818c892d..b9a9e3276 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java @@ -38,19 +38,7 @@ public void restoreDefaults() { setValue(defaultValue); } - @Nonnull - @Override - public SoundSample getStartSound() { - return SoundSample.DRAGON_BREATH; - } - - @Nullable - @Override - public SoundSample getWinSound() { - return SoundSample.WIN; - } - - @Override + @Override public void handleClick(@Nonnull ChallengeMenuClickInfo info) { ChallengeHelper.handleModifierClick(info, this); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java index f4253a197..b46770766 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java @@ -102,7 +102,7 @@ public static BiConsumer createScoreboard(@Nonnull S if (displayed >= LEADERBOARD_SIZE) break; scoreboard.addLine(Message.forName("scoreboard-leaderboard").asString(place, NameHelper.getName(current), NumberFormatter.MIDDLE_NUMBER.format(entry.getKey()))); } - if (displayed >= LEADERBOARD_SIZE) break; + if (displayed == LEADERBOARD_SIZE) break; place++; } } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java index 5d65bb35e..9390c78ca 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java @@ -16,7 +16,6 @@ import net.codingarea.challenges.plugin.utils.logging.ConsolePrint; import javax.annotation.Nonnull; -import javax.print.Doc; import java.io.File; import java.io.IOException; import java.util.Map.Entry; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java index 89efdf0a1..85de7893c 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.content.loader; +import lombok.Getter; import net.anweisen.utilities.bukkit.utils.logging.Logger; import net.anweisen.utilities.common.collection.IOUtils; import net.anweisen.utilities.common.version.Version; @@ -12,28 +13,16 @@ public final class UpdateLoader extends ContentLoader { public static final int RESOURCE_ID = 80548; - private static boolean newestPluginVersion = true; - private static boolean newestConfigVersion = true; - private static Version defaultConfigVersion; - private static Version currentConfigVersion; + @Getter + private static boolean newestPluginVersion = true; + @Getter + private static boolean newestConfigVersion = true; + @Getter + private static Version defaultConfigVersion; + @Getter + private static Version currentConfigVersion; - public static Version getDefaultConfigVersion() { - return defaultConfigVersion; - } - - public static Version getCurrentConfigVersion() { - return currentConfigVersion; - } - - public static boolean isNewestConfigVersion() { - return newestConfigVersion; - } - - public static boolean isNewestPluginVersion() { - return newestPluginVersion; - } - - @Override + @Override protected void load() { try { URL url = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java index 669a3bbe5..993a08dc5 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.management.challenges; +import lombok.Getter; import net.anweisen.utilities.common.config.Document; import net.codingarea.challenges.plugin.Challenges; import net.codingarea.challenges.plugin.challenges.custom.CustomChallenge; @@ -16,6 +17,7 @@ import javax.annotation.Nonnull; import java.util.*; +@Getter public class CustomChallengesLoader extends ModuleChallengeLoader { private final Map customChallenges = new LinkedHashMap<>(); @@ -120,12 +122,4 @@ public void executeTrigger(@Nonnull ChallengeExecutionData challengeExecutionDat .onTriggerFulfilled(challengeExecutionData)); } - public int getMaxNameLength() { - return maxNameLength; - } - - public Map getCustomChallenges() { - return customChallenges; - } - } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java index 6e12c0c48..6bcebc258 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java @@ -31,11 +31,11 @@ public static String getTitle(@Nonnull MenuType menu, String... sub) { @Nonnull public static String getTitle(@Nonnull String menu, String... sub) { - String name = menu; + StringBuilder name = new StringBuilder(menu); for (String s : sub) { - name += getTitleSplitter() + s; + name.append(getTitleSplitter()).append(s); } - return getTitle(name); + return getTitle(name.toString()); } @Nonnull @@ -45,7 +45,7 @@ public static String getTitleSplitter() { @Nonnull public static String getMenuSettingTitle(@Nonnull MenuType menu, @Nonnull String name, int page, boolean showPages) { - return getTitle(menu.getName() + getTitleSplitter() + name + (showPages && false ? " §8• " + Message.forName("inventory-color") + (page + 1) : "")); + return getTitle(menu.getName() + getTitleSplitter() + name + (false ? " §8• " + Message.forName("inventory-color") + (page + 1) : "")); } @Nonnull diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java index 764580be4..3a27bfcee 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java @@ -220,7 +220,7 @@ public void handleClick(@Nonnull MenuClickInfo info) { index++; } - if (itemIndex >= 2) { + if (itemIndex == 2) { SoundSample.CLICK.play(info.getPlayer()); return; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java index fd7122c59..9a114acda 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java @@ -3,6 +3,9 @@ import java.util.List; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; + +import lombok.Getter; +import lombok.Setter; import net.anweisen.utilities.bukkit.utils.menu.MenuPosition; import net.anweisen.utilities.bukkit.utils.misc.CompatibilityUtils; import net.codingarea.challenges.plugin.management.menu.MenuType; @@ -12,9 +15,12 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; +@Getter +@Setter public abstract class MenuGenerator { - private MenuType menuType; + // ONLY MODIFY IF YOU KNOW WHAT YOU ARE DOING + private MenuType menuType; public abstract void generateInventories(); @@ -54,13 +60,4 @@ public void open(@Nonnull Player player, @Nonnegative int page) { player.openInventory(inventory); } - public MenuType getMenuType() { - return menuType; - } - - // ONLY MODIFY IF YOU KNOW WHAT YOU ARE DOING - public void setMenuType(MenuType menuType) { - this.menuType = menuType; - } - } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java index da3145a09..2059f5128 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.management.menu.generator.categorised; +import lombok.Getter; import net.codingarea.challenges.plugin.content.Message; import net.codingarea.challenges.plugin.utils.item.ItemBuilder; import net.codingarea.challenges.plugin.utils.misc.MinecraftNameWrapper; @@ -7,6 +8,7 @@ import java.util.function.Supplier; +@Getter public class SettingCategory { //Challenges @@ -40,20 +42,8 @@ public SettingCategory(int priority, Material material, Supplier messag this.messageSupplier = messageSupplier; } - public int getPriority() { - return priority; - } - - public ItemBuilder getDisplayItem() { + public ItemBuilder getDisplayItem() { return new ItemBuilder(material, messageSupplier.get()); } - public Material getMaterial() { - return material; - } - - public Supplier getMessageSupplier() { - return messageSupplier; - } - } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java index a12cccb13..e0d5fa869 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java @@ -41,12 +41,7 @@ public String[] getSubTitles(int page) { return new String[]{title}; } - @Override - public int[] getNavigationSlots(int page) { - return MainCustomMenuGenerator.NAVIGATION_SLOTS; - } - - @Override + @Override public void accept(Player player, SettingType type, Map data) { subSettings.putAll(data); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java index 7b7bab270..d0465a925 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java @@ -228,10 +228,7 @@ public void handleClick(@Nonnull MenuClickInfo info) { Player player = info.getPlayer(); switch (info.getSlot()) { - default: - SoundSample.CLICK.play(player); - break; - case DELETE_SLOT: + case DELETE_SLOT: if (!Challenges.getInstance().getCustomChallengesLoader().getCustomChallenges().containsKey(uuid)) { Message.forName("custom-not-deleted").send(player, Prefix.CUSTOM); SoundSample.BASS_OFF.play(player); @@ -301,7 +298,10 @@ public void handleClick(@Nonnull MenuClickInfo info) { materialMenuGenerator.open(player, 0); SoundSample.CLICK.play(player); break; - } + default: + SoundSample.CLICK.play(player); + break; + } } } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java index 73a020dd5..4c7da170a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java @@ -64,7 +64,7 @@ public void generatePage(@Nonnull Inventory inventory, int page) { @Override public void onPreChallengePageClicking(@Nonnull MenuClickInfo info, int page) { if (info.getSlot() == VIEW_SLOT) { - if (Challenges.getInstance().getCustomChallengesLoader().getCustomChallenges().size() == 0) { + if (Challenges.getInstance().getCustomChallengesLoader().getCustomChallenges().isEmpty()) { Message.forName("custom-not-loaded").send(info.getPlayer(), Prefix.CUSTOM); return; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java index be1e86430..5f0484895 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java @@ -1,5 +1,8 @@ package net.codingarea.challenges.plugin.management.scheduler; +import lombok.Getter; + +@Getter public abstract class AbstractTaskConfig { protected final boolean async; @@ -8,8 +11,4 @@ public AbstractTaskConfig(boolean async) { this.async = async; } - public boolean isAsync() { - return async; - } - } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java index b34dcc313..2c1873c2d 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java @@ -17,7 +17,6 @@ import net.codingarea.challenges.plugin.management.scheduler.policy.TimerPolicy; import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask; import net.codingarea.challenges.plugin.management.server.ChallengeEndCause; -import net.codingarea.challenges.plugin.utils.misc.FontUtils; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.*; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java index a876c4ad0..07bc2790a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java @@ -30,7 +30,7 @@ public final class ServerManager { private final boolean winSounds; private boolean isFresh; // This indicated if the timer was never started before - private boolean hasCheated = false; + private boolean hasCheated; public ServerManager() { Document sessionConfig = Challenges.getInstance().getConfigManager().getSessionConfig(); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java index db4028ee9..ff503aca6 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.management.server; +import lombok.Getter; import net.anweisen.utilities.common.config.Document; import net.codingarea.challenges.plugin.Challenges; import net.codingarea.challenges.plugin.content.Message; @@ -7,6 +8,7 @@ import javax.annotation.Nonnull; +@Getter public final class TitleManager { private static final int fadein = 5, duration = 20, fadeout = 10; @@ -30,15 +32,7 @@ public void sendChallengeStatusTitle(@Nonnull Message message, @Nonnull Object.. message.broadcastTitle(args); } - public boolean isChallengeStatusEnabled() { - return challengeStatusEnabled; - } - - public boolean isTimerStatusEnabled() { - return timerStatusEnabled; - } - - public void sendTitle(@Nonnull Player player, @Nonnull String title, @Nonnull String subtitle) { + public void sendTitle(@Nonnull Player player, @Nonnull String title, @Nonnull String subtitle) { player.sendTitle(title, subtitle, fadein, duration, fadeout); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java index d0f6093d6..78f5e5b2b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java @@ -88,16 +88,16 @@ public void update(@Nonnull Player player) { } } - public final void show() { + public void show() { Challenges.getInstance().getScoreboardManager().setCurrentScoreboard(this); } - public final void hide() { + public void hide() { if (Challenges.getInstance().getScoreboardManager().getCurrentScoreboard() != this) return; Challenges.getInstance().getScoreboardManager().setCurrentScoreboard(null); } - public final boolean isShown() { + public boolean isShown() { return Challenges.getInstance().getScoreboardManager().isShown(this); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java index c7982e92b..b4f4d9c6b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java @@ -113,7 +113,7 @@ private PlayerStats getStatsFromDatabase(@Nonnull UUID uuid, @Nonnull String nam .select("stats", "name") .where("uuid", uuid) .execute().first() - .map(result -> new PlayerStats(uuid, result.getString("name"), result.getDocument("stats"))) + .map(result -> new PlayerStats(uuid, Objects.requireNonNull(result.getString("name")), result.getDocument("stats"))) .orElse(new PlayerStats(uuid, name)); } @@ -134,7 +134,7 @@ private List getAllStats0() throws DatabaseException { .select("uuid", "stats", "name") .execute().all() .filter(result -> result.getUUID("uuid") != null) - .map(result -> new PlayerStats(result.getUUID("uuid"), result.getString("name"), result.getDocument("stats"))) + .map(result -> new PlayerStats(Objects.requireNonNull(result.getUUID("uuid")), Objects.requireNonNull(result.getString("name")), result.getDocument("stats"))) .collect(Collectors.toList()); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java index 734718d29..2b8de1c9b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java @@ -144,7 +144,7 @@ public List onTabComplete(@NotNull CommandSender sender, @NotNull Comman if (args.length <= 1) { return Utils.filterRecommendations(args[0], "save", "load", "reset"); - } else if (args.length <= 2) { + } else if (args.length == 2) { return Utils.filterRecommendations(args[1], databaseExecutors.keySet().toArray(new String[0])); } return Lists.newLinkedList(); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java index 8b042bdc7..e295cd168 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java @@ -22,7 +22,7 @@ public class GamemodeCommand implements SenderCommand, Completer { public void onCommand(@NotNull CommandSender sender, @NotNull String[] args) throws Exception { List targets = new ArrayList<>(); - if (args.length <= 0) { + if (args.length == 0) { Message.forName("syntax").send(sender, Prefix.CHALLENGES, "gm [player]"); return; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java index 0a47e3dd3..16b5397fb 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java @@ -4,10 +4,8 @@ import net.codingarea.challenges.plugin.content.Prefix; import net.codingarea.challenges.plugin.utils.bukkit.command.Completer; import net.codingarea.challenges.plugin.utils.bukkit.command.SenderCommand; -import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion; import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper; import net.codingarea.challenges.plugin.utils.misc.CommandHelper; -import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java index 4ee7ff32d..87759746f 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java @@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; +import java.util.Objects; public class LanguageCommand implements SenderCommand, Completer { @@ -25,12 +26,12 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String[] args) thr case "german": case "deutsch": case "de": - Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class).changeLanguage("de"); + Objects.requireNonNull(Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class)).changeLanguage("de"); break; case "english": case "englisch": case "en": - Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class).changeLanguage("en"); + Objects.requireNonNull(Challenges.getInstance().getLoaderRegistry().getFirstLoaderByClass(LanguageLoader.class)).changeLanguage("en"); break; default: Message.forName("unsuported-language").send(sender, Prefix.CHALLENGES, args[0]); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java index e98dbc4f7..861d1fb02 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java @@ -17,7 +17,6 @@ import net.codingarea.challenges.plugin.utils.misc.StatsHelper; import net.codingarea.challenges.plugin.utils.misc.Utils; import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import javax.annotation.Nonnull; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java index fd133bf74..4d8bb05fe 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java @@ -30,7 +30,7 @@ public TimeCommand() { @Override public void onCommand(@Nonnull Player player, @Nonnull String[] args) throws Exception { - if (args.length <= 0) { + if (args.length == 0) { Message.forName("syntax").send(player, Prefix.CHALLENGES, "time "); return; } @@ -50,7 +50,7 @@ public void onCommand(@Nonnull Player player, @Nonnull String[] args) throws Exc player.performCommand("time set midnight"); break; case "set": { - if (args.length <= 1) { + if (args.length == 1) { Message.forName("syntax").send(player, Prefix.CHALLENGES, "time set "); break; } @@ -70,7 +70,7 @@ public void onCommand(@Nonnull Player player, @Nonnull String[] args) throws Exc break; } case "add": { - if (args.length <= 1) { + if (args.length == 1) { Message.forName("syntax").send(player, Prefix.CHALLENGES, "time add "); break; } @@ -83,7 +83,7 @@ public void onCommand(@Nonnull Player player, @Nonnull String[] args) throws Exc break; } case "subtract": { - if (args.length <= 1) { + if (args.length == 1) { Message.forName("syntax").send(player, Prefix.CHALLENGES, "time subtract "); break; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java index dc9162d1c..234662988 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java @@ -78,10 +78,7 @@ public void onCommand(@Nonnull CommandSender sender, @Nonnull String[] args) { break; } switch (args[1].toLowerCase()) { - default: - Message.forName("syntax").send(sender, Prefix.TIMER, "timer mode "); - break; - case "up": + case "up": case "forward": Challenges.getInstance().getChallengeTimer().setCountingUp(true); break; @@ -90,7 +87,10 @@ public void onCommand(@Nonnull CommandSender sender, @Nonnull String[] args) { case "backwards": Challenges.getInstance().getChallengeTimer().setCountingUp(false); break; - } + default: + Message.forName("syntax").send(sender, Prefix.TIMER, "timer mode "); + break; + } } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java index 098ead5c2..7c5078c7e 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java @@ -7,11 +7,11 @@ import javax.annotation.Nonnull; +@Getter public class PlayerInventoryClickEvent extends InventoryClickEventWrapper { private static final HandlerList handlers = new HandlerList(); - @Getter private final Player player; public PlayerInventoryClickEvent(@Nonnull InventoryClickEvent event) { diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java index bc3609180..60e77344b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java @@ -15,53 +15,11 @@ public class VoidMapGenerator extends ChunkGenerator { private static final boolean generateEndPortal = MinecraftVersion.current().getMinor() == 18; -// private static class PortalInfo { -// -// private final int chunkX; -// private final int y; -// private final int chunkZ; -// -// public PortalInfo(int chunkX, int y, int chunkZ) { -// this.chunkX = chunkX; -// this.y = y; -// this.chunkZ = chunkZ; -// } -// -// } - -// private List portalChunks; -// -// public void loadStrongholds(World world) { -// -// for (int i = 0; i < 3; i++) { -// Bukkit.getScheduler().runTaskLater(Challenges.getInstance().getPlugin(), () -> { -// Location portal = world -// .locateNearestStructure(new Location(world, 0, 0, 0), StructureType.STRONGHOLD, 180, -// true); -// if (portal != null) { -// Chunk chunk = portal.getChunk(); -// chunk.load(true); -// portalChunks.add(new PortalInfo(chunk.getX(), portal.getBlockY(), chunk.getZ())); -// } -// }, i*5); -// -// } -// -// -// } - - @Override + @Override @Nonnull public ChunkData generateChunkData(@Nonnull World world, @Nonnull Random random, int x, int z, @Nonnull BiomeGrid biome) { -// if (portalChunks == null) { -// portalChunks = Lists.newLinkedList(); -// Bukkit.getScheduler().runTask(Challenges.getInstance().getPlugin(), () -> { -// loadStrongholds(world); -// }); -// } - - ChunkData chunkData = createChunkData(world); + ChunkData chunkData = createChunkData(world); if (x == 0 && z == 0) { chunkData.setBlock(0, 59, 0, Material.BEDROCK); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java index c17bda8ed..453464bac 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java @@ -33,17 +33,11 @@ public void onGameModeChange(@Nonnull PlayerGameModeChangeEvent event) { @EventHandler(priority = EventPriority.MONITOR) public void onSneak(PlayerToggleSneakEvent event) { - if (!event.isSneaking()) return; -// -// StructureManager manager = Bukkit.getStructureManager(); -// Map structures = manager.getStructures(); -// // Entry entry = IRandom.threadLocal().choose(entries); + if (!event.isSneaking()) { + } //// Structure structure = entry.getValue(); -// Structure structure = manager.getStructure(new NamespacedKey("minecraft", "shipwreck/rightsideup_backhalf")); -// structure.place(event.getPlayer().getLocation(), true, StructureRotation.NONE, Mirror.NONE, -1, 0, -// ThreadLocalRandom.current()); - } + } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onCommand(@Nonnull PlayerCommandPreprocessEvent event) { diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java index 5d12811ae..0b6729a3b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java @@ -81,8 +81,7 @@ public void onGameModeChange(PlayerGameModeChangeEvent event) { isIgnored = true; } else if (!AbstractChallenge.ignoreGameMode(event.getNewGameMode()) && AbstractChallenge.ignoreGameMode(event.getPlayer().getGameMode())) { execute = true; - isIgnored = false; - } + } if (execute) { PlayerIgnoreStatusChangeEvent statusEvent = new PlayerIgnoreStatusChangeEvent(event.getPlayer(), isIgnored); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java index e94d0de28..6711694e9 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java @@ -18,8 +18,7 @@ public class BukkitSerialization { * * @param playerInventory to turn into an array of strings. * @return Array of strings: [ main content, armor content ] - * @throws IllegalStateException - */ + */ public static String[] playerInventoryToBase64(PlayerInventory playerInventory) throws IllegalStateException { //get the main content part, this doesn't return the armor String content = toBase64(playerInventory); @@ -37,8 +36,7 @@ public static String[] playerInventoryToBase64(PlayerInventory playerInventory) * * @param items to turn into a Base64 String. * @return Base64 string of the items. - * @throws IllegalStateException - */ + */ public static String itemStackArrayToBase64(ItemStack[] items) throws IllegalStateException { try { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); @@ -72,8 +70,7 @@ public static String itemStackArrayToBase64(ItemStack[] items) throws IllegalSta * * @param inventory to serialize * @return Base64 string of the provided inventory - * @throws IllegalStateException - */ + */ public static String toBase64(Inventory inventory) throws IllegalStateException { try { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); @@ -104,8 +101,7 @@ public static String toBase64(Inventory inventory) throws IllegalStateException * * @param data Base64 string of data containing an inventory. * @return Inventory created from the Base64 string. - * @throws IOException - */ + */ public static Inventory fromBase64(Inventory inventory, String data) throws IOException { try { ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data)); @@ -128,12 +124,11 @@ public static Inventory fromBase64(Inventory inventory, String data) throws IOEx *

*

*

- * Base off of {@link #fromBase64(String)}. + * Base off of . * * @param data Base64 string to convert to ItemStack array. * @return ItemStack array created from the Base64 string. - * @throws IOException - */ + */ public static ItemStack[] itemStackArrayFromBase64(String data) throws IOException { try { ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data)); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java index 8b03d4c7d..6c0f43430 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java @@ -63,7 +63,8 @@ public static List format(@Nonnull String sequence, @Nonnull Obje } else { if (lastWasParagraph) { ChatColor newColor = ChatColor.getByChar(c); - if (!newColor.isColor()) { + assert newColor != null; + if (!newColor.isColor()) { if (newColor == ChatColor.RESET) { currentFormatting.clear(); currentColor = null; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java index fe0353359..c40302d9d 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java @@ -1,4 +1,4 @@ -package net.codingarea.challenges.plugin.utils.bukkit.misc.version; +package net.codingarea.challenges.plugin.utils.bukkit.misc.Version; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/Version.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/Version.java index 3b2d48418..b7918391b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/Version.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/Version.java @@ -1,4 +1,4 @@ -package net.codingarea.challenges.plugin.utils.bukkit.misc.version; +package net.codingarea.challenges.plugin.utils.bukkit.misc.Version; import java.util.ArrayList; import java.util.Arrays; @@ -82,7 +82,7 @@ static Version parseExceptionally(@Nullable String input) { @Nonnull @CheckReturnValue static Version getAnnotatedSince(@Nonnull Object object) { - return (Version)(!object.getClass().isAnnotationPresent(Since.class) ? new VersionInfo(1, 0, 0) : parse(((Since)object.getClass().getAnnotation(Since.class)).value())); + return (Version)(!object.getClass().isAnnotationPresent(Since.class) ? new VersionInfo(1, 0, 0) : parse(object.getClass().getAnnotation(Since.class).value())); } @Nonnull diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionComparator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionComparator.java index 205a5cbfe..4c856af7a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionComparator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionComparator.java @@ -1,4 +1,4 @@ -package net.codingarea.challenges.plugin.utils.bukkit.misc.version; +package net.codingarea.challenges.plugin.utils.bukkit.misc.Version; import java.util.Comparator; import javax.annotation.Nonnull; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionInfo.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionInfo.java index 17b50e494..1564993bd 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionInfo.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/VersionInfo.java @@ -1,9 +1,12 @@ -package net.codingarea.challenges.plugin.utils.bukkit.misc.version; +package net.codingarea.challenges.plugin.utils.bukkit.misc.Version; import java.util.Objects; import javax.annotation.Nullable; + +import lombok.Getter; import net.anweisen.utilities.common.logging.ILogger; +@Getter public class VersionInfo implements Version { protected static final ILogger logger = ILogger.forThisClass(); private final int major; @@ -20,28 +23,16 @@ public VersionInfo(int major, int minor, int revision) { this.revision = revision; } - public int getMajor() { - return this.major; - } - - public int getMinor() { - return this.minor; - } - - public int getRevision() { - return this.revision; - } - public boolean equals(Object other) { if (this == other) { return true; } else { - return !(other instanceof Version) ? false : this.equals((Version)other); + return other instanceof Version && this.equals(other); } } public int hashCode() { - return Objects.hash(new Object[]{this.major, this.minor, this.revision}); + return Objects.hash(this.major, this.minor, this.revision); } public String toString() { @@ -72,7 +63,7 @@ public static Version parse(@Nullable String input, Version def) { try { return parseExceptionally(input); } catch (Exception ex) { - logger.error("Could not parse version for input {}", new Object[]{ex.getMessage()}); + logger.error("Could not parse version for input {}", ex.getMessage()); return def; } } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java index f899d1aaa..07bc07991 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.utils.bukkit.nms; +import lombok.Getter; import net.anweisen.utilities.bukkit.utils.misc.MinecraftVersion; import net.codingarea.challenges.plugin.Challenges; import net.codingarea.challenges.plugin.utils.bukkit.nms.implementations.v1_13.*; @@ -15,6 +16,13 @@ public class NMSProvider { private final static int majorVersion; + /** + * -- GETTER -- + * + * @return A border packet factory + * + */ + @Getter private static final BorderPacketFactory borderPacketFactory; static { @@ -100,14 +108,6 @@ public static PacketBorder createPacketBorder(World world) { throw new IllegalStateException("Could not find a PacketBorder implementation for version " + getFormattedVersion()); } - /** - * @return A border packet factory - * @throws IllegalStateException If no implementation was found for the current version - */ - public static BorderPacketFactory getBorderPacketFactory() { - return borderPacketFactory; - } - private static boolean versionIsAtLeast(int majorVersion) { return NMSProvider.majorVersion >= majorVersion; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java index 3dd617ac6..d0415f66a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java @@ -12,8 +12,8 @@ import org.bukkit.Bukkit; /** - * @author TobiasDeBruijn | https://github.com/TobiasDeBruijn - * @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil + * @author TobiasDeBruijn | .* @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil */ public class ReflectionUtil { @@ -27,7 +27,6 @@ public class ReflectionUtil { * (<=1.16) or * (>=1.17). * - * @return Returns true if it is, false if it is now */ @Getter private static boolean useNewSpigotPackaging; @@ -38,7 +37,6 @@ public class ReflectionUtil { *

* E.g for Minecraft 1.18 this is 18. * - * @return The current major Minecraft version */ @Getter private static int majorVersion; @@ -48,7 +46,6 @@ public class ReflectionUtil { *

* E.g. for Minecraft 1.18.2 this is 2. * - * @return The current minor Minecraft version */ @Getter private static int minorVersion; @@ -193,9 +190,7 @@ public static Field getField(Class clazz, String fieldName) throws NoSuchFiel * @param instance The instance of the class in which the field is defined * @param fieldName The name of the field * @param value The value the field should be set to - * @throws NoSuchFieldException - * @throws IllegalAccessException - */ + */ public static void setFieldValue(Object instance, String fieldName, Object value) throws NoSuchFieldException, IllegalAccessException { Field field = instance.getClass().getDeclaredField(fieldName); field.setAccessible(true); @@ -209,8 +204,7 @@ public static void setFieldValue(Object instance, String fieldName, Object value * @param methodName The name of the method * @param args The argument types the method takes * @return Returns the Method - * @throws NoSuchMethodException - */ + */ public static Method getMethod(Class clazz, String methodName, Class... args) throws NoSuchMethodException { Method m = clazz.getDeclaredMethod(methodName, args); m.setAccessible(true); @@ -223,11 +217,7 @@ public static Method getMethod(Class clazz, String methodName, Class... ar * @param obj The object to invoke the method on * @param methodName The name of the Method * @return Returns the result of the method, can be null if the method returns void - * @throws NoSuchMethodException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ + */ public static Object invokeMethod(Object obj, String methodName) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { return invokeMethod(obj.getClass(), obj, methodName); } @@ -239,11 +229,7 @@ public static Object invokeMethod(Object obj, String methodName) throws NoSuchMe * @param methodName The name of the Method * @param args The arguments to pass to the Method * @return Returns the result of the method, can be null if the method returns void - * @throws NoSuchMethodException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ + */ public static Object invokeMethod(Object obj, String methodName, Object[] args) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { return invokeMethod(obj.getClass(), obj, methodName, args); } @@ -256,11 +242,7 @@ public static Object invokeMethod(Object obj, String methodName, Object[] args) * @param argTypes The types of arguments as a Class array * @param args The arguments as an object array * @return Returns the result of the method, can be null if the method returns void - * @throws NoSuchMethodException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ + */ public static Object invokeMethod(Object obj, String methodName, Class[] argTypes, Object[] args) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { return invokeMethod(obj.getClass(), obj, methodName, argTypes, args); } @@ -273,11 +255,7 @@ public static Object invokeMethod(Object obj, String methodName, Class[] argT * @param methodName The name of the method * @param args The arguments to be passed to the method * @return Returns the result of the method, can be null if the method returns void - * @throws NoSuchMethodException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ + */ public static Object invokeMethod(Class clazz, Object obj, String methodName, Object... args) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { Class[] argTypes = new Class[args.length]; for (int i = 0; i < args.length; i++) { @@ -296,11 +274,7 @@ public static Object invokeMethod(Class clazz, Object obj, String methodName, * @param argTypes Argument types * @param args Arguments to pass to the method * @return Returns the result of the method, can be null if the method returns void - * @throws NoSuchMethodException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ + */ public static Object invokeMethod(Class clazz, Object obj, String methodName, Class[] argTypes, Object[] args) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { Method m = getMethod(clazz, methodName, argTypes); return m.invoke(obj, args); @@ -312,10 +286,7 @@ public static Object invokeMethod(Class clazz, Object obj, String methodName, * @param obj The object in which the field is located, and from which to get the value * @param name The name of the Field to get the value from * @return Returns the value of the Field - * @throws NoSuchFieldException - * @throws IllegalArgumentException - * @throws IllegalAccessException - */ + */ public static Object getObject(Object obj, String name) throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException { return getObject(obj.getClass(), obj, name); } @@ -327,9 +298,6 @@ public static Object getObject(Object obj, String name) throws NoSuchFieldExcept * @param clazz The Class in which the Field is defined * @param name The name of the Field * @return Returns the value of the Field - * @throws NoSuchFieldException - * @throws IllegalArgumentException - * @throws IllegalAccessException * @deprecated Use {@link #getObject(Class, Object, String)} instead */ @Deprecated @@ -344,10 +312,7 @@ public static Object getObject(Object obj, Class clazz, String name) throws N * @param obj The Object to get the value from * @param name The name of the Field * @return Returns the value of the Field - * @throws NoSuchFieldException - * @throws IllegalArgumentException - * @throws IllegalAccessException - */ + */ public static Object getObject(Class clazz, Object obj, String name) throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException { Field f = getField(clazz, name); f.setAccessible(true); @@ -360,12 +325,7 @@ public static Object getObject(Class clazz, Object obj, String name) throws N * @param clazz The Class in which the Constructor is defined * @param args The arguments to pass to the Constructor * @return Returns an instance of the provided Class in which the Constructor is located - * @throws NoSuchMethodException - * @throws InstantiationException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ + */ public static Object invokeConstructor(Class clazz, Object... args) throws NoSuchMethodException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { Class[] argTypes = new Class[args.length]; for (int i = 0; i < args.length; i++) { @@ -382,12 +342,7 @@ public static Object invokeConstructor(Class clazz, Object... args) throws No * @param argTypes The argument types * @param args The arguments to pass to the constructor * @return Returns an instance of the provided Class in which the Constructor is located - * @throws NoSuchMethodException - * @throws InstantiationException - * @throws IllegalAccessException - * @throws IllegalArgumentException - * @throws InvocationTargetException - */ + */ public static Object invokeConstructor(Class clazz, Class[] argTypes, Object[] args) throws NoSuchMethodException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { Constructor con = getConstructor(clazz, argTypes); return con.newInstance(args); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java index d2f329402..c104b2598 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java @@ -32,6 +32,7 @@ private Object createPacket(PacketBorder packetBorder, String worldBorderAction) try { Class clazz = NMSUtils.getClass("PacketPlayOutWorldBorder"); Class actionClazz = NMSUtils.getClass("PacketPlayOutWorldBorder$EnumWorldBorderAction"); + assert actionClazz != null; for (Object enumConstant : actionClazz.getEnumConstants()) { if (enumConstant.toString().equalsIgnoreCase(worldBorderAction)) { return ReflectionUtil.invokeConstructor(clazz, new Class[]{packetBorder.getNMSClass(), actionClazz}, new Object[]{packetBorder.getWorldBorderObject(), enumConstant}); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java index 8e991c636..9ec5f716b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java @@ -15,15 +15,5 @@ public PacketBorder_1_17(World world) { ); } - @Override - protected Object createWorldBorder() { - try { - return ReflectionUtil.invokeConstructor(nmsClass); - } catch (Exception exception) { - Challenges.getInstance().getLogger().error("Failed to create world border:", exception); - return null; - } - } - } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java index 48e101f32..afff1f330 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java @@ -4,8 +4,8 @@ import org.bukkit.entity.Player; /** - * @author TobiasDeBruijn | https://github.com/TobiasDeBruijn - * @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil + * @author TobiasDeBruijn | .* @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil */ public abstract class CraftPlayer extends BukkitNMSClass { diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java index 1625cb2c2..96fcd5a26 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java @@ -1,8 +1,8 @@ package net.codingarea.challenges.plugin.utils.bukkit.nms.type; /** - * @author TobiasDeBruijn | https://github.com/TobiasDeBruijn - * @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil + * @author TobiasDeBruijn | .* @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil */ public abstract class PlayerConnection extends AbstractNMSClass { diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java index 7857104ad..415637d7a 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java @@ -1,8 +1,5 @@ package net.codingarea.challenges.plugin.utils.item; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.UUID; import net.codingarea.challenges.plugin.content.Message; import net.codingarea.challenges.plugin.utils.item.ItemBuilder.SkullBuilder; import net.codingarea.challenges.plugin.utils.misc.MinecraftNameWrapper; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java index 24f8ed898..dead068e2 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java @@ -3,13 +3,8 @@ import com.google.gson.JsonParser; import lombok.NonNull; import net.anweisen.utilities.bukkit.utils.item.BannerPattern; -import net.anweisen.utilities.bukkit.utils.misc.GameProfileUtils; -import net.anweisen.utilities.common.annotations.DeprecatedSince; -import net.anweisen.utilities.common.annotations.ReplaceWith; -import net.codingarea.challenges.plugin.Challenges; import net.codingarea.challenges.plugin.content.ItemDescription; import net.codingarea.challenges.plugin.content.Message; -import net.codingarea.challenges.plugin.utils.misc.DatabaseHelper; import org.bukkit.*; import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.PatternType; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java index 716d88602..42a6efc52 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java @@ -65,9 +65,7 @@ public static boolean isObtainableInSurvival(@Nonnull Material material) { } if (MinecraftVersion.current().isOlderThan(MinecraftVersion.V1_19)) { - if (name.equals("SCULK_SENSOR")) { - return false; - } + return !name.equals("SCULK_SENSOR"); } return true; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java index edee046dd..071ef4ffc 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java @@ -144,11 +144,9 @@ public static void setBlockNatural(@Nullable Block block, @Nonnull Material type if (!upperBlock.getType().isSolid()) { upperBlock.breakNaturally(); - if (playSound) { - // TODO: PLAY THE RIGHT BREAKING SOUND FOR THE BLOCK - } + // TODO: PLAY THE RIGHT BREAKING SOUND FOR THE BLOCK - } + } block.setType(type, blockUpdate); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java index 3b4ddbff2..f2a5bda15 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java @@ -26,7 +26,7 @@ public final ListBuilder addAll(T... t) { return addAll(Arrays.asList(t)); } - public final ListBuilder addAll(Collection collection) { + public ListBuilder addAll(Collection collection) { list.addAll(collection); return this; } @@ -36,7 +36,7 @@ public final ListBuilder addAllIfNotContains(T... t) { return addAllIfNotContains(Arrays.asList(t)); } - public final ListBuilder addAllIfNotContains(Collection collection) { + public ListBuilder addAllIfNotContains(Collection collection) { for (T t : collection) { if (!list.contains(t)) list.add(t); }