diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/net/babamod/mineclass/Mineclass.java b/src/main/java/net/babamod/mineclass/Mineclass.java index abdea9e..4e01783 100644 --- a/src/main/java/net/babamod/mineclass/Mineclass.java +++ b/src/main/java/net/babamod/mineclass/Mineclass.java @@ -11,19 +11,21 @@ import java.util.Arrays; public final class Mineclass extends JavaPlugin implements Listener { - @Override - public void onEnable() { - AppliedStatus.getInstance(); - new MineClassListeners(this); - PluginCommand pluginCommand = this.getCommand("class"); - if (pluginCommand != null) { - pluginCommand.setTabCompleter((sender, command, alias, args) -> Arrays.asList("dwarf", "elf", "fire_dwarf", "naga", "clear", "whoami")); - pluginCommand.setExecutor(new CommandClass()); - } + @Override + public void onEnable() { + AppliedStatus.getInstance(); + new MineClassListeners(this); + PluginCommand pluginCommand = this.getCommand("class"); + if (pluginCommand != null) { + pluginCommand.setTabCompleter( + (sender, command, alias, args) -> + Arrays.asList("dwarf", "elf", "fire_dwarf", "naga", "clear", "whoami")); + pluginCommand.setExecutor(new CommandClass()); } + } - @Override - public void onDisable() { - // Plugin shutdown logic - } + @Override + public void onDisable() { + // Plugin shutdown logic + } } diff --git a/src/main/java/net/babamod/mineclass/classes/ClassWrapper.java b/src/main/java/net/babamod/mineclass/classes/ClassWrapper.java index 4bee68c..89d8f26 100644 --- a/src/main/java/net/babamod/mineclass/classes/ClassWrapper.java +++ b/src/main/java/net/babamod/mineclass/classes/ClassWrapper.java @@ -2,63 +2,133 @@ package net.babamod.mineclass.classes; import net.babamod.mineclass.utils.AppliedStatus; import org.bukkit.Material; +import org.bukkit.entity.Item; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; +import java.util.Arrays; +import java.util.Objects; +import java.util.stream.Collectors; + public class ClassWrapper { - public static void reapplyRightClassEffects(Player player, boolean sendReminder) { - if (AppliedStatus.getInstance().isDwarf(player.getName()) || DwarfClass.is(player)) { - AppliedStatus.getInstance().setDwarf(player.getName(), true); - DwarfClass.reapplyEffects(player); - if (sendReminder) { - player.sendMessage("Reminder : You are a dwarf."); - } - } - if (AppliedStatus.getInstance().isElf(player.getName()) || ElfClass.is(player)) { - AppliedStatus.getInstance().setElf(player.getName(), true); - ElfClass.reapplyEffects(player); - if (sendReminder) { - player.sendMessage("Reminder : You are an elf."); - } - } - if (AppliedStatus.getInstance().isFireDwarf(player.getName()) || FireDwarfClass.is(player)) { - AppliedStatus.getInstance().setFireDwarf(player.getName(), true); - FireDwarfClass.reapplyEffects(player); - if (sendReminder) { - player.sendMessage("Reminder : You are a fire dwarf."); - } - } - if (AppliedStatus.getInstance().isNaga(player.getName()) || NagaClass.is(player)) { - AppliedStatus.getInstance().setNaga(player.getName(), true); - NagaClass.reapplyEffects(player); - if (sendReminder) { - player.sendMessage("Reminder : You are a naga."); - } - } + public static void reapplyRightClassEffects(Player player, boolean sendReminder) { + if (AppliedStatus.getInstance().isDwarf(player.getName()) || DwarfClass.is(player)) { + AppliedStatus.getInstance().setDwarf(player.getName(), true); + DwarfClass.reapplyEffects(player); + if (sendReminder) { + player.sendMessage("Reminder : You are a dwarf."); + } } + if (AppliedStatus.getInstance().isElf(player.getName()) || ElfClass.is(player)) { + AppliedStatus.getInstance().setElf(player.getName(), true); + ElfClass.reapplyEffects(player); + if (sendReminder) { + player.sendMessage("Reminder : You are an elf."); + } + } + if (AppliedStatus.getInstance().isFireDwarf(player.getName()) || FireDwarfClass.is(player)) { + AppliedStatus.getInstance().setFireDwarf(player.getName(), true); + FireDwarfClass.reapplyEffects(player); + if (sendReminder) { + player.sendMessage("Reminder : You are a fire dwarf."); + } + } + if (AppliedStatus.getInstance().isNaga(player.getName()) || NagaClass.is(player)) { + AppliedStatus.getInstance().setNaga(player.getName(), true); + NagaClass.reapplyEffects(player); + if (sendReminder) { + player.sendMessage("Reminder : You are a naga."); + } + } + } - public static void clearAllClassEffects(Player player) { - for (PotionEffect activePotionEffect : player.getActivePotionEffects()) { - if (activePotionEffect.getDuration() > 32766) { - player.removePotionEffect(activePotionEffect.getType()); - } - } + public static void clearAllClassEffects(Player player) { + for (PotionEffect activePotionEffect : player.getActivePotionEffects()) { + if (activePotionEffect.getDuration() > 32766) { + player.removePotionEffect(activePotionEffect.getType()); + } } + } - public static boolean isItemForbidden(Player player, Material type) { - if (AppliedStatus.getInstance().isDwarf(player.getName())) { - return DwarfClass.isItemForbidden(type); - } - if (AppliedStatus.getInstance().isElf(player.getName())) { - return ElfClass.isItemForbidden(type); - } - if (AppliedStatus.getInstance().isFireDwarf(player.getName())) { - return FireDwarfClass.isItemForbidden(type); - } - if (AppliedStatus.getInstance().isNaga(player.getName())) { - return NagaClass.isItemForbidden(type); - } - return false; + public static boolean isItemForbidden(Player player, Material type) { + if (AppliedStatus.getInstance().isDwarf(player.getName())) { + return DwarfClass.isItemForbidden(type); } + if (AppliedStatus.getInstance().isElf(player.getName())) { + return ElfClass.isItemForbidden(type); + } + if (AppliedStatus.getInstance().isFireDwarf(player.getName())) { + return FireDwarfClass.isItemForbidden(type); + } + if (AppliedStatus.getInstance().isNaga(player.getName())) { + return NagaClass.isItemForbidden(type); + } + return false; + } + + public static boolean isItemEnchantable(Player player, Material type) { + if (AppliedStatus.getInstance().isDwarf(player.getName())) { + return DwarfClass.isItemEnchantable(type); + } + if (AppliedStatus.getInstance().isElf(player.getName())) { + return ElfClass.isItemEnchantable(type); + } + if (AppliedStatus.getInstance().isFireDwarf(player.getName())) { + return FireDwarfClass.isItemEnchantable(type); + } + if (AppliedStatus.getInstance().isNaga(player.getName())) { + return NagaClass.isItemEnchantable(type); + } + return false; + } + + public static void enchantItem(Player player, Item item) { + if (AppliedStatus.getInstance().isDwarf(player.getName())) { + DwarfClass.enchantItem(item.getItemStack()); + } + if (AppliedStatus.getInstance().isElf(player.getName())) { + ElfClass.enchantItem(item.getItemStack()); + } + if (AppliedStatus.getInstance().isFireDwarf(player.getName())) { + FireDwarfClass.enchantItem(item.getItemStack()); + } + if (AppliedStatus.getInstance().isNaga(player.getName())) { + NagaClass.enchantItem(item.getItemStack()); + } + } + + public static void givePlayerClassItem(Player player) { + if (AppliedStatus.getInstance().isDwarf(player.getName())) { + DwarfClass.giveClassItem(player); + } + if (AppliedStatus.getInstance().isElf(player.getName())) { + ElfClass.giveClassItem(player); + } + if (AppliedStatus.getInstance().isFireDwarf(player.getName())) { + FireDwarfClass.giveClassItem(player); + } + if (AppliedStatus.getInstance().isNaga(player.getName())) { + NagaClass.giveClassItem(player); + } + } + + public static boolean isSoulBound(ItemStack itemStack) { + if (itemStack.getItemMeta() != null && itemStack.getItemMeta().getLore() != null) { + return itemStack.getItemMeta().getLore().contains("Soulbound"); + } + return false; + } + + public static void removePlayerClassItem(Player player) { + for (ItemStack content : + Arrays.stream(player.getInventory().getContents()) + .filter(Objects::nonNull) + .collect(Collectors.toList())) { + if (isSoulBound(content)) { + player.getInventory().remove(content); + } + } + } } diff --git a/src/main/java/net/babamod/mineclass/classes/DwarfClass.java b/src/main/java/net/babamod/mineclass/classes/DwarfClass.java index e483869..0e2b4d0 100644 --- a/src/main/java/net/babamod/mineclass/classes/DwarfClass.java +++ b/src/main/java/net/babamod/mineclass/classes/DwarfClass.java @@ -4,6 +4,8 @@ import net.babamod.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -13,66 +15,120 @@ import java.util.stream.Stream; public class DwarfClass { - private static final Set forbiddenItems = new HashSet() {{ - add(Material.DIAMOND_AXE); - add(Material.GOLDEN_AXE); - add(Material.IRON_AXE); - add(Material.NETHERITE_AXE); - add(Material.DIAMOND_HOE); - add(Material.GOLDEN_HOE); - add(Material.IRON_HOE); - add(Material.NETHERITE_HOE); - add(Material.BOW); - add(Material.TRIDENT); - }}; + private static final Set forbiddenItems = + new HashSet() { + { + add(Material.DIAMOND_AXE); + add(Material.GOLDEN_AXE); + add(Material.IRON_AXE); + add(Material.NETHERITE_AXE); + add(Material.DIAMOND_HOE); + add(Material.GOLDEN_HOE); + add(Material.IRON_HOE); + add(Material.NETHERITE_HOE); + add(Material.BOW); + add(Material.TRIDENT); + } + }; - private static final Map potionEffects = Stream.of(new Object[][]{ - {PotionEffectType.HEALTH_BOOST, 2}, - {PotionEffectType.DAMAGE_RESISTANCE, 1}, - {PotionEffectType.HERO_OF_THE_VILLAGE, 1}, - {PotionEffectType.FAST_DIGGING, 1}, - {PotionEffectType.NIGHT_VISION, 1}, - }).collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); + private static final Map potionEffects = + Stream.of( + new Object[][] { + {PotionEffectType.HEALTH_BOOST, 2}, + {PotionEffectType.DAMAGE_RESISTANCE, 1}, + {PotionEffectType.HERO_OF_THE_VILLAGE, 1}, + {PotionEffectType.FAST_DIGGING, 1}, + {PotionEffectType.NIGHT_VISION, 1}, + }) + .collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); - private static final Map>> classEnchantments = Stream.of( - new AbstractMap.SimpleEntry<>(Material.NETHERITE_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2) - )), - new AbstractMap.SimpleEntry<>(Material.DIAMOND_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2) - )), - new AbstractMap.SimpleEntry<>(Material.IRON_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2) - )), - new AbstractMap.SimpleEntry<>(Material.GOLDEN_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2) - )), - new AbstractMap.SimpleEntry<>(Material.STONE_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2) - )), - new AbstractMap.SimpleEntry<>(Material.WOODEN_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2) - )) - ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + private static final Map>> classEnchantments = + Stream.of( + new AbstractMap.SimpleEntry<>( + Material.NETHERITE_PICKAXE, + Arrays.asList( + new Pair<>(Enchantment.DIG_SPEED, 8), + new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new AbstractMap.SimpleEntry<>( + Material.DIAMOND_PICKAXE, + Arrays.asList( + new Pair<>(Enchantment.DIG_SPEED, 8), + new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new AbstractMap.SimpleEntry<>( + Material.IRON_PICKAXE, + Arrays.asList( + new Pair<>(Enchantment.DIG_SPEED, 8), + new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new AbstractMap.SimpleEntry<>( + Material.GOLDEN_PICKAXE, + Arrays.asList( + new Pair<>(Enchantment.DIG_SPEED, 8), + new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new AbstractMap.SimpleEntry<>( + Material.STONE_PICKAXE, + Arrays.asList( + new Pair<>(Enchantment.DIG_SPEED, 8), + new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new AbstractMap.SimpleEntry<>( + Material.WOODEN_PICKAXE, + Arrays.asList( + new Pair<>(Enchantment.DIG_SPEED, 8), + new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2)))) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - public static boolean is(Player player) { - return player.getActivePotionEffects().stream().map(PotionEffect::getType).collect(Collectors.toList()).containsAll(potionEffects.keySet()); - } + public static boolean is(Player player) { + return player.getActivePotionEffects().stream() + .map(PotionEffect::getType) + .collect(Collectors.toList()) + .containsAll(potionEffects.keySet()); + } - public static void reapplyEffects(Player player) { - potionEffects.forEach((key, value) -> { + public static void reapplyEffects(Player player) { + potionEffects.forEach( + (key, value) -> { + if (player.hasPotionEffect(key)) { player.removePotionEffect(key); - player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); + } + player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); }); - } + } - public static boolean isItemForbidden(Material type) { - return forbiddenItems.contains(type); + public static boolean isItemForbidden(Material type) { + return forbiddenItems.contains(type); + } + + public static boolean isItemEnchantable(Material type) { + return classEnchantments.containsKey(type); + } + + public static void enchantItem(ItemStack itemStack) { + if (itemStack.getItemMeta() != null) { + ItemMeta itemMeta = itemStack.getItemMeta(); + itemMeta.setUnbreakable(true); + itemMeta.setLore(Collections.singletonList("Soulbound")); + itemStack.setItemMeta(itemMeta); } + classEnchantments + .getOrDefault(itemStack.getType(), new ArrayList<>()) + .forEach( + enchantmentIntegerPair -> + itemStack.addUnsafeEnchantment( + enchantmentIntegerPair.getFirst(), enchantmentIntegerPair.getSecond())); + } + + public static void giveClassItem(Player player) { + List itemStackList = + Arrays.stream(player.getInventory().getContents()) + .filter(Objects::nonNull) + .map(ClassWrapper::isSoulBound) + .collect(Collectors.toList()); + if (itemStackList.contains(true)) { + return; + } + for (Material material : classEnchantments.keySet()) { + ItemStack itemStack = new ItemStack(material); + enchantItem(itemStack); + player.getInventory().addItem(itemStack); + } + } } diff --git a/src/main/java/net/babamod/mineclass/classes/ElfClass.java b/src/main/java/net/babamod/mineclass/classes/ElfClass.java index 4bdd251..b6acd36 100644 --- a/src/main/java/net/babamod/mineclass/classes/ElfClass.java +++ b/src/main/java/net/babamod/mineclass/classes/ElfClass.java @@ -3,7 +3,10 @@ package net.babamod.mineclass.classes; import net.babamod.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Item; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -13,49 +16,108 @@ import java.util.stream.Stream; public class ElfClass { - private static final Set forbiddenItems = new HashSet() {{ - add(Material.DIAMOND_SWORD); - add(Material.GOLDEN_SWORD); - add(Material.IRON_SWORD); - add(Material.NETHERITE_SWORD); - add(Material.DIAMOND_PICKAXE); - add(Material.GOLDEN_PICKAXE); - add(Material.IRON_PICKAXE); - add(Material.NETHERITE_PICKAXE); - add(Material.DIAMOND_SHOVEL); - add(Material.GOLDEN_SHOVEL); - add(Material.IRON_SHOVEL); - add(Material.NETHERITE_SHOVEL); - add(Material.CROSSBOW); - add(Material.TRIDENT); - }}; + private static final Set forbiddenItems = + new HashSet() { + { + add(Material.DIAMOND_SWORD); + add(Material.GOLDEN_SWORD); + add(Material.IRON_SWORD); + add(Material.NETHERITE_SWORD); + add(Material.DIAMOND_PICKAXE); + add(Material.GOLDEN_PICKAXE); + add(Material.IRON_PICKAXE); + add(Material.NETHERITE_PICKAXE); + add(Material.DIAMOND_SHOVEL); + add(Material.GOLDEN_SHOVEL); + add(Material.IRON_SHOVEL); + add(Material.NETHERITE_SHOVEL); + add(Material.CROSSBOW); + add(Material.TRIDENT); + } + }; - private static final Map potionEffects = Stream.of(new Object[][]{ - {PotionEffectType.SPEED, 2}, - {PotionEffectType.JUMP, 3}, - {PotionEffectType.LUCK, 1}, - {PotionEffectType.NIGHT_VISION, 1}, - }).collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); + private static final Map potionEffects = + Stream.of( + new Object[][] { + {PotionEffectType.SPEED, 2}, + {PotionEffectType.JUMP, 3}, + {PotionEffectType.LUCK, 1}, + {PotionEffectType.NIGHT_VISION, 1}, + }) + .collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); - private static final Map>> classEnchantments = Stream.of( - new AbstractMap.SimpleEntry<>(Material.BOW, Arrays.asList( - new Pair<>(Enchantment.ARROW_INFINITE, 1), - new Pair<>(Enchantment.ARROW_DAMAGE, 8) - )) - ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + private static final Map>> classEnchantments = + Stream.of( + new AbstractMap.SimpleEntry<>( + Material.BOW, + Arrays.asList( + new Pair<>(Enchantment.ARROW_INFINITE, 1), + new Pair<>(Enchantment.ARROW_DAMAGE, 8)))) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - public static boolean is(Player player) { - return player.getActivePotionEffects().stream().map(PotionEffect::getType).collect(Collectors.toList()).containsAll(potionEffects.keySet()); - } + public static boolean is(Player player) { + return player.getActivePotionEffects().stream() + .map(PotionEffect::getType) + .collect(Collectors.toList()) + .containsAll(potionEffects.keySet()); + } - public static void reapplyEffects(Player player) { - potionEffects.forEach((key, value) -> { + public static void reapplyEffects(Player player) { + potionEffects.forEach( + (key, value) -> { + if (player.hasPotionEffect(key)) { player.removePotionEffect(key); - player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); + } + player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); }); - } + } - public static boolean isItemForbidden(Material type) { - return forbiddenItems.contains(type); + public static boolean isItemForbidden(Material type) { + return forbiddenItems.contains(type); + } + + public static boolean isItemEnchantable(Material type) { + return classEnchantments.containsKey(type); + } + + public static void makeSoulbound(ItemStack itemStack) { + if (itemStack.getItemMeta() != null) { + ItemMeta itemMeta = itemStack.getItemMeta(); + itemMeta.setUnbreakable(true); + itemMeta.setLore(Collections.singletonList("Soulbound")); + itemStack.setItemMeta(itemMeta); } + } + + public static void enchantItem(ItemStack itemStack) { + makeSoulbound(itemStack); + classEnchantments + .getOrDefault(itemStack.getType(), new ArrayList<>()) + .forEach( + enchantmentIntegerPair -> + itemStack + .addUnsafeEnchantment( + enchantmentIntegerPair.getFirst(), enchantmentIntegerPair.getSecond())); + } + + public static void giveClassItem(Player player) { + List itemStackList = + Arrays.stream(player.getInventory().getContents()) + .filter(Objects::nonNull) + .map(ClassWrapper::isSoulBound) + .collect(Collectors.toList()); + if (itemStackList.contains(true)) { + return; + } + for (Material material : classEnchantments.keySet()) { + if (material.equals(Material.BOW)) { + ItemStack itemStack = new ItemStack(Material.ARROW); + makeSoulbound(itemStack); + player.getInventory().addItem(itemStack); + } + ItemStack itemStack = new ItemStack(material); + enchantItem(itemStack); + player.getInventory().addItem(itemStack); + } + } } diff --git a/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java b/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java index 5ca74e3..f754c36 100644 --- a/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java +++ b/src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java @@ -3,7 +3,10 @@ package net.babamod.mineclass.classes; import net.babamod.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Item; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -13,86 +16,137 @@ import java.util.stream.Stream; public class FireDwarfClass { - private static final Set forbiddenItems = new HashSet() {{ - add(Material.DIAMOND_SWORD); - add(Material.GOLDEN_SWORD); - add(Material.IRON_SWORD); - add(Material.NETHERITE_SWORD); - add(Material.DIAMOND_HOE); - add(Material.GOLDEN_HOE); - add(Material.IRON_HOE); - add(Material.NETHERITE_HOE); - add(Material.DIAMOND_SHOVEL); - add(Material.GOLDEN_SHOVEL); - add(Material.IRON_SHOVEL); - add(Material.NETHERITE_SHOVEL); - add(Material.BOW); - add(Material.ARROW); - add(Material.TRIDENT); - }}; + private static final Set forbiddenItems = + new HashSet() { + { + add(Material.DIAMOND_SWORD); + add(Material.GOLDEN_SWORD); + add(Material.IRON_SWORD); + add(Material.NETHERITE_SWORD); + add(Material.DIAMOND_HOE); + add(Material.GOLDEN_HOE); + add(Material.IRON_HOE); + add(Material.NETHERITE_HOE); + add(Material.DIAMOND_SHOVEL); + add(Material.GOLDEN_SHOVEL); + add(Material.IRON_SHOVEL); + add(Material.NETHERITE_SHOVEL); + add(Material.BOW); + add(Material.ARROW); + add(Material.TRIDENT); + } + }; - private static final Map potionEffects = Stream.of(new Object[][]{ - {PotionEffectType.FIRE_RESISTANCE, 1}, - {PotionEffectType.FAST_DIGGING, 1}, - {PotionEffectType.JUMP, 2}, - {PotionEffectType.NIGHT_VISION, 1}, - {PotionEffectType.HEALTH_BOOST, 2}, - }).collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); + private static final Map potionEffects = + Stream.of( + new Object[][] { + {PotionEffectType.FIRE_RESISTANCE, 1}, + {PotionEffectType.FAST_DIGGING, 1}, + {PotionEffectType.JUMP, 2}, + {PotionEffectType.NIGHT_VISION, 1}, + {PotionEffectType.HEALTH_BOOST, 2}, + }) + .collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); - private static final Map>> classEnchantment = Stream.of( - new AbstractMap.SimpleEntry<>(Material.NETHERITE_AXE, Collections.singletonList( - new Pair<>(Enchantment.FIRE_ASPECT, 2) - )), - new AbstractMap.SimpleEntry<>(Material.DIAMOND_AXE, Collections.singletonList( - new Pair<>(Enchantment.FIRE_ASPECT, 2) - )), - new AbstractMap.SimpleEntry<>(Material.IRON_AXE, Collections.singletonList( - new Pair<>(Enchantment.FIRE_ASPECT, 2) - )), - new AbstractMap.SimpleEntry<>(Material.GOLDEN_AXE, Collections.singletonList( - new Pair<>(Enchantment.FIRE_ASPECT, 2) - )), - new AbstractMap.SimpleEntry<>(Material.STONE_AXE, Collections.singletonList( - new Pair<>(Enchantment.FIRE_ASPECT, 2) - )), - new AbstractMap.SimpleEntry<>(Material.WOODEN_AXE, Collections.singletonList( - new Pair<>(Enchantment.FIRE_ASPECT, 2) - )), - new AbstractMap.SimpleEntry<>(Material.NETHERITE_PICKAXE, Collections.singletonList( - new Pair<>(Enchantment.DIG_SPEED, 5) - )), - new AbstractMap.SimpleEntry<>(Material.DIAMOND_PICKAXE, Collections.singletonList( - new Pair<>(Enchantment.DIG_SPEED, 5) - )), - new AbstractMap.SimpleEntry<>(Material.IRON_PICKAXE, Collections.singletonList( - new Pair<>(Enchantment.DIG_SPEED, 5) - )), - new AbstractMap.SimpleEntry<>(Material.GOLDEN_PICKAXE, Collections.singletonList( - new Pair<>(Enchantment.DIG_SPEED, 5) - )), - new AbstractMap.SimpleEntry<>(Material.STONE_PICKAXE, Collections.singletonList( - new Pair<>(Enchantment.DIG_SPEED, 5) - )), - new AbstractMap.SimpleEntry<>(Material.WOODEN_PICKAXE, Collections.singletonList( - new Pair<>(Enchantment.DIG_SPEED, 5) - )), - new AbstractMap.SimpleEntry<>(Material.FLINT_AND_STEEL, new ArrayList>()) - // See to make infinity working on crossbow - // Inventory auto smelt - ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + private static final Map>> classEnchantments = + Stream.of( + new AbstractMap.SimpleEntry<>( + Material.NETHERITE_AXE, + Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))), + new AbstractMap.SimpleEntry<>( + Material.DIAMOND_AXE, + Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))), + new AbstractMap.SimpleEntry<>( + Material.IRON_AXE, + Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))), + new AbstractMap.SimpleEntry<>( + Material.GOLDEN_AXE, + Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))), + new AbstractMap.SimpleEntry<>( + Material.STONE_AXE, + Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))), + new AbstractMap.SimpleEntry<>( + Material.WOODEN_AXE, + Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))), + new AbstractMap.SimpleEntry<>( + Material.NETHERITE_PICKAXE, + Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + new AbstractMap.SimpleEntry<>( + Material.DIAMOND_PICKAXE, + Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + new AbstractMap.SimpleEntry<>( + Material.IRON_PICKAXE, + Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + new AbstractMap.SimpleEntry<>( + Material.GOLDEN_PICKAXE, + Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + new AbstractMap.SimpleEntry<>( + Material.STONE_PICKAXE, + Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + new AbstractMap.SimpleEntry<>( + Material.WOODEN_PICKAXE, + Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + new AbstractMap.SimpleEntry<>( + Material.FLINT_AND_STEEL, new ArrayList>()) + // See to make infinity working on crossbow + // Inventory auto smelt + ) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - public static boolean is(Player player) { - return player.getActivePotionEffects().stream().map(PotionEffect::getType).collect(Collectors.toList()).containsAll(potionEffects.keySet()); - } + public static boolean is(Player player) { + return player.getActivePotionEffects().stream() + .map(PotionEffect::getType) + .collect(Collectors.toList()) + .containsAll(potionEffects.keySet()); + } - public static void reapplyEffects(Player player) { - potionEffects.forEach((key, value) -> { + public static void reapplyEffects(Player player) { + potionEffects.forEach( + (key, value) -> { + if (player.hasPotionEffect(key)) { player.removePotionEffect(key); - player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); + } + player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); }); - } + } - public static boolean isItemForbidden(Material type) { - return forbiddenItems.contains(type); + public static boolean isItemForbidden(Material type) { + return forbiddenItems.contains(type); + } + + public static boolean isItemEnchantable(Material type) { + return classEnchantments.containsKey(type); + } + + public static void enchantItem(ItemStack itemStack) { + if (itemStack.getItemMeta() != null) { + ItemMeta itemMeta = itemStack.getItemMeta(); + itemMeta.setUnbreakable(true); + itemMeta.setLore(Collections.singletonList("Soulbound")); + itemStack.setItemMeta(itemMeta); } + classEnchantments + .getOrDefault(itemStack.getType(), new ArrayList<>()) + .forEach( + enchantmentIntegerPair -> + itemStack + .addUnsafeEnchantment( + enchantmentIntegerPair.getFirst(), enchantmentIntegerPair.getSecond())); + } + + public static void giveClassItem(Player player) { + List itemStackList = + Arrays.stream(player.getInventory().getContents()) + .filter(Objects::nonNull) + .map(ClassWrapper::isSoulBound) + .collect(Collectors.toList()); + if (itemStackList.contains(true)) { + return; + } + for (Material material : classEnchantments.keySet()) { + ItemStack itemStack = new ItemStack(material); + enchantItem(itemStack); + player.getInventory().addItem(itemStack); + } + } } diff --git a/src/main/java/net/babamod/mineclass/classes/NagaClass.java b/src/main/java/net/babamod/mineclass/classes/NagaClass.java index ad5e4d5..06f0118 100644 --- a/src/main/java/net/babamod/mineclass/classes/NagaClass.java +++ b/src/main/java/net/babamod/mineclass/classes/NagaClass.java @@ -4,6 +4,8 @@ import net.babamod.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -13,70 +15,119 @@ import java.util.stream.Stream; public class NagaClass { - private static final Set forbiddenItems = new HashSet() {{ - add(Material.DIAMOND_SWORD); - add(Material.GOLDEN_SWORD); - add(Material.IRON_SWORD); - add(Material.NETHERITE_SWORD); - add(Material.DIAMOND_AXE); - add(Material.GOLDEN_AXE); - add(Material.IRON_AXE); - add(Material.NETHERITE_AXE); - add(Material.CROSSBOW); - add(Material.BOW); - add(Material.FLINT_AND_STEEL); - }}; + private static final Set forbiddenItems = + new HashSet() { + { + add(Material.DIAMOND_SWORD); + add(Material.GOLDEN_SWORD); + add(Material.IRON_SWORD); + add(Material.NETHERITE_SWORD); + add(Material.DIAMOND_AXE); + add(Material.GOLDEN_AXE); + add(Material.IRON_AXE); + add(Material.NETHERITE_AXE); + add(Material.CROSSBOW); + add(Material.BOW); + add(Material.FLINT_AND_STEEL); + } + }; - private static final Map potionEffects = Stream.of(new Object[][]{ - {PotionEffectType.DOLPHINS_GRACE, 1}, - {PotionEffectType.CONDUIT_POWER, 1}, - {PotionEffectType.WATER_BREATHING, 1}, - {PotionEffectType.SLOW, 2}, - {PotionEffectType.WEAKNESS, 1}, - }).collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); + private static final Map potionEffects = + Stream.of( + new Object[][] { + {PotionEffectType.DOLPHINS_GRACE, 1}, + {PotionEffectType.CONDUIT_POWER, 1}, + {PotionEffectType.WATER_BREATHING, 1}, + {PotionEffectType.SLOW, 2}, + {PotionEffectType.WEAKNESS, 1}, + }) + .collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); - private static final Map>> classEnchantment = Stream.of( - new AbstractMap.SimpleEntry<>(Material.TRIDENT, Arrays.asList( - new Pair<>(Enchantment.LOYALTY, 3), - new Pair<>(Enchantment.IMPALING, 5), - new Pair<>(Enchantment.CHANNELING, 1) - )), - new AbstractMap.SimpleEntry<>(Material.NETHERITE_HOE, Collections.singletonList( - new Pair<>(Enchantment.DAMAGE_ALL, 5) - )), - new AbstractMap.SimpleEntry<>(Material.DIAMOND_HOE, Collections.singletonList( - new Pair<>(Enchantment.DAMAGE_ALL, 5) - )), - new AbstractMap.SimpleEntry<>(Material.IRON_HOE, Collections.singletonList( - new Pair<>(Enchantment.DAMAGE_ALL, 5) - )), - new AbstractMap.SimpleEntry<>(Material.WOODEN_HOE, Collections.singletonList( - new Pair<>(Enchantment.DAMAGE_ALL, 5) - )), - new AbstractMap.SimpleEntry<>(Material.GOLDEN_HOE, Collections.singletonList( - new Pair<>(Enchantment.DAMAGE_ALL, 5) - )), - new AbstractMap.SimpleEntry<>(Material.STONE_HOE, Collections.singletonList( - new Pair<>(Enchantment.DAMAGE_ALL, 5) - )), - new AbstractMap.SimpleEntry<>(Material.FISHING_ROD, Arrays.asList( - new Pair<>(Enchantment.LUCK, 3), - new Pair<>(Enchantment.LURE, 3) - )) - ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + private static final Map>> classEnchantments = + Stream.of( + new AbstractMap.SimpleEntry<>( + Material.TRIDENT, + Arrays.asList( + new Pair<>(Enchantment.LOYALTY, 3), + new Pair<>(Enchantment.IMPALING, 5), + new Pair<>(Enchantment.CHANNELING, 1))), + new AbstractMap.SimpleEntry<>( + Material.NETHERITE_HOE, + Collections.singletonList(new Pair<>(Enchantment.DAMAGE_ALL, 5))), + new AbstractMap.SimpleEntry<>( + Material.DIAMOND_HOE, + Collections.singletonList(new Pair<>(Enchantment.DAMAGE_ALL, 5))), + new AbstractMap.SimpleEntry<>( + Material.IRON_HOE, + Collections.singletonList(new Pair<>(Enchantment.DAMAGE_ALL, 5))), + new AbstractMap.SimpleEntry<>( + Material.WOODEN_HOE, + Collections.singletonList(new Pair<>(Enchantment.DAMAGE_ALL, 5))), + new AbstractMap.SimpleEntry<>( + Material.GOLDEN_HOE, + Collections.singletonList(new Pair<>(Enchantment.DAMAGE_ALL, 5))), + new AbstractMap.SimpleEntry<>( + Material.STONE_HOE, + Collections.singletonList(new Pair<>(Enchantment.DAMAGE_ALL, 5))), + new AbstractMap.SimpleEntry<>( + Material.FISHING_ROD, + Arrays.asList(new Pair<>(Enchantment.LUCK, 3), new Pair<>(Enchantment.LURE, 3)))) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - public static boolean is(Player player) { - return player.getActivePotionEffects().stream().map(PotionEffect::getType).collect(Collectors.toList()).containsAll(potionEffects.keySet()); - } + public static boolean is(Player player) { + return player.getActivePotionEffects().stream() + .map(PotionEffect::getType) + .collect(Collectors.toList()) + .containsAll(potionEffects.keySet()); + } - public static void reapplyEffects(Player player) { - potionEffects.forEach((key, value) -> { + public static void reapplyEffects(Player player) { + potionEffects.forEach( + (key, value) -> { + if (player.hasPotionEffect(key)) { player.removePotionEffect(key); - player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); + } + player.addPotionEffect(new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); }); - } + } - public static boolean isItemForbidden(Material type) { - return forbiddenItems.contains(type); + public static boolean isItemForbidden(Material type) { + return forbiddenItems.contains(type); + } + + public static boolean isItemEnchantable(Material type) { + return classEnchantments.containsKey(type); + } + + public static void enchantItem(ItemStack itemStack) { + if (itemStack.getItemMeta() != null) { + ItemMeta itemMeta = itemStack.getItemMeta(); + itemMeta.setUnbreakable(true); + itemMeta.setLore(Collections.singletonList("Soulbound")); + itemStack.setItemMeta(itemMeta); } + classEnchantments + .getOrDefault(itemStack.getType(), new ArrayList<>()) + .forEach( + enchantmentIntegerPair -> + itemStack + .addUnsafeEnchantment( + enchantmentIntegerPair.getFirst(), enchantmentIntegerPair.getSecond())); + } + + public static void giveClassItem(Player player) { + List itemStackList = + Arrays.stream(player.getInventory().getContents()) + .filter(Objects::nonNull) + .map(ClassWrapper::isSoulBound) + .collect(Collectors.toList()); + if (itemStackList.contains(true)) { + return; + } + for (Material material : classEnchantments.keySet()) { + ItemStack itemStack = new ItemStack(material); + enchantItem(itemStack); + player.getInventory().addItem(itemStack); + } + } } diff --git a/src/main/java/net/babamod/mineclass/commands/CommandClass.java b/src/main/java/net/babamod/mineclass/commands/CommandClass.java index 3b52566..890ebce 100644 --- a/src/main/java/net/babamod/mineclass/commands/CommandClass.java +++ b/src/main/java/net/babamod/mineclass/commands/CommandClass.java @@ -8,74 +8,79 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; public class CommandClass implements CommandExecutor { - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (args.length == 0) { - sender.sendMessage("You need to use this command with one of the suggested arguments."); - return false; - } - if (sender instanceof Player) { - Player player = (Player) sender; - if (args[0].equals("dwarf")) { - AppliedStatus.getInstance().setElf(player.getName(), false); - AppliedStatus.getInstance().setFireDwarf(player.getName(), false); - AppliedStatus.getInstance().setNaga(player.getName(), false); - AppliedStatus.getInstance().setDwarf(player.getName(), true); - ClassWrapper.clearAllClassEffects(player); - DwarfClass.reapplyEffects(player); - return true; - } - if (args[0].equals("elf")) { - AppliedStatus.getInstance().setDwarf(player.getName(), false); - AppliedStatus.getInstance().setFireDwarf(player.getName(), false); - AppliedStatus.getInstance().setNaga(player.getName(), false); - AppliedStatus.getInstance().setElf(player.getName(), true); - ClassWrapper.clearAllClassEffects(player); - ElfClass.reapplyEffects(player); - return true; - } - if (args[0].equals("fire_dwarf")) { - AppliedStatus.getInstance().setDwarf(player.getName(), false); - AppliedStatus.getInstance().setElf(player.getName(), false); - AppliedStatus.getInstance().setNaga(player.getName(), false); - AppliedStatus.getInstance().setFireDwarf(player.getName(), true); - ClassWrapper.clearAllClassEffects(player); - FireDwarfClass.reapplyEffects(player); - return true; - } - if (args[0].equals("naga")) { - AppliedStatus.getInstance().setDwarf(player.getName(), false); - AppliedStatus.getInstance().setElf(player.getName(), false); - AppliedStatus.getInstance().setFireDwarf(player.getName(), false); - AppliedStatus.getInstance().setNaga(player.getName(), true); - ClassWrapper.clearAllClassEffects(player); - NagaClass.reapplyEffects(player); - return true; - } - if (args[0].equals("clear")) { - AppliedStatus.getInstance().setDwarf(player.getName(), false); - AppliedStatus.getInstance().setElf(player.getName(), false); - AppliedStatus.getInstance().setFireDwarf(player.getName(), false); - AppliedStatus.getInstance().setNaga(player.getName(), false); - ClassWrapper.clearAllClassEffects(player); - return true; - } - if (args[0].equals("whoami")) { - if (AppliedStatus.getInstance().isDwarf(player.getName())) { - player.sendMessage("You are a dwarf."); - } - if (AppliedStatus.getInstance().isElf(player.getName())) { - player.sendMessage("You are an elf."); - } - if (AppliedStatus.getInstance().isFireDwarf(player.getName())) { - player.sendMessage("You are a fire dwarf."); - } - if (AppliedStatus.getInstance().isNaga(player.getName())) { - player.sendMessage("You are a naga."); - } - return true; - } - } - return false; + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (args.length == 0) { + sender.sendMessage("You need to use this command with one of the suggested arguments."); + return false; } + if (sender instanceof Player) { + Player player = (Player) sender; + if (args[0].equals("dwarf")) { + AppliedStatus.getInstance().setElf(player.getName(), false); + AppliedStatus.getInstance().setFireDwarf(player.getName(), false); + AppliedStatus.getInstance().setNaga(player.getName(), false); + AppliedStatus.getInstance().setDwarf(player.getName(), true); + ClassWrapper.clearAllClassEffects(player); + DwarfClass.reapplyEffects(player); + DwarfClass.giveClassItem(player); + return true; + } + if (args[0].equals("elf")) { + AppliedStatus.getInstance().setDwarf(player.getName(), false); + AppliedStatus.getInstance().setFireDwarf(player.getName(), false); + AppliedStatus.getInstance().setNaga(player.getName(), false); + AppliedStatus.getInstance().setElf(player.getName(), true); + ClassWrapper.clearAllClassEffects(player); + ElfClass.reapplyEffects(player); + ElfClass.giveClassItem(player); + return true; + } + if (args[0].equals("fire_dwarf")) { + AppliedStatus.getInstance().setDwarf(player.getName(), false); + AppliedStatus.getInstance().setElf(player.getName(), false); + AppliedStatus.getInstance().setNaga(player.getName(), false); + AppliedStatus.getInstance().setFireDwarf(player.getName(), true); + ClassWrapper.clearAllClassEffects(player); + FireDwarfClass.reapplyEffects(player); + FireDwarfClass.giveClassItem(player); + return true; + } + if (args[0].equals("naga")) { + AppliedStatus.getInstance().setDwarf(player.getName(), false); + AppliedStatus.getInstance().setElf(player.getName(), false); + AppliedStatus.getInstance().setFireDwarf(player.getName(), false); + AppliedStatus.getInstance().setNaga(player.getName(), true); + ClassWrapper.clearAllClassEffects(player); + NagaClass.reapplyEffects(player); + NagaClass.giveClassItem(player); + return true; + } + if (args[0].equals("clear")) { + AppliedStatus.getInstance().setDwarf(player.getName(), false); + AppliedStatus.getInstance().setElf(player.getName(), false); + AppliedStatus.getInstance().setFireDwarf(player.getName(), false); + AppliedStatus.getInstance().setNaga(player.getName(), false); + ClassWrapper.clearAllClassEffects(player); + ClassWrapper.removePlayerClassItem(player); + return true; + } + if (args[0].equals("whoami")) { + if (AppliedStatus.getInstance().isDwarf(player.getName())) { + player.sendMessage("You are a dwarf."); + } + if (AppliedStatus.getInstance().isElf(player.getName())) { + player.sendMessage("You are an elf."); + } + if (AppliedStatus.getInstance().isFireDwarf(player.getName())) { + player.sendMessage("You are a fire dwarf."); + } + if (AppliedStatus.getInstance().isNaga(player.getName())) { + player.sendMessage("You are a naga."); + } + return true; + } + } + return false; + } } diff --git a/src/main/java/net/babamod/mineclass/utils/AppliedStatus.java b/src/main/java/net/babamod/mineclass/utils/AppliedStatus.java index 07f716d..1302e5b 100644 --- a/src/main/java/net/babamod/mineclass/utils/AppliedStatus.java +++ b/src/main/java/net/babamod/mineclass/utils/AppliedStatus.java @@ -5,98 +5,97 @@ import java.util.HashMap; import java.util.Objects; public class AppliedStatus implements Serializable { - /** - * Instance unique pré-initialisée - */ - private static AppliedStatus INSTANCE; - private final HashMap dwarf; - private final HashMap elf; - private final HashMap fireDwarf; - private final HashMap naga; + /** Instance unique pré-initialisée */ + private static AppliedStatus INSTANCE; - /** - * Constructeur privé - */ - private AppliedStatus() { - dwarf = new HashMap<>(); - elf = new HashMap<>(); - fireDwarf = new HashMap<>(); - naga = new HashMap<>(); + private final HashMap dwarf; + private final HashMap elf; + private final HashMap fireDwarf; + private final HashMap naga; + + /** Constructeur privé */ + private AppliedStatus() { + dwarf = new HashMap<>(); + elf = new HashMap<>(); + fireDwarf = new HashMap<>(); + naga = new HashMap<>(); + } + + /** Point d'accès pour l'instance unique du singleton */ + public static synchronized AppliedStatus getInstance() { + if (INSTANCE == null) { + INSTANCE = new AppliedStatus(); } - /** - * Point d'accès pour l'instance unique du singleton - */ - public static synchronized AppliedStatus getInstance() { - if (INSTANCE == null) { - INSTANCE = new AppliedStatus(); - } + return INSTANCE; + } - return INSTANCE; - } + public void setDwarf(String playerName, boolean dwarf) { + this.dwarf.put(playerName, dwarf); + } - public void setDwarf(String playerName, boolean dwarf) { - this.dwarf.put(playerName, dwarf); - } + public void setElf(String playerName, boolean elf) { + this.elf.put(playerName, elf); + } - public void setElf(String playerName, boolean elf) { - this.elf.put(playerName, elf); - } + public void setFireDwarf(String playerName, boolean fireDwarf) { + this.fireDwarf.put(playerName, fireDwarf); + } - public void setFireDwarf(String playerName, boolean fireDwarf) { - this.fireDwarf.put(playerName, fireDwarf); - } + public void setNaga(String playerName, boolean naga) { + this.naga.put(playerName, naga); + } - public void setNaga(String playerName, boolean naga) { - this.naga.put(playerName, naga); - } + public boolean isDwarf(String playerName) { + return dwarf.getOrDefault(playerName, false); + } - public boolean isDwarf(String playerName) { - return dwarf.getOrDefault(playerName, false); - } + public boolean isElf(String playerName) { + return elf.getOrDefault(playerName, false); + } - public boolean isElf(String playerName) { - return elf.getOrDefault(playerName, false); - } + public boolean isFireDwarf(String playerName) { + return fireDwarf.getOrDefault(playerName, false); + } - public boolean isFireDwarf(String playerName) { - return fireDwarf.getOrDefault(playerName, false); - } + public boolean isNaga(String playerName) { + return naga.getOrDefault(playerName, false); + } - public boolean isNaga(String playerName) { - return naga.getOrDefault(playerName, false); - } + public boolean hasAClass(String playerName) { + return dwarf.getOrDefault(playerName, false) + || elf.getOrDefault(playerName, false) + || fireDwarf.getOrDefault(playerName, false) + || naga.getOrDefault(playerName, false); + } - public boolean hasAClass(String playerName) { - return dwarf.getOrDefault(playerName, false) || - elf.getOrDefault(playerName, false) || - fireDwarf.getOrDefault(playerName, false) || - naga.getOrDefault(playerName, false); - } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + AppliedStatus that = (AppliedStatus) o; + return Objects.equals(dwarf, that.dwarf) + && Objects.equals(elf, that.elf) + && Objects.equals(fireDwarf, that.fireDwarf) + && Objects.equals(naga, that.naga); + } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - AppliedStatus that = (AppliedStatus) o; - return Objects.equals(dwarf, that.dwarf) && - Objects.equals(elf, that.elf) && - Objects.equals(fireDwarf, that.fireDwarf) && - Objects.equals(naga, that.naga); - } + @Override + public int hashCode() { + return Objects.hash(dwarf, elf, fireDwarf, naga); + } - @Override - public int hashCode() { - return Objects.hash(dwarf, elf, fireDwarf, naga); - } - - @Override - public String toString() { - return "AppliedStatus{" + - "dwarf=" + dwarf + - ", elf=" + elf + - ", fireDwarf=" + fireDwarf + - ", naga=" + naga + - '}'; - } + @Override + public String toString() { + return "AppliedStatus{" + + "dwarf=" + + dwarf + + ", elf=" + + elf + + ", fireDwarf=" + + fireDwarf + + ", naga=" + + naga + + '}'; + } } diff --git a/src/main/java/net/babamod/mineclass/utils/ApplyClassStatusTask.java b/src/main/java/net/babamod/mineclass/utils/ApplyClassStatusTask.java index e84d896..b76f0dc 100644 --- a/src/main/java/net/babamod/mineclass/utils/ApplyClassStatusTask.java +++ b/src/main/java/net/babamod/mineclass/utils/ApplyClassStatusTask.java @@ -7,17 +7,16 @@ import org.bukkit.scheduler.BukkitRunnable; public class ApplyClassStatusTask extends BukkitRunnable { - private final JavaPlugin plugin; - private final Player player; + private final JavaPlugin plugin; + private final Player player; - public ApplyClassStatusTask(JavaPlugin plugin, Player player) { - this.plugin = plugin; - this.player = player; - } + public ApplyClassStatusTask(JavaPlugin plugin, Player player) { + this.plugin = plugin; + this.player = player; + } - @Override - public void run() { - ClassWrapper.reapplyRightClassEffects(player, false); - } - -} \ No newline at end of file + @Override + public void run() { + ClassWrapper.reapplyRightClassEffects(player, false); + } +} diff --git a/src/main/java/net/babamod/mineclass/utils/MineClassListeners.java b/src/main/java/net/babamod/mineclass/utils/MineClassListeners.java index 59d585f..5b933a6 100644 --- a/src/main/java/net/babamod/mineclass/utils/MineClassListeners.java +++ b/src/main/java/net/babamod/mineclass/utils/MineClassListeners.java @@ -3,44 +3,117 @@ package net.babamod.mineclass.utils; import net.babamod.mineclass.Mineclass; import net.babamod.mineclass.classes.ClassWrapper; import org.bukkit.Material; +import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityPickupItemEvent; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.inventory.*; +import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerRespawnEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; + +import javax.swing.*; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; public class MineClassListeners implements Listener { - private final Mineclass plugin; + private final Mineclass plugin; - public MineClassListeners(Mineclass plugin) { - this.plugin = plugin; - this.plugin.getServer().getPluginManager().registerEvents(this, plugin); - } + public MineClassListeners(Mineclass plugin) { + this.plugin = plugin; + this.plugin.getServer().getPluginManager().registerEvents(this, plugin); + } - @EventHandler - public void on(PlayerJoinEvent event) { - Player player = event.getPlayer(); - ClassWrapper.reapplyRightClassEffects(player, true); - } + @EventHandler + public void on(PlayerJoinEvent event) { + Player player = event.getPlayer(); + ClassWrapper.reapplyRightClassEffects(player, true); + } - @EventHandler - public void on(PlayerItemConsumeEvent event) { - if (event.getItem().getType().equals(Material.MILK_BUCKET)) { - if (AppliedStatus.getInstance().hasAClass(event.getPlayer().getName())) { - new ApplyClassStatusTask(this.plugin, event.getPlayer()).runTaskLater(this.plugin, 10); - } - } + @EventHandler + public void on(PlayerItemConsumeEvent event) { + if (event.getItem().getType().equals(Material.MILK_BUCKET)) { + if (AppliedStatus.getInstance().hasAClass(event.getPlayer().getName())) { + new ApplyClassStatusTask(this.plugin, event.getPlayer()).runTaskLater(this.plugin, 10); + } } + } - @EventHandler - public void on(EntityPickupItemEvent event) { - if (event.getEntity() instanceof Player) { - Player player = (Player) event.getEntity(); - if (ClassWrapper.isItemForbidden(player, event.getItem().getItemStack().getType())) { - event.setCancelled(true); - } - } + @EventHandler + public void on(EntityPickupItemEvent event) { + if (event.getEntity() instanceof Player) { + Player player = (Player) event.getEntity(); + player.sendMessage("You picked up " + event.getItem().getItemStack().getType()); + if (ClassWrapper.isItemForbidden(player, event.getItem().getItemStack().getType())) { + event.setCancelled(true); + } + player.sendMessage( + String.valueOf( + ClassWrapper.isItemEnchantable(player, event.getItem().getItemStack().getType()))); + if (ClassWrapper.isItemEnchantable(player, event.getItem().getItemStack().getType())) { + player.sendMessage("Enchantable item !"); + ClassWrapper.enchantItem(player, event.getItem()); + } } + } + + @EventHandler + public void on(PlayerDeathEvent event) { + List itemStackList = + event.getDrops().stream().filter(ClassWrapper::isSoulBound).collect(Collectors.toList()); + event.getDrops().removeAll(itemStackList); + ClassWrapper.removePlayerClassItem(event.getEntity()); + } + + @EventHandler + public void on(PlayerRespawnEvent event) { + ClassWrapper.givePlayerClassItem(event.getPlayer()); + new ApplyClassStatusTask(this.plugin, event.getPlayer()).runTaskLater(this.plugin, 10); + } + + @EventHandler + public void on(PlayerDropItemEvent event) { + if (ClassWrapper.isSoulBound(event.getItemDrop().getItemStack())) { + event.setCancelled(true); + } + } + + @EventHandler + public void on(InventoryClickEvent event) { + System.out.println("InventoryClickEvent triggered !"); + System.out.println("-----------------------------------"); + System.out.println(event.getAction()); + System.out.println(event.getClick()); + System.out.println(event.getClickedInventory()); + System.out.println(event.getCurrentItem()); + System.out.println(event.getCursor()); + System.out.println(event.getSlotType()); + System.out.println(Arrays.toString(event.getHandlers().getRegisteredListeners())); + System.out.println(event.getHotbarButton()); + System.out.println(event.getRawSlot()); + System.out.println(event.getSlot()); + System.out.println("-----------------------------------"); + + if (event.getAction().equals(InventoryAction.MOVE_TO_OTHER_INVENTORY)) { + if (event.getCurrentItem() != null && ClassWrapper.isSoulBound(event.getCurrentItem())) { + event.setCancelled(true); + return; + } + if (event.getCursor() != null && ClassWrapper.isSoulBound(event.getCursor())) { + event.setCancelled(true); + } + } + } + + /* + IMPOSSIBLE DE GIVER LES ITEMS DE CLASSES. + */ } diff --git a/src/main/java/net/babamod/mineclass/utils/Pair.java b/src/main/java/net/babamod/mineclass/utils/Pair.java index f63f229..dcb7564 100644 --- a/src/main/java/net/babamod/mineclass/utils/Pair.java +++ b/src/main/java/net/babamod/mineclass/utils/Pair.java @@ -1,27 +1,27 @@ package net.babamod.mineclass.utils; public class Pair { - private F first; - private S second; + private F first; + private S second; - public Pair(F first, S second) { - this.first = first; - this.second = second; - } + public Pair(F first, S second) { + this.first = first; + this.second = second; + } - public F getFirst() { - return first; - } + public F getFirst() { + return first; + } - public void setFirst(F first) { - this.first = first; - } + public void setFirst(F first) { + this.first = first; + } - public S getSecond() { - return second; - } + public S getSecond() { + return second; + } - public void setSecond(S second) { - this.second = second; - } -} \ No newline at end of file + public void setSecond(S second) { + this.second = second; + } +}