Fixed overcompensation and enchanting changes

eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/Effects.java

@@ -41,7 +41,7 @@ public class Effects {
     public static final Effect SPELUNKING = new EffectSpelunking();
     public static final Effect DYNAMIC_MINING = new EffectDynamicMining();
     public static final Effect REIMBURSEMENT = new EffectReimbursement();
-    public static final Effect OVER_COMPENSATION = new EffectOverCompensation();
+    public static final Effect OVERCOMPENSATION = new EffectOvercompensation();
 
     @ApiStatus.Internal
     public static void registerNewEffect(@NotNull final Effect effect) {

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectOvercompensation.kt

@@ -12,8 +12,8 @@ import org.bukkit.inventory.EnchantingInventory
 import org.bukkit.inventory.ItemStack
 
 
-class EffectOverCompensation : Effect(
-        "over_compensation"
+class EffectOvercompensation : Effect(
+        "overcompensation"
 ) {
     override fun formatDescription(string: String, level: Int): String {
         return string.replace("%chance%", NumberUtils.format(config.getDouble("chance-per-level") * level))
@@ -22,17 +22,11 @@ class EffectOverCompensation : Effect(
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     fun handleLevelling(event: EnchantItemEvent) {
         val player = event.enchanter
-        val cost = event.whichButton()+1
+        val cost = event.whichButton() + 1
 
         val chance = config.getDouble("chance-per-level") * player.getEffectLevel(this)
 
         if (NumberUtils.randFloat(0.0, 100.0) < chance) {
-            Bukkit.getLogger().info("?")
-            Bukkit.getLogger().info(NumberUtils.randFloat(0.0, 100.0).toString())
-            Bukkit.getLogger().info(chance.toString())
-
-
-//            event.isCancelled = true
                 this.plugin.scheduler.runLater({
                     event.inventory.addItem(ItemStack(Material.LAPIS_LAZULI, cost))
                 }, 2)

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

@@ -187,8 +187,8 @@ reimbursement:
 
   # The chance to get experience back, as a percentage
   chance-per-level: 0.5
-over_compensation:
-  description: "&a%chance%%&8 chance to get Lapis Lazuli back after enchanting"
+overcompensation:
+  description: "&a%chance%%&8 chance to get lapis back after enchanting"
 
   # The chance to get experience back, as a percentage
   chance-per-level: 0.75

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

@@ -27,30 +27,44 @@ rewards:
     - "crit_chance::1"
     - "second_chance::1"
     - "reimbursement::1"
-    - "over_compensation::1"
+    - "over_compensation::1:10:100"
 
   # The chat messages to send on level up
   chat-messages:
     1:
-      - "&8» &r&f+2 %ecoskills_wisdom_name%"
-      - "&8» &r&f+1 %ecoskills_crit_chance_name%"
-      - "&8» &r&6Second Chance %ecoskills_second_chance_numeral%"
-      - "   %ecoskills_second_chance_description%"
-      - "&8» &r&6Reimbursement %ecoskills_reimbursement_numeral%"
-      - "   %ecoskills_reimbursement_description%"
-      - "&8» &r&6Over Compensation %ecoskills_over_compensation_numeral%"
-      - "   %ecoskills_over_compensation_description%"
+      - " &8» &r&f+2 %ecoskills_wisdom_name%"
+      - " &8» &r&f+1 %ecoskills_crit_chance_name%"
+      - " &8» &r&6Second Chance %ecoskills_second_chance_numeral%"
+      - "    %ecoskills_second_chance_description%"
+      - " &8» &r&6Reimbursement %ecoskills_reimbursement_numeral%"
+      - "    %ecoskills_reimbursement_description%"
+    10:
+      - " &8» &r&f+2 %ecoskills_wisdom_name%"
+      - " &8» &r&f+1 %ecoskills_crit_chance_name%"
+      - " &8» &r&6Second Chance %ecoskills_second_chance_numeral%"
+      - "    %ecoskills_second_chance_description%"
+      - " &8» &r&6Reimbursement %ecoskills_reimbursement_numeral%"
+      - "    %ecoskills_reimbursement_description%"
+      - " &8» &r&6Over Compensation %ecoskills_over_compensation_numeral%"
+      - "    %ecoskills_over_compensation_description%"
 
   # The lore to show in the levels gui
   progression-lore:
     1:
-      - "&8» &r&f+2 %ecoskills_wisdom_name%"
-      - "&8» &r&f+1 %ecoskills_crit_chance_name%"
-      - "&8» &r&6Second Chance %ecoskills_second_chance_numeral%"
-      - "   %ecoskills_second_chance_description%"
-      - "&8» &r&6Reimbursement %ecoskills_reimbursement_numeral%"
-      - "   %ecoskills_reimbursement_description%"
-      - "&8» &r&6Over Compensation %ecoskills_over_compensation_numeral%"
-      - "   %ecoskills_over_compensation_description%"
+      - " &8» &r&f+2 %ecoskills_wisdom_name%"
+      - " &8» &r&f+1 %ecoskills_crit_chance_name%"
+      - " &8» &r&6Second Chance %ecoskills_second_chance_numeral%"
+      - "    %ecoskills_second_chance_description%"
+      - " &8» &r&6Reimbursement %ecoskills_reimbursement_numeral%"
+      - "    %ecoskills_reimbursement_description%"
+    10:
+      - " &8» &r&f+2 %ecoskills_wisdom_name%"
+      - " &8» &r&f+1 %ecoskills_crit_chance_name%"
+      - " &8» &r&6Second Chance %ecoskills_second_chance_numeral%"
+      - "    %ecoskills_second_chance_description%"
+      - " &8» &r&6Reimbursement %ecoskills_reimbursement_numeral%"
+      - "    %ecoskills_reimbursement_description%"
+      - " &8» &r&6Over Compensation %ecoskills_over_compensation_numeral%"
+      - "    %ecoskills_over_compensation_description%"
 # The experience to give for each level cost of enchanting
 xp-per-level: 4