diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7942e2..be98010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "EpicEnchants" path: "/builds/$CI_PROJECT_PATH" - version: "1_B4" + version: "1_B5" build: stage: build diff --git a/src/main/java/com/songoda/epicenchants/utils/single/ItemGroup.java b/src/main/java/com/songoda/epicenchants/utils/single/ItemGroup.java index 642ff00..f334da5 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/ItemGroup.java +++ b/src/main/java/com/songoda/epicenchants/utils/single/ItemGroup.java @@ -27,6 +27,10 @@ public class ItemGroup { groupMap.putAll(PICKAXES, Arrays.asList(DIAMOND_PICKAXE, GOLDEN_PICKAXE, IRON_PICKAXE, STONE_PICKAXE, WOODEN_PICKAXE)); + groupMap.putAll(HOES, Arrays.asList(DIAMOND_HOE, GOLDEN_HOE, IRON_HOE, STONE_HOE, WOODEN_HOE)); + + groupMap.putAll(SHOVELS, Arrays.asList(DIAMOND_SHOVEL, GOLDEN_SHOVEL, IRON_SHOVEL, STONE_SHOVEL, WOODEN_SHOVEL)); + groupMap.putAll(SWORDS, Arrays.asList(DIAMOND_SWORD, GOLDEN_SWORD, IRON_SWORD, STONE_SWORD, WOODEN_SWORD)); groupMap.put(BOWS, BOW); @@ -45,6 +49,10 @@ public class ItemGroup { groupMap.putAll(PICKAXES, Arrays.asList(DIAMOND_PICKAXE, Material.valueOf("GOLD_PICKAXE"), IRON_PICKAXE, STONE_PICKAXE, Material.valueOf("WOOD_PICKAXE"))); + groupMap.putAll(HOES, Arrays.asList(DIAMOND_HOE, Material.valueOf("GOLD_HOE"), IRON_HOE, STONE_HOE, Material.valueOf("WOOD_HOE"))); + + groupMap.putAll(SHOVELS, Arrays.asList(DIAMOND_SHOVEL, Material.valueOf("GOLD_SHOVEL"), IRON_SHOVEL, STONE_SHOVEL, Material.valueOf("WOODEN_SHOVEL"))); + groupMap.putAll(SWORDS, Arrays.asList(DIAMOND_SWORD, Material.valueOf("GOLD_SWORD"), IRON_SWORD, STONE_SWORD, Material.valueOf("WOOD_SWORD"))); groupMap.put(BOWS, BOW); @@ -113,9 +121,10 @@ public class ItemGroup { public enum Group { AXES, + HOES, PICKAXES, SHOVELS, - TOOLS(AXES, PICKAXES, SHOVELS), + TOOLS(AXES, PICKAXES, HOES, SHOVELS), SWORDS, BOWS, diff --git a/src/main/resources/enchants/unique/Berserk.yml b/src/main/resources/enchants/unique/Berserk.yml index 5bb67b1..9c171bf 100644 --- a/src/main/resources/enchants/unique/Berserk.yml +++ b/src/main/resources/enchants/unique/Berserk.yml @@ -25,4 +25,18 @@ effects: trigger: ATTACK_PLAYER_MELEE # What player should the effect be ran on: USER/OPPONENT. who: USER - \ No newline at end of file + # Potion Effect that should be applied. + potion-type: INCREASE_DAMAGE + # Simultaneous + simultaneous: + POTION: + # What player should the effect be ran on: USER/OPPONENT. + who: USER + # Amount of EXP to add + potion-type: SLOW_DIGGING + # Duration of the Potion Effect in seconds. + duration: "3 * {level}" + # Chance that the Effect gets activated. + chance: "5 * {level}" + # Amplifier of 0 = SPEED 1 a Amplifier of 1 = SPEED 2, etc. + amplifier: "{level}" \ No newline at end of file