Various Config Fixes

Fixed various mistakes and added various things/items/blocks/options

eco-core/core-plugin/src/main/resources/effects/dazzle.yml

@@ -12,6 +12,6 @@ effects:
       level: 3
       duration: "18 + %level% * 2"
     triggers:
-      - mine_block
+      - melee_attack
 
 conditions: [ ]

eco-core/core-plugin/src/main/resources/effects/spelunking.yml

@@ -21,8 +21,8 @@ effects:
         - "gold_ore"
         - "deepslate_gold_ore"
         - "gilded_blackstone"
-        - "lapis_lazuli_ore"
+        - "lapis_ore"
-        - "deepslate_lapis_lazuli_ore"
+        - "deepslate_lapis_ore"
         - "redstone_ore"
         - "deepslate_redstone_ore"
         - "emerald_ore"
@@ -48,8 +48,8 @@ effects:
         - "gold_ore"
         - "deepslate_gold_ore"
         - "gilded_blackstone"
-        - "lapis_lazuli_ore"
+        - "lapis_ore"
-        - "deepslate_lapis_lazuli_ore"
+        - "deepslate_lapis_ore"
         - "redstone_ore"
         - "deepslate_redstone_ore"
         - "emerald_ore"

eco-core/core-plugin/src/main/resources/skills/_example.yml

@@ -107,6 +107,7 @@ xp-requirements:
 #   levels: 1
 #   start-level: 10
 #   end-level: 20
+#   every: 2
 
 rewards:
   - reward: defense
@@ -130,11 +131,20 @@ rewards:
 # Effects to run when an item levels up
 # %level% is the level the item leveled up to.
 # If you want to restrict this to certain levels, you can use
-# require: %level% == 20, or require: %level% < 50, etc.
+# require: %level% = 20, or require: %level% < 50, etc.
+# If you want this to run every x levels, you can use
+# every: <levels>
 level-up-effects:
   - id: give_money
     args:
       amount: 1000 * %level%
+      require: "%level% > 50"
+
+  - id: give_money
+    args:
+      amount: 3000 * %level%
+      every: 2
+      require: "%level% >= 50"
 
 
 # Custom placeholders to be used in descriptions,

eco-core/core-plugin/src/main/resources/skills/armory.yml

@@ -122,6 +122,7 @@ xp-gain-methods:
       not_damage_cause:
         - KILL
         - SUICIDE
+        - CONTACT
 
 # Conditions that must be met to gain XP. While you can add conditions to xp
 # gain methods, if you have many this can be annoying, so this is global.

eco-core/core-plugin/src/main/resources/skills/farming.yml

@@ -163,7 +163,7 @@ xp-gain-methods:
       fully_grown: true
       blocks:
         - potatoes
-        - beetroot
+        - beetroots
 
 # Conditions that must be met to gain XP. While you can add conditions to xp
 # gain methods, if you have many this can be annoying, so this is global.

eco-core/core-plugin/src/main/resources/skills/woodcutting.yml

@@ -112,12 +112,16 @@ xp-gain-methods:
         - jungle_log
         - acacia_log
         - dark_oak_log
+        - mangrove_log
+        - cherry_log
         - oak_wood
         - birch_wood
         - spruce_wood
         - jungle_wood
         - acacia_wood
         - dark_oak_wood
+        - mangrove_wood
+        - chery_wood
 
   - trigger: mine_block
     multiplier: 14