feat: update plugin to spigot 1.21.1
Some checks failed
Build and Upload JAR / build (push) Failing after 17s
Some checks failed
Build and Upload JAR / build (push) Failing after 17s
This commit is contained in:
10
build.gradle
10
build.gradle
@@ -2,8 +2,8 @@ import org.apache.tools.ant.filters.ReplaceTokens
|
|||||||
|
|
||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
|
|
||||||
group = 'net.rawmod'
|
group = 'dev.rawleenc'
|
||||||
version = '0.1.5'
|
version = '0.2.0'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
@@ -18,10 +18,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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 {
|
java {
|
||||||
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
|
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
|
||||||
sourceCompatibility = javaVersion
|
sourceCompatibility = javaVersion
|
||||||
@@ -46,4 +46,4 @@ processResources {
|
|||||||
filesMatching('plugin.yml') {
|
filesMatching('plugin.yml') {
|
||||||
expand props
|
expand props
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
package net.rawmod.mineclass;
|
package dev.rawleenc.mineclass;
|
||||||
|
|
||||||
import net.rawmod.mineclass.classes.MineClassFactory;
|
import dev.rawleenc.mineclass.classes.MineClassFactory;
|
||||||
import net.rawmod.mineclass.commands.CommandClass;
|
import dev.rawleenc.mineclass.commands.CommandClass;
|
||||||
import net.rawmod.mineclass.listeners.MineClassListeners;
|
import dev.rawleenc.mineclass.listeners.MineClassListeners;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.PluginCommand;
|
import org.bukkit.command.PluginCommand;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
@@ -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.Material;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -29,7 +29,7 @@ public class BeastMasterClass extends MineClassImpl {
|
|||||||
Stream.of(
|
Stream.of(
|
||||||
new Object[][] {
|
new Object[][] {
|
||||||
{PotionEffectType.NIGHT_VISION, 1},
|
{PotionEffectType.NIGHT_VISION, 1},
|
||||||
{PotionEffectType.SLOW, 1},
|
{PotionEffectType.SLOWNESS, 1},
|
||||||
{PotionEffectType.WEAKNESS, 1},
|
{PotionEffectType.WEAKNESS, 1},
|
||||||
})
|
})
|
||||||
.collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1]));
|
.collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1]));
|
||||||
@@ -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.Material;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -32,9 +32,9 @@ public class DwarfClass extends MineClassImpl {
|
|||||||
Stream.of(
|
Stream.of(
|
||||||
new Object[][] {
|
new Object[][] {
|
||||||
{PotionEffectType.HEALTH_BOOST, 2},
|
{PotionEffectType.HEALTH_BOOST, 2},
|
||||||
{PotionEffectType.DAMAGE_RESISTANCE, 1},
|
{PotionEffectType.RESISTANCE, 1},
|
||||||
{PotionEffectType.HERO_OF_THE_VILLAGE, 1},
|
{PotionEffectType.HERO_OF_THE_VILLAGE, 1},
|
||||||
{PotionEffectType.FAST_DIGGING, 1},
|
{PotionEffectType.HASTE, 1},
|
||||||
{PotionEffectType.NIGHT_VISION, 1},
|
{PotionEffectType.NIGHT_VISION, 1},
|
||||||
})
|
})
|
||||||
.collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1]));
|
.collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1]));
|
||||||
@@ -44,33 +44,33 @@ public class DwarfClass extends MineClassImpl {
|
|||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.NETHERITE_PICKAXE,
|
Material.NETHERITE_PICKAXE,
|
||||||
Arrays.asList(
|
Arrays.asList(
|
||||||
new Pair<>(Enchantment.DIG_SPEED, 8),
|
new Pair<>(Enchantment.EFFICIENCY, 8),
|
||||||
new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))),
|
new Pair<>(Enchantment.FORTUNE, 2))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.DIAMOND_PICKAXE,
|
Material.DIAMOND_PICKAXE,
|
||||||
Arrays.asList(
|
Arrays.asList(
|
||||||
new Pair<>(Enchantment.DIG_SPEED, 8),
|
new Pair<>(Enchantment.EFFICIENCY, 8),
|
||||||
new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))),
|
new Pair<>(Enchantment.FORTUNE, 2))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.IRON_PICKAXE,
|
Material.IRON_PICKAXE,
|
||||||
Arrays.asList(
|
Arrays.asList(
|
||||||
new Pair<>(Enchantment.DIG_SPEED, 8),
|
new Pair<>(Enchantment.EFFICIENCY, 8),
|
||||||
new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))),
|
new Pair<>(Enchantment.FORTUNE, 2))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.GOLDEN_PICKAXE,
|
Material.GOLDEN_PICKAXE,
|
||||||
Arrays.asList(
|
Arrays.asList(
|
||||||
new Pair<>(Enchantment.DIG_SPEED, 8),
|
new Pair<>(Enchantment.EFFICIENCY, 8),
|
||||||
new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))),
|
new Pair<>(Enchantment.FORTUNE, 2))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.STONE_PICKAXE,
|
Material.STONE_PICKAXE,
|
||||||
Arrays.asList(
|
Arrays.asList(
|
||||||
new Pair<>(Enchantment.DIG_SPEED, 8),
|
new Pair<>(Enchantment.EFFICIENCY, 8),
|
||||||
new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))),
|
new Pair<>(Enchantment.FORTUNE, 2))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.WOODEN_PICKAXE,
|
Material.WOODEN_PICKAXE,
|
||||||
Arrays.asList(
|
Arrays.asList(
|
||||||
new Pair<>(Enchantment.DIG_SPEED, 8),
|
new Pair<>(Enchantment.EFFICIENCY, 8),
|
||||||
new Pair<>(Enchantment.LOOT_BONUS_BLOCKS, 2))))
|
new Pair<>(Enchantment.FORTUNE, 2))))
|
||||||
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
|
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -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.Material;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -37,7 +37,7 @@ public class ElfClass extends MineClassImpl {
|
|||||||
Stream.of(
|
Stream.of(
|
||||||
new Object[][] {
|
new Object[][] {
|
||||||
{PotionEffectType.SPEED, 2},
|
{PotionEffectType.SPEED, 2},
|
||||||
{PotionEffectType.JUMP, 3},
|
{PotionEffectType.JUMP_BOOST, 3},
|
||||||
{PotionEffectType.LUCK, 1},
|
{PotionEffectType.LUCK, 1},
|
||||||
{PotionEffectType.NIGHT_VISION, 1},
|
{PotionEffectType.NIGHT_VISION, 1},
|
||||||
})
|
})
|
||||||
@@ -48,8 +48,8 @@ public class ElfClass extends MineClassImpl {
|
|||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.BOW,
|
Material.BOW,
|
||||||
Arrays.asList(
|
Arrays.asList(
|
||||||
new Pair<>(Enchantment.ARROW_INFINITE, 1),
|
new Pair<>(Enchantment.INFINITY, 1),
|
||||||
new Pair<>(Enchantment.ARROW_DAMAGE, 8),
|
new Pair<>(Enchantment.POWER, 8),
|
||||||
new Pair<>(Enchantment.KNOCKBACK, 1))))
|
new Pair<>(Enchantment.KNOCKBACK, 1))))
|
||||||
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
|
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
|
||||||
|
|
||||||
@@ -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.Material;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
@@ -92,7 +92,7 @@ public class EnderElfClass extends MineClassImpl {
|
|||||||
player.addPotionEffect(
|
player.addPotionEffect(
|
||||||
new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0, false, false));
|
new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0, false, false));
|
||||||
player.addPotionEffect(
|
player.addPotionEffect(
|
||||||
new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, Integer.MAX_VALUE, 0, false, false));
|
new PotionEffect(PotionEffectType.RESISTANCE, Integer.MAX_VALUE, 0, false, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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.Material;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
@@ -38,8 +38,8 @@ public class FireDwarfClass extends MineClassImpl {
|
|||||||
Stream.of(
|
Stream.of(
|
||||||
new Object[][] {
|
new Object[][] {
|
||||||
{PotionEffectType.FIRE_RESISTANCE, 1},
|
{PotionEffectType.FIRE_RESISTANCE, 1},
|
||||||
{PotionEffectType.FAST_DIGGING, 1},
|
{PotionEffectType.HASTE, 1},
|
||||||
{PotionEffectType.JUMP, 2},
|
{PotionEffectType.JUMP_BOOST, 2},
|
||||||
{PotionEffectType.NIGHT_VISION, 1},
|
{PotionEffectType.NIGHT_VISION, 1},
|
||||||
{PotionEffectType.HEALTH_BOOST, 2},
|
{PotionEffectType.HEALTH_BOOST, 2},
|
||||||
})
|
})
|
||||||
@@ -67,25 +67,25 @@ public class FireDwarfClass extends MineClassImpl {
|
|||||||
Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))),
|
Collections.singletonList(new Pair<>(Enchantment.FIRE_ASPECT, 2))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.NETHERITE_PICKAXE,
|
Material.NETHERITE_PICKAXE,
|
||||||
Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))),
|
Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.DIAMOND_PICKAXE,
|
Material.DIAMOND_PICKAXE,
|
||||||
Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))),
|
Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.IRON_PICKAXE,
|
Material.IRON_PICKAXE,
|
||||||
Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))),
|
Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.GOLDEN_PICKAXE,
|
Material.GOLDEN_PICKAXE,
|
||||||
Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))),
|
Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.STONE_PICKAXE,
|
Material.STONE_PICKAXE,
|
||||||
Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))),
|
Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.WOODEN_PICKAXE,
|
Material.WOODEN_PICKAXE,
|
||||||
Collections.singletonList(new Pair<>(Enchantment.DIG_SPEED, 5))),
|
Collections.singletonList(new Pair<>(Enchantment.EFFICIENCY, 5))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.CROSSBOW,
|
Material.CROSSBOW,
|
||||||
Collections.singletonList(new Pair<>(Enchantment.ARROW_INFINITE, 1))),
|
Collections.singletonList(new Pair<>(Enchantment.INFINITY, 1))),
|
||||||
new AbstractMap.SimpleEntry<>(
|
new AbstractMap.SimpleEntry<>(
|
||||||
Material.FLINT_AND_STEEL, new ArrayList<Pair<Enchantment, Integer>>()))
|
Material.FLINT_AND_STEEL, new ArrayList<Pair<Enchantment, Integer>>()))
|
||||||
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
|
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
|
||||||
@@ -99,7 +99,7 @@ public class FireDwarfClass extends MineClassImpl {
|
|||||||
player.addPotionEffect(
|
player.addPotionEffect(
|
||||||
new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0, false, false));
|
new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0, false, false));
|
||||||
player.addPotionEffect(
|
player.addPotionEffect(
|
||||||
new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, Integer.MAX_VALUE, 0, false, false));
|
new PotionEffect(PotionEffectType.RESISTANCE, Integer.MAX_VALUE, 0, false, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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.Material;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.classes;
|
package dev.rawleenc.mineclass.classes;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.classes;
|
package dev.rawleenc.mineclass.classes;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -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.Material;
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.potion.PotionEffect;
|
|
||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -44,17 +42,17 @@ public class NagaClass extends MineClassImpl {
|
|||||||
{PotionEffectType.DOLPHINS_GRACE, 3},
|
{PotionEffectType.DOLPHINS_GRACE, 3},
|
||||||
{PotionEffectType.SATURATION, 1},
|
{PotionEffectType.SATURATION, 1},
|
||||||
{PotionEffectType.NIGHT_VISION, 1},
|
{PotionEffectType.NIGHT_VISION, 1},
|
||||||
{PotionEffectType.DAMAGE_RESISTANCE, 2},
|
{PotionEffectType.RESISTANCE, 2},
|
||||||
{PotionEffectType.INCREASE_DAMAGE, 2},
|
{PotionEffectType.STRENGTH, 2},
|
||||||
{PotionEffectType.FAST_DIGGING, 10},
|
{PotionEffectType.HASTE, 10},
|
||||||
})
|
})
|
||||||
.collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1]));
|
.collect(Collectors.toMap(data -> (PotionEffectType) data[0], data -> (Integer) data[1]));
|
||||||
|
|
||||||
private static final Map<PotionEffectType, Integer> potionEffectsOnEarth =
|
private static final Map<PotionEffectType, Integer> potionEffectsOnEarth =
|
||||||
Stream.of(
|
Stream.of(
|
||||||
new Object[][] {
|
new Object[][] {
|
||||||
{PotionEffectType.SLOW, 4},
|
{PotionEffectType.SLOWNESS, 4},
|
||||||
{PotionEffectType.SLOW_DIGGING, 1},
|
{PotionEffectType.MINING_FATIGUE, 1},
|
||||||
{PotionEffectType.HUNGER, 10},
|
{PotionEffectType.HUNGER, 10},
|
||||||
{PotionEffectType.WEAKNESS, 1},
|
{PotionEffectType.WEAKNESS, 1},
|
||||||
})
|
})
|
||||||
@@ -1,20 +1,16 @@
|
|||||||
package net.rawmod.mineclass.commands;
|
package dev.rawleenc.mineclass.commands;
|
||||||
|
|
||||||
import net.rawmod.mineclass.classes.MineClassFactory;
|
import dev.rawleenc.mineclass.classes.MineClassFactory;
|
||||||
import net.rawmod.mineclass.utils.InvocationsFinder;
|
import dev.rawleenc.mineclass.utils.InvocationsFinder;
|
||||||
import net.rawmod.mineclass.utils.NumberOfInvocations;
|
import dev.rawleenc.mineclass.utils.NumberOfInvocations;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandExecutor;
|
import org.bukkit.command.CommandExecutor;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.potion.PotionEffect;
|
import org.bukkit.potion.PotionEffect;
|
||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
public class CommandClass implements CommandExecutor {
|
public class CommandClass implements CommandExecutor {
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||||
@@ -1,9 +1,16 @@
|
|||||||
package net.rawmod.mineclass.listeners;
|
package dev.rawleenc.mineclass.listeners;
|
||||||
|
|
||||||
import net.rawmod.mineclass.Mineclass;
|
import dev.rawleenc.mineclass.Mineclass;
|
||||||
import net.rawmod.mineclass.classes.MineClass;
|
import dev.rawleenc.mineclass.classes.MineClass;
|
||||||
import net.rawmod.mineclass.classes.MineClassFactory;
|
import dev.rawleenc.mineclass.classes.MineClassFactory;
|
||||||
import net.rawmod.mineclass.utils.*;
|
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.DyeColor;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
@@ -114,9 +121,9 @@ public class MineClassListeners implements Listener {
|
|||||||
|| isItemforbidden(player, itemInHand)) {
|
|| isItemforbidden(player, itemInHand)) {
|
||||||
player.addPotionEffect(new PotionEffect(PotionEffectType.WEAKNESS, 200, 0));
|
player.addPotionEffect(new PotionEffect(PotionEffectType.WEAKNESS, 200, 0));
|
||||||
if (MineClassFactory.getInstance().getClassCode(player).equals("elf")) {
|
if (MineClassFactory.getInstance().getClassCode(player).equals("elf")) {
|
||||||
player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 200, 3));
|
player.addPotionEffect(new PotionEffect(PotionEffectType.SLOWNESS, 200, 3));
|
||||||
} else {
|
} 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.addPotionEffect(new PotionEffect(PotionEffectType.HUNGER, 200, 9));
|
||||||
player.setFoodLevel(Math.max(player.getFoodLevel() - 2, 0));
|
player.setFoodLevel(Math.max(player.getFoodLevel() - 2, 0));
|
||||||
@@ -187,7 +194,7 @@ public class MineClassListeners implements Listener {
|
|||||||
if (event.getEntity() instanceof Player) {
|
if (event.getEntity() instanceof Player) {
|
||||||
Player player = (Player) event.getEntity();
|
Player player = (Player) event.getEntity();
|
||||||
if (event.getProjectile() instanceof AbstractArrow
|
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));
|
player.getInventory().addItem(new ItemStack(Material.ARROW));
|
||||||
((AbstractArrow) event.getProjectile())
|
((AbstractArrow) event.getProjectile())
|
||||||
.setPickupStatus(AbstractArrow.PickupStatus.DISALLOWED);
|
.setPickupStatus(AbstractArrow.PickupStatus.DISALLOWED);
|
||||||
@@ -443,7 +450,7 @@ public class MineClassListeners implements Listener {
|
|||||||
wolf.setMetadata("beastMasterWolfType", new FixedMetadataValue(this.plugin, 1));
|
wolf.setMetadata("beastMasterWolfType", new FixedMetadataValue(this.plugin, 1));
|
||||||
wolf.setCustomName(String.format("%s's Beast Master Wolf", player.getName()));
|
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.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));
|
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.setMetadata("beastMasterWolfType", new FixedMetadataValue(this.plugin, 2));
|
||||||
wolf.setCustomName(String.format("%s's Beast Master Hellhound", player.getName()));
|
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.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.SPEED, Integer.MAX_VALUE, 4));
|
||||||
wolf.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE, Integer.MAX_VALUE, 0));
|
wolf.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE, Integer.MAX_VALUE, 0));
|
||||||
}
|
}
|
||||||
@@ -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.entity.Player;
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
public class Pair<F, S> {
|
public class Pair<F, S> {
|
||||||
private F first;
|
private F first;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
@@ -1,9 +1,7 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
import net.rawmod.mineclass.classes.MineClass;
|
import dev.rawleenc.mineclass.classes.MineClass;
|
||||||
import net.rawmod.mineclass.classes.MineClassFactory;
|
import dev.rawleenc.mineclass.classes.MineClassFactory;
|
||||||
import org.bukkit.attribute.Attribute;
|
|
||||||
import org.bukkit.attribute.AttributeInstance;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.potion.PotionEffect;
|
import org.bukkit.potion.PotionEffect;
|
||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
@@ -40,8 +38,8 @@ public class PlayerTimerEffects extends BukkitRunnable {
|
|||||||
if (player.getFireTicks() > 0) {
|
if (player.getFireTicks() > 0) {
|
||||||
PlayerUtils.heal(player, 2);
|
PlayerUtils.heal(player, 2);
|
||||||
player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 40, 3));
|
player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 40, 3));
|
||||||
player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 40, 1));
|
player.addPotionEffect(new PotionEffect(PotionEffectType.STRENGTH, 40, 1));
|
||||||
player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 40, 1));
|
player.addPotionEffect(new PotionEffect(PotionEffectType.RESISTANCE, 40, 1));
|
||||||
}
|
}
|
||||||
if (player.isInWater()) {
|
if (player.isInWater()) {
|
||||||
player.damage(1);
|
player.damage(1);
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
import org.bukkit.attribute.Attribute;
|
import org.bukkit.attribute.Attribute;
|
||||||
import org.bukkit.attribute.AttributeInstance;
|
import org.bukkit.attribute.AttributeInstance;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.rawmod.mineclass.utils;
|
package dev.rawleenc.mineclass.utils;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
name: Mineclass
|
name: Mineclass
|
||||||
version: @version@
|
version: @version@
|
||||||
main: net.rawmod.mineclass.Mineclass
|
main: dev.rawleenc.mineclass.Mineclass
|
||||||
api-version: 1.16
|
api-version: 1.16
|
||||||
authors: [ Barazok ]
|
authors: [ Barazok ]
|
||||||
commands:
|
commands:
|
||||||
|
|||||||
Reference in New Issue
Block a user