diff --git a/build.gradle b/build.gradle index ec12f48..7e59f72 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ import org.apache.tools.ant.filters.ReplaceTokens apply plugin: 'java' -group = 'net.rawmod' -version = '0.1.5' +group = 'dev.rawleenc' +version = '0.2.0' repositories { mavenCentral() @@ -18,10 +18,10 @@ repositories { } dependencies { - compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT") + compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT") } -def targetJavaVersion = 17 +def targetJavaVersion = 21 java { def javaVersion = JavaVersion.toVersion(targetJavaVersion) sourceCompatibility = javaVersion @@ -46,4 +46,4 @@ processResources { filesMatching('plugin.yml') { expand props } -} +} \ No newline at end of file diff --git a/src/main/java/net/rawmod/mineclass/Mineclass.java b/src/main/java/dev/rawleenc/mineclass/Mineclass.java similarity index 83% rename from src/main/java/net/rawmod/mineclass/Mineclass.java rename to src/main/java/dev/rawleenc/mineclass/Mineclass.java index a11cb66..32eddfc 100644 --- a/src/main/java/net/rawmod/mineclass/Mineclass.java +++ b/src/main/java/dev/rawleenc/mineclass/Mineclass.java @@ -1,8 +1,8 @@ -package net.rawmod.mineclass; +package dev.rawleenc.mineclass; -import net.rawmod.mineclass.classes.MineClassFactory; -import net.rawmod.mineclass.commands.CommandClass; -import net.rawmod.mineclass.listeners.MineClassListeners; +import dev.rawleenc.mineclass.classes.MineClassFactory; +import dev.rawleenc.mineclass.commands.CommandClass; +import dev.rawleenc.mineclass.listeners.MineClassListeners; import org.bukkit.Bukkit; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/net/rawmod/mineclass/classes/BeastMasterClass.java b/src/main/java/dev/rawleenc/mineclass/classes/BeastMasterClass.java similarity index 95% rename from src/main/java/net/rawmod/mineclass/classes/BeastMasterClass.java rename to src/main/java/dev/rawleenc/mineclass/classes/BeastMasterClass.java index 06f14a9..b7cb3f1 100644 --- a/src/main/java/net/rawmod/mineclass/classes/BeastMasterClass.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/BeastMasterClass.java @@ -1,6 +1,6 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; -import net.rawmod.mineclass.utils.Pair; +import dev.rawleenc.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; @@ -29,7 +29,7 @@ public class BeastMasterClass extends MineClassImpl { Stream.of( new Object[][] { {PotionEffectType.NIGHT_VISION, 1}, - {PotionEffectType.SLOW, 1}, + {PotionEffectType.SLOWNESS, 1}, {PotionEffectType.WEAKNESS, 1}, }) .collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); diff --git a/src/main/java/net/rawmod/mineclass/classes/DwarfClass.java b/src/main/java/dev/rawleenc/mineclass/classes/DwarfClass.java similarity index 72% rename from src/main/java/net/rawmod/mineclass/classes/DwarfClass.java rename to src/main/java/dev/rawleenc/mineclass/classes/DwarfClass.java index 25e7b2f..609b926 100644 --- a/src/main/java/net/rawmod/mineclass/classes/DwarfClass.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/DwarfClass.java @@ -1,6 +1,6 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; -import net.rawmod.mineclass.utils.Pair; +import dev.rawleenc.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; @@ -32,9 +32,9 @@ public class DwarfClass extends MineClassImpl { Stream.of( new Object[][] { {PotionEffectType.HEALTH_BOOST, 2}, - {PotionEffectType.DAMAGE_RESISTANCE, 1}, + {PotionEffectType.RESISTANCE, 1}, {PotionEffectType.HERO_OF_THE_VILLAGE, 1}, - {PotionEffectType.FAST_DIGGING, 1}, + {PotionEffectType.HASTE, 1}, {PotionEffectType.NIGHT_VISION, 1}, }) .collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); @@ -44,33 +44,33 @@ public class DwarfClass extends MineClassImpl { new AbstractMap.SimpleEntry<>( Material.NETHERITE_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new Pair<>(Enchantment.EFFICIENCY, 8), + new Pair<>(Enchantment.FORTUNE, 2))), new AbstractMap.SimpleEntry<>( Material.DIAMOND_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new Pair<>(Enchantment.EFFICIENCY, 8), + new Pair<>(Enchantment.FORTUNE, 2))), new AbstractMap.SimpleEntry<>( Material.IRON_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new Pair<>(Enchantment.EFFICIENCY, 8), + new Pair<>(Enchantment.FORTUNE, 2))), new AbstractMap.SimpleEntry<>( Material.GOLDEN_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new Pair<>(Enchantment.EFFICIENCY, 8), + new Pair<>(Enchantment.FORTUNE, 2))), new AbstractMap.SimpleEntry<>( Material.STONE_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))), + new Pair<>(Enchantment.EFFICIENCY, 8), + new Pair<>(Enchantment.FORTUNE, 2))), new AbstractMap.SimpleEntry<>( Material.WOODEN_PICKAXE, Arrays.asList( - new Pair<>(Enchantment.DIG_SPEED, 8), - new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2)))) + new Pair<>(Enchantment.EFFICIENCY, 8), + new Pair<>(Enchantment.FORTUNE, 2)))) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); @Override diff --git a/src/main/java/net/rawmod/mineclass/classes/ElfClass.java b/src/main/java/dev/rawleenc/mineclass/classes/ElfClass.java similarity index 89% rename from src/main/java/net/rawmod/mineclass/classes/ElfClass.java rename to src/main/java/dev/rawleenc/mineclass/classes/ElfClass.java index 7ab593c..0cf4ecc 100644 --- a/src/main/java/net/rawmod/mineclass/classes/ElfClass.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/ElfClass.java @@ -1,6 +1,6 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; -import net.rawmod.mineclass.utils.Pair; +import dev.rawleenc.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; @@ -37,7 +37,7 @@ public class ElfClass extends MineClassImpl { Stream.of( new Object[][] { {PotionEffectType.SPEED, 2}, - {PotionEffectType.JUMP, 3}, + {PotionEffectType.JUMP_BOOST, 3}, {PotionEffectType.LUCK, 1}, {PotionEffectType.NIGHT_VISION, 1}, }) @@ -48,8 +48,8 @@ public class ElfClass extends MineClassImpl { new AbstractMap.SimpleEntry<>( Material.BOW, Arrays.asList( - new Pair<>(Enchantment.ARROW_INFINITE, 1), - new Pair<>(Enchantment.ARROW_DAMAGE, 8), + new Pair<>(Enchantment.INFINITY, 1), + new Pair<>(Enchantment.POWER, 8), new Pair<>(Enchantment.KNOCKBACK, 1)))) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); diff --git a/src/main/java/net/rawmod/mineclass/classes/EnderElfClass.java b/src/main/java/dev/rawleenc/mineclass/classes/EnderElfClass.java similarity index 94% rename from src/main/java/net/rawmod/mineclass/classes/EnderElfClass.java rename to src/main/java/dev/rawleenc/mineclass/classes/EnderElfClass.java index 5fd4287..3516bd4 100644 --- a/src/main/java/net/rawmod/mineclass/classes/EnderElfClass.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/EnderElfClass.java @@ -1,6 +1,6 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; -import net.rawmod.mineclass.utils.Pair; +import dev.rawleenc.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.enchantments.Enchantment; @@ -92,7 +92,7 @@ public class EnderElfClass extends MineClassImpl { player.addPotionEffect( new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0, false, false)); player.addPotionEffect( - new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, Integer.MAX_VALUE, 0, false, false)); + new PotionEffect(PotionEffectType.RESISTANCE, Integer.MAX_VALUE, 0, false, false)); } } diff --git a/src/main/java/net/rawmod/mineclass/classes/FireDwarfClass.java b/src/main/java/dev/rawleenc/mineclass/classes/FireDwarfClass.java similarity index 91% rename from src/main/java/net/rawmod/mineclass/classes/FireDwarfClass.java rename to src/main/java/dev/rawleenc/mineclass/classes/FireDwarfClass.java index 66b4d4b..25fec55 100644 --- a/src/main/java/net/rawmod/mineclass/classes/FireDwarfClass.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/FireDwarfClass.java @@ -1,6 +1,6 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; -import net.rawmod.mineclass.utils.Pair; +import dev.rawleenc.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.enchantments.Enchantment; @@ -38,8 +38,8 @@ public class FireDwarfClass extends MineClassImpl { Stream.of( new Object[][] { {PotionEffectType.FIRE_RESISTANCE, 1}, - {PotionEffectType.FAST_DIGGING, 1}, - {PotionEffectType.JUMP, 2}, + {PotionEffectType.HASTE, 1}, + {PotionEffectType.JUMP_BOOST, 2}, {PotionEffectType.NIGHT_VISION, 1}, {PotionEffectType.HEALTH_BOOST, 2}, }) @@ -67,25 +67,25 @@ public class FireDwarfClass extends MineClassImpl { Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))), new AbstractMap.SimpleEntry<>( Material.NETHERITE_PICKAXE, - Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))), new AbstractMap.SimpleEntry<>( Material.DIAMOND_PICKAXE, - Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))), new AbstractMap.SimpleEntry<>( Material.IRON_PICKAXE, - Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))), new AbstractMap.SimpleEntry<>( Material.GOLDEN_PICKAXE, - Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))), new AbstractMap.SimpleEntry<>( Material.STONE_PICKAXE, - Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))), new AbstractMap.SimpleEntry<>( Material.WOODEN_PICKAXE, - Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))), + Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))), new AbstractMap.SimpleEntry<>( Material.CROSSBOW, - Collections.singletonList(new Pair<>(Enchantment.ARROW_INFINITE, 1))), + Collections.singletonList(new Pair<>(Enchantment.INFINITY, 1))), new AbstractMap.SimpleEntry<>( Material.FLINT_AND_STEEL, new ArrayList>())) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); @@ -99,7 +99,7 @@ public class FireDwarfClass extends MineClassImpl { player.addPotionEffect( new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0, false, false)); player.addPotionEffect( - new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, Integer.MAX_VALUE, 0, false, false)); + new PotionEffect(PotionEffectType.RESISTANCE, Integer.MAX_VALUE, 0, false, false)); } } diff --git a/src/main/java/net/rawmod/mineclass/classes/MineClass.java b/src/main/java/dev/rawleenc/mineclass/classes/MineClass.java similarity index 90% rename from src/main/java/net/rawmod/mineclass/classes/MineClass.java rename to src/main/java/dev/rawleenc/mineclass/classes/MineClass.java index 1240e2c..5e1fc3d 100644 --- a/src/main/java/net/rawmod/mineclass/classes/MineClass.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/MineClass.java @@ -1,6 +1,6 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; -import net.rawmod.mineclass.utils.Pair; +import dev.rawleenc.mineclass.utils.Pair; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/src/main/java/net/rawmod/mineclass/classes/MineClassFactory.java b/src/main/java/dev/rawleenc/mineclass/classes/MineClassFactory.java similarity index 99% rename from src/main/java/net/rawmod/mineclass/classes/MineClassFactory.java rename to src/main/java/dev/rawleenc/mineclass/classes/MineClassFactory.java index 98fa37e..d463432 100644 --- a/src/main/java/net/rawmod/mineclass/classes/MineClassFactory.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/MineClassFactory.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/net/rawmod/mineclass/classes/MineClassImpl.java b/src/main/java/dev/rawleenc/mineclass/classes/MineClassImpl.java similarity index 98% rename from src/main/java/net/rawmod/mineclass/classes/MineClassImpl.java rename to src/main/java/dev/rawleenc/mineclass/classes/MineClassImpl.java index 5339c38..95631d6 100644 --- a/src/main/java/net/rawmod/mineclass/classes/MineClassImpl.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/MineClassImpl.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/net/rawmod/mineclass/classes/NagaClass.java b/src/main/java/dev/rawleenc/mineclass/classes/NagaClass.java similarity index 88% rename from src/main/java/net/rawmod/mineclass/classes/NagaClass.java rename to src/main/java/dev/rawleenc/mineclass/classes/NagaClass.java index d8042ff..ae342f5 100644 --- a/src/main/java/net/rawmod/mineclass/classes/NagaClass.java +++ b/src/main/java/dev/rawleenc/mineclass/classes/NagaClass.java @@ -1,12 +1,10 @@ -package net.rawmod.mineclass.classes; +package dev.rawleenc.mineclass.classes; -import net.rawmod.mineclass.utils.Pair; +import dev.rawleenc.mineclass.utils.Pair; import org.bukkit.Material; -import org.bukkit.World; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import java.util.*; @@ -44,17 +42,17 @@ public class NagaClass extends MineClassImpl { {PotionEffectType.DOLPHINS_GRACE, 3}, {PotionEffectType.SATURATION, 1}, {PotionEffectType.NIGHT_VISION, 1}, - {PotionEffectType.DAMAGE_RESISTANCE, 2}, - {PotionEffectType.INCREASE_DAMAGE, 2}, - {PotionEffectType.FAST_DIGGING, 10}, + {PotionEffectType.RESISTANCE, 2}, + {PotionEffectType.STRENGTH, 2}, + {PotionEffectType.HASTE, 10}, }) .collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1])); private static final Map potionEffectsOnEarth = Stream.of( new Object[][] { - {PotionEffectType.SLOW, 4}, - {PotionEffectType.SLOW_DIGGING, 1}, + {PotionEffectType.SLOWNESS, 4}, + {PotionEffectType.MINING_FATIGUE, 1}, {PotionEffectType.HUNGER, 10}, {PotionEffectType.WEAKNESS, 1}, }) diff --git a/src/main/java/net/rawmod/mineclass/commands/CommandClass.java b/src/main/java/dev/rawleenc/mineclass/commands/CommandClass.java similarity index 89% rename from src/main/java/net/rawmod/mineclass/commands/CommandClass.java rename to src/main/java/dev/rawleenc/mineclass/commands/CommandClass.java index ae72e2a..3d1c556 100644 --- a/src/main/java/net/rawmod/mineclass/commands/CommandClass.java +++ b/src/main/java/dev/rawleenc/mineclass/commands/CommandClass.java @@ -1,20 +1,16 @@ -package net.rawmod.mineclass.commands; +package dev.rawleenc.mineclass.commands; -import net.rawmod.mineclass.classes.MineClassFactory; -import net.rawmod.mineclass.utils.InvocationsFinder; -import net.rawmod.mineclass.utils.NumberOfInvocations; +import dev.rawleenc.mineclass.classes.MineClassFactory; +import dev.rawleenc.mineclass.utils.InvocationsFinder; +import dev.rawleenc.mineclass.utils.NumberOfInvocations; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import java.util.Arrays; -import java.util.stream.Collectors; - public class CommandClass implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { diff --git a/src/main/java/net/rawmod/mineclass/listeners/MineClassListeners.java b/src/main/java/dev/rawleenc/mineclass/listeners/MineClassListeners.java similarity index 95% rename from src/main/java/net/rawmod/mineclass/listeners/MineClassListeners.java rename to src/main/java/dev/rawleenc/mineclass/listeners/MineClassListeners.java index 381154b..d18cddd 100644 --- a/src/main/java/net/rawmod/mineclass/listeners/MineClassListeners.java +++ b/src/main/java/dev/rawleenc/mineclass/listeners/MineClassListeners.java @@ -1,9 +1,16 @@ -package net.rawmod.mineclass.listeners; +package dev.rawleenc.mineclass.listeners; -import net.rawmod.mineclass.Mineclass; -import net.rawmod.mineclass.classes.MineClass; -import net.rawmod.mineclass.classes.MineClassFactory; -import net.rawmod.mineclass.utils.*; +import dev.rawleenc.mineclass.Mineclass; +import dev.rawleenc.mineclass.classes.MineClass; +import dev.rawleenc.mineclass.classes.MineClassFactory; +import dev.rawleenc.mineclass.utils.ApplyClassStatusTask; +import dev.rawleenc.mineclass.utils.ClassItemPossessed; +import dev.rawleenc.mineclass.utils.InvocationsFinder; +import dev.rawleenc.mineclass.utils.NumberOfInvocations; +import dev.rawleenc.mineclass.utils.PlayerHitCounter; +import dev.rawleenc.mineclass.utils.PlayerTimerEffects; +import dev.rawleenc.mineclass.utils.PlayerUtils; +import dev.rawleenc.mineclass.utils.SmeltingEngine; import org.bukkit.DyeColor; import org.bukkit.GameMode; import org.bukkit.Material; @@ -114,9 +121,9 @@ public class MineClassListeners implements Listener { || isItemforbidden(player, itemInHand)) { player.addPotionEffect(new PotionEffect(PotionEffectType.WEAKNESS, 200, 0)); if (MineClassFactory.getInstance().getClassCode(player).equals("elf")) { - player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 200, 3)); + player.addPotionEffect(new PotionEffect(PotionEffectType.SLOWNESS, 200, 3)); } else { - player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 200, 1)); + player.addPotionEffect(new PotionEffect(PotionEffectType.SLOWNESS, 200, 1)); } player.addPotionEffect(new PotionEffect(PotionEffectType.HUNGER, 200, 9)); player.setFoodLevel(Math.max(player.getFoodLevel() - 2, 0)); @@ -187,7 +194,7 @@ public class MineClassListeners implements Listener { if (event.getEntity() instanceof Player) { Player player = (Player) event.getEntity(); if (event.getProjectile() instanceof AbstractArrow - && event.getBow().getEnchantments().containsKey(Enchantment.ARROW_INFINITE)) { + && event.getBow().getEnchantments().containsKey(Enchantment.INFINITY)) { player.getInventory().addItem(new ItemStack(Material.ARROW)); ((AbstractArrow) event.getProjectile()) .setPickupStatus(AbstractArrow.PickupStatus.DISALLOWED); @@ -443,7 +450,7 @@ public class MineClassListeners implements Listener { wolf.setMetadata("beastMasterWolfType", new FixedMetadataValue(this.plugin, 1)); wolf.setCustomName(String.format("%s's Beast Master Wolf", player.getName())); wolf.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, Integer.MAX_VALUE, 3)); - wolf.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, Integer.MAX_VALUE, 1)); + wolf.addPotionEffect(new PotionEffect(PotionEffectType.STRENGTH, Integer.MAX_VALUE, 1)); wolf.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 2)); } @@ -451,7 +458,7 @@ public class MineClassListeners implements Listener { wolf.setMetadata("beastMasterWolfType", new FixedMetadataValue(this.plugin, 2)); wolf.setCustomName(String.format("%s's Beast Master Hellhound", player.getName())); wolf.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, Integer.MAX_VALUE, 4)); - wolf.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, Integer.MAX_VALUE, 2)); + wolf.addPotionEffect(new PotionEffect(PotionEffectType.STRENGTH, Integer.MAX_VALUE, 2)); wolf.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 4)); wolf.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE, Integer.MAX_VALUE, 0)); } diff --git a/src/main/java/net/rawmod/mineclass/utils/ApplyClassStatusTask.java b/src/main/java/dev/rawleenc/mineclass/utils/ApplyClassStatusTask.java similarity index 81% rename from src/main/java/net/rawmod/mineclass/utils/ApplyClassStatusTask.java rename to src/main/java/dev/rawleenc/mineclass/utils/ApplyClassStatusTask.java index 2a4f289..8ce9e64 100644 --- a/src/main/java/net/rawmod/mineclass/utils/ApplyClassStatusTask.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/ApplyClassStatusTask.java @@ -1,6 +1,6 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; -import net.rawmod.mineclass.classes.MineClassFactory; +import dev.rawleenc.mineclass.classes.MineClassFactory; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/net/rawmod/mineclass/utils/ClassItemPossessed.java b/src/main/java/dev/rawleenc/mineclass/utils/ClassItemPossessed.java similarity index 96% rename from src/main/java/net/rawmod/mineclass/utils/ClassItemPossessed.java rename to src/main/java/dev/rawleenc/mineclass/utils/ClassItemPossessed.java index dde1fbf..a4ab24c 100644 --- a/src/main/java/net/rawmod/mineclass/utils/ClassItemPossessed.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/ClassItemPossessed.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/net/rawmod/mineclass/utils/InvocationsFinder.java b/src/main/java/dev/rawleenc/mineclass/utils/InvocationsFinder.java similarity index 98% rename from src/main/java/net/rawmod/mineclass/utils/InvocationsFinder.java rename to src/main/java/dev/rawleenc/mineclass/utils/InvocationsFinder.java index 25236c7..3112de4 100644 --- a/src/main/java/net/rawmod/mineclass/utils/InvocationsFinder.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/InvocationsFinder.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/src/main/java/net/rawmod/mineclass/utils/NumberOfInvocations.java b/src/main/java/dev/rawleenc/mineclass/utils/NumberOfInvocations.java similarity index 96% rename from src/main/java/net/rawmod/mineclass/utils/NumberOfInvocations.java rename to src/main/java/dev/rawleenc/mineclass/utils/NumberOfInvocations.java index cec08ea..9e021f6 100644 --- a/src/main/java/net/rawmod/mineclass/utils/NumberOfInvocations.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/NumberOfInvocations.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; import org.bukkit.entity.Player; diff --git a/src/main/java/net/rawmod/mineclass/utils/Pair.java b/src/main/java/dev/rawleenc/mineclass/utils/Pair.java similarity index 90% rename from src/main/java/net/rawmod/mineclass/utils/Pair.java rename to src/main/java/dev/rawleenc/mineclass/utils/Pair.java index 679ba37..28f2d00 100644 --- a/src/main/java/net/rawmod/mineclass/utils/Pair.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/Pair.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; public class Pair { private F first; diff --git a/src/main/java/net/rawmod/mineclass/utils/PlayerHitCounter.java b/src/main/java/dev/rawleenc/mineclass/utils/PlayerHitCounter.java similarity index 96% rename from src/main/java/net/rawmod/mineclass/utils/PlayerHitCounter.java rename to src/main/java/dev/rawleenc/mineclass/utils/PlayerHitCounter.java index e01cd87..09062e3 100644 --- a/src/main/java/net/rawmod/mineclass/utils/PlayerHitCounter.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/PlayerHitCounter.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; import org.bukkit.entity.Player; diff --git a/src/main/java/net/rawmod/mineclass/utils/PlayerTimerEffects.java b/src/main/java/dev/rawleenc/mineclass/utils/PlayerTimerEffects.java similarity index 82% rename from src/main/java/net/rawmod/mineclass/utils/PlayerTimerEffects.java rename to src/main/java/dev/rawleenc/mineclass/utils/PlayerTimerEffects.java index fb11181..8338cbb 100644 --- a/src/main/java/net/rawmod/mineclass/utils/PlayerTimerEffects.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/PlayerTimerEffects.java @@ -1,9 +1,7 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; -import net.rawmod.mineclass.classes.MineClass; -import net.rawmod.mineclass.classes.MineClassFactory; -import org.bukkit.attribute.Attribute; -import org.bukkit.attribute.AttributeInstance; +import dev.rawleenc.mineclass.classes.MineClass; +import dev.rawleenc.mineclass.classes.MineClassFactory; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -40,8 +38,8 @@ public class PlayerTimerEffects extends BukkitRunnable { if (player.getFireTicks() > 0) { PlayerUtils.heal(player, 2); player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 40, 3)); - player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 40, 1)); - player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 40, 1)); + player.addPotionEffect(new PotionEffect(PotionEffectType.STRENGTH, 40, 1)); + player.addPotionEffect(new PotionEffect(PotionEffectType.RESISTANCE, 40, 1)); } if (player.isInWater()) { player.damage(1); diff --git a/src/main/java/net/rawmod/mineclass/utils/PlayerUtils.java b/src/main/java/dev/rawleenc/mineclass/utils/PlayerUtils.java similarity index 91% rename from src/main/java/net/rawmod/mineclass/utils/PlayerUtils.java rename to src/main/java/dev/rawleenc/mineclass/utils/PlayerUtils.java index b7433c4..361510a 100644 --- a/src/main/java/net/rawmod/mineclass/utils/PlayerUtils.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/PlayerUtils.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; diff --git a/src/main/java/net/rawmod/mineclass/utils/SmeltingEngine.java b/src/main/java/dev/rawleenc/mineclass/utils/SmeltingEngine.java similarity index 98% rename from src/main/java/net/rawmod/mineclass/utils/SmeltingEngine.java rename to src/main/java/dev/rawleenc/mineclass/utils/SmeltingEngine.java index 5fe73b5..6e3b92e 100644 --- a/src/main/java/net/rawmod/mineclass/utils/SmeltingEngine.java +++ b/src/main/java/dev/rawleenc/mineclass/utils/SmeltingEngine.java @@ -1,4 +1,4 @@ -package net.rawmod.mineclass.utils; +package dev.rawleenc.mineclass.utils; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c59f162..019b3f9 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Mineclass version: @version@ -main: net.rawmod.mineclass.Mineclass +main: dev.rawleenc.mineclass.Mineclass api-version: 1.16 authors: [ Barazok ] commands: