diff --git a/src/main/java/net/babamod/mineclass/classes/BeastMasterClass.java b/src/main/java/net/babamod/mineclass/classes/BeastMasterClass.java index 6a27827..d80cc78 100644 --- a/src/main/java/net/babamod/mineclass/classes/BeastMasterClass.java +++ b/src/main/java/net/babamod/mineclass/classes/BeastMasterClass.java @@ -11,7 +11,6 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -@SuppressWarnings("unused") public class BeastMasterClass extends MineClassImpl { private static final Set forbiddenItems = diff --git a/src/main/java/net/babamod/mineclass/classes/DwarfClass.java b/src/main/java/net/babamod/mineclass/classes/DwarfClass.java index 5ca0d09..aab3e05 100644 --- a/src/main/java/net/babamod/mineclass/classes/DwarfClass.java +++ b/src/main/java/net/babamod/mineclass/classes/DwarfClass.java @@ -10,7 +10,6 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -@SuppressWarnings("unused") public class DwarfClass extends MineClassImpl { private final Set forbiddenItems = diff --git a/src/main/java/net/babamod/mineclass/classes/ElfClass.java b/src/main/java/net/babamod/mineclass/classes/ElfClass.java index 7d39568..24ccdda 100644 --- a/src/main/java/net/babamod/mineclass/classes/ElfClass.java +++ b/src/main/java/net/babamod/mineclass/classes/ElfClass.java @@ -10,7 +10,6 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -@SuppressWarnings("unused") public class ElfClass extends MineClassImpl { private static final Set forbiddenItems = diff --git a/src/main/java/net/babamod/mineclass/classes/EnderElfClass.java b/src/main/java/net/babamod/mineclass/classes/EnderElfClass.java index 4f50389..521515c 100644 --- a/src/main/java/net/babamod/mineclass/classes/EnderElfClass.java +++ b/src/main/java/net/babamod/mineclass/classes/EnderElfClass.java @@ -13,7 +13,6 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -@SuppressWarnings("unused") public class EnderElfClass extends MineClassImpl { private static final Set forbiddenItems = diff --git a/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java b/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java index 493e5f1..ec23c77 100644 --- a/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java +++ b/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java @@ -10,7 +10,6 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -@SuppressWarnings("unused") public class FireDwarfClass extends MineClassImpl { private static final Set forbiddenItems = @@ -86,8 +85,7 @@ public class FireDwarfClass extends MineClassImpl { Material.CROSSBOW, Collections.singletonList(new Pair<>(Enchantment.ARROW_INFINITE, 1))), new AbstractMap.SimpleEntry<>( - Material.FLINT_AND_STEEL, new ArrayList>()) - ) + Material.FLINT_AND_STEEL, new ArrayList>())) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); @Override diff --git a/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java b/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java index 8b356ee..b99fbd7 100644 --- a/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java +++ b/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java @@ -1,13 +1,11 @@ package net.babamod.mineclass.classes; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import java.util.*; -import java.util.logging.Level; public class MineClassFactory { /** Instance unique pré-initialisée */ @@ -70,16 +68,14 @@ public class MineClassFactory { } public synchronized void setClassCode(Player player, String code) { - player - .getScoreboardTags() - .removeAll(availableClasses.keySet()); + player.getScoreboardTags().removeAll(availableClasses.keySet()); player.addScoreboardTag(code); } public synchronized Optional getRightClass(Player player) { for (Map.Entry stringMineClassEntry : availableClasses.entrySet()) { if (getClassCode(player) != null - && getClassCode(player).equals(stringMineClassEntry.getKey())) { + && getClassCode(player).equals(stringMineClassEntry.getKey())) { return Optional.of(stringMineClassEntry.getValue()); } } diff --git a/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java b/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java index 3541279..738e797 100644 --- a/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java +++ b/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java @@ -6,7 +6,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import java.util.ArrayList; -import java.util.stream.Collectors; public abstract class MineClassImpl implements MineClass { diff --git a/src/main/java/net/babamod/mineclass/commands/CommandClass.java b/src/main/java/net/babamod/mineclass/commands/CommandClass.java index 41461de..f948ade 100644 --- a/src/main/java/net/babamod/mineclass/commands/CommandClass.java +++ b/src/main/java/net/babamod/mineclass/commands/CommandClass.java @@ -3,11 +3,11 @@ package net.babamod.mineclass.commands; import net.babamod.mineclass.classes.MineClassFactory; import net.babamod.mineclass.utils.InvocationsFinder; import net.babamod.mineclass.utils.NumberOfInvocations; -import org.bukkit.attribute.Attribute; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.*; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -23,14 +23,18 @@ public class CommandClass implements CommandExecutor { Player player = (Player) sender; if (MineClassFactory.getInstance().getAvailableClassCodes().contains(args[0])) { if (MineClassFactory.getInstance().getClassCode(player).equals("beast_master")) { - InvocationsFinder.findWolfs(player).forEach(entity -> { - entity.remove(); - NumberOfInvocations.getInstance().decreaseNumber(player); - }); - InvocationsFinder.findCats(player).forEach(entity -> { - entity.remove(); - NumberOfInvocations.getInstance().decreaseNumber(player); - }); + InvocationsFinder.findWolfs(player) + .forEach( + entity -> { + entity.remove(); + NumberOfInvocations.getInstance().decreaseNumber(player); + }); + InvocationsFinder.findCats(player) + .forEach( + entity -> { + entity.remove(); + NumberOfInvocations.getInstance().decreaseNumber(player); + }); InvocationsFinder.findHorses(player).forEach(Entity::remove); } MineClassFactory.clearAllClassEffects(player); @@ -39,7 +43,7 @@ public class CommandClass implements CommandExecutor { MineClassFactory.getInstance().dropForbiddenItemsForClassByCode(args[0], player); MineClassFactory.getInstance().setClassCode(player, args[0]); if (!player.hasPotionEffect(PotionEffectType.SATURATION)) { - player.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION,200, 9)); + player.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION, 200, 9)); } return true; } @@ -49,8 +53,7 @@ public class CommandClass implements CommandExecutor { return true; } if (args[0].equals("whoami")) { - String classCode = - MineClassFactory.getInstance().getClassCode(player); + String classCode = MineClassFactory.getInstance().getClassCode(player); if (classCode != null) { player.sendMessage(String.format("You are a %s.", classCode)); } else { @@ -61,6 +64,4 @@ public class CommandClass implements CommandExecutor { } return false; } - - } diff --git a/src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java b/src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java index fdf3fa3..cd29e3f 100644 --- a/src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java +++ b/src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java @@ -295,9 +295,11 @@ public class MineClassListeners implements Listener { } } if (player.isSneaking() - && (event.getAction().equals(Action.RIGHT_CLICK_BLOCK) || event.getAction().equals(Action.RIGHT_CLICK_AIR)) + && (event.getAction().equals(Action.RIGHT_CLICK_BLOCK) + || event.getAction().equals(Action.RIGHT_CLICK_AIR)) && MineClassFactory.getInstance().getClassCode(player).equals("ender_elf") - && event.getItem() != null && event.getItem().getType().equals(Material.ENDER_PEARL)) { + && event.getItem() != null + && event.getItem().getType().equals(Material.ENDER_PEARL)) { player.openInventory(player.getEnderChest()); event.setCancelled(true); } diff --git a/src/main/java/net/babamod/mineclass/utils/InvocationsFinder.java b/src/main/java/net/babamod/mineclass/utils/InvocationsFinder.java index e5321c4..de578ac 100644 --- a/src/main/java/net/babamod/mineclass/utils/InvocationsFinder.java +++ b/src/main/java/net/babamod/mineclass/utils/InvocationsFinder.java @@ -51,8 +51,8 @@ public class InvocationsFinder { entity -> entity.hasMetadata("beastMasterHorse") && entity.getMetadata("beastMasterHorse").stream() - .anyMatch( - metadataValue -> metadataValue.asString().equals(player.getName()))) + .anyMatch( + metadataValue -> metadataValue.asString().equals(player.getName()))) .collect(Collectors.toList()); } } diff --git a/src/main/java/net/babamod/mineclass/utils/NumberOfInvocations.java b/src/main/java/net/babamod/mineclass/utils/NumberOfInvocations.java index 9510de9..0842233 100644 --- a/src/main/java/net/babamod/mineclass/utils/NumberOfInvocations.java +++ b/src/main/java/net/babamod/mineclass/utils/NumberOfInvocations.java @@ -44,5 +44,4 @@ public class NumberOfInvocations { } numberOfInvocations.put(playerName, integer - 1); } - }