From 50f8a37d8bc4b35e15934e8050f5f85ed0be1e65 Mon Sep 17 00:00:00 2001
From: alexcrea <42614139+alexcrea@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:29:45 +0200
Subject: [PATCH] Fix default density item value being 1 instead of 2

---
 .../alexcrea/cuanvil/update/Update_1_21.java  | 12 ++++-----
 .../cuanvil/update/plugin/PUpdate_1_6_7.java  | 27 +++++++++++++++++++
 .../cuanvil/update/plugin/PluginUpdates.java  |  7 ++++-
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/xyz/alexcrea/cuanvil/update/plugin/PUpdate_1_6_7.java

diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java b/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java
index af21989..8180b07 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java
@@ -69,14 +69,14 @@ public class Update_1_21 {
         baseConfig.set("enchant_limits.minecraft:wind_burst", 3);
 
         // Add enchant values
-        baseConfig.set("enchant_values.density.item", 1);
-        baseConfig.set("enchant_values.density.book", 1);
+        baseConfig.set("enchant_values.minecraft:density.item", 2);
+        baseConfig.set("enchant_values.minecraft:density.book", 1);
 
-        baseConfig.set("enchant_values.breach.item", 4);
-        baseConfig.set("enchant_values.breach.book", 2);
+        baseConfig.set("enchant_values.minecraft:breach.item", 4);
+        baseConfig.set("enchant_values.minecraft:breach.book", 2);
 
-        baseConfig.set("enchant_values.wind_burst.item", 4);
-        baseConfig.set("enchant_values.wind_burst.book", 2);
+        baseConfig.set("enchant_values.minecraft:wind_burst.item", 4);
+        baseConfig.set("enchant_values.minecraft:wind_burst.book", 2);
 
         // Add unit repair for mace
         unitConfig.set("breeze_rod.mace", 0.25);
diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PUpdate_1_6_7.java b/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PUpdate_1_6_7.java
new file mode 100644
index 0000000..f77bced
--- /dev/null
+++ b/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PUpdate_1_6_7.java
@@ -0,0 +1,27 @@
+package xyz.alexcrea.cuanvil.update.plugin;
+
+import org.bukkit.configuration.file.FileConfiguration;
+import xyz.alexcrea.cuanvil.config.ConfigHolder;
+
+import javax.annotation.Nonnull;
+import java.util.Set;
+
+public class PUpdate_1_6_7 {
+
+    public static void handleUpdate(@Nonnull Set<ConfigHolder> toSave) {
+        FileConfiguration config = ConfigHolder.DEFAULT_CONFIG.getConfig();
+
+        // We fix the density enchantment
+        String value = config.getString("enchant_values.minecraft:density.item");
+        if(value == null) value = config.getString("enchant_values.density.item");
+
+        if(value == null || "1".equalsIgnoreCase(value)){
+            config.set("enchant_values.minecraft:density.item", 2);
+
+            toSave.add(ConfigHolder.DEFAULT_CONFIG);
+        }
+
+
+    }
+
+}
diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java b/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java
index cc0901b..2069b03 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java
@@ -21,7 +21,12 @@ public class PluginUpdates {
         if(new Version(1, 6, 2).greaterThan(current)){
             PUpdate_1_6_2.handleUpdate(toSave);
 
-            finishConfiguration("1.6.2", toSave);
+            // We assume 1.6.7 will run. TODO a better system instead of that I guess
+        }
+        if(new Version(1, 6, 7).greaterThan(current)){
+            PUpdate_1_6_7.handleUpdate(toSave);
+
+            finishConfiguration("1.6.7", toSave);
         }
 
     }