From 3a8fb364fed96508db65d7e2371cc636a9988b9f Mon Sep 17 00:00:00 2001
From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Sat, 7 Sep 2024 00:16:25 +0800
Subject: [PATCH] Update default configs

---
 .../net/momirealms/customcrops/api/core/ConfigManager.java    | 2 +-
 .../customcrops/bukkit/action/BlockActionManager.java         | 2 +-
 .../customcrops/bukkit/config/BukkitConfigManager.java        | 4 ++--
 plugin/src/main/resources/contents/crops/default.yml          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/net/momirealms/customcrops/api/core/ConfigManager.java b/api/src/main/java/net/momirealms/customcrops/api/core/ConfigManager.java
index 5598718..55f3981 100644
--- a/api/src/main/java/net/momirealms/customcrops/api/core/ConfigManager.java
+++ b/api/src/main/java/net/momirealms/customcrops/api/core/ConfigManager.java
@@ -484,7 +484,7 @@ public abstract class ConfigManager implements ConfigLoader, Reloadable {
                 new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))) {
             String finalStr = sb.toString();
             if (!hasNamespace) {
-                finalStr = finalStr.replace("CHORUS", "TRIPWIRE").replace("<font:customcrops:default>", "<font:minecraft:customcrops>");
+                finalStr = finalStr.replace("<font:customcrops:default>", "<font:minecraft:customcrops>");
             }
             writer.write(finalStr.replace("{0}", hasNamespace ? "customcrops:" : ""));
         } catch (IOException e) {
diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/BlockActionManager.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/BlockActionManager.java
index 13d7e9a..a4efd6e 100644
--- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/BlockActionManager.java
+++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/BlockActionManager.java
@@ -67,7 +67,7 @@ public class BlockActionManager extends AbstractActionManager<CustomCropsBlockSt
                     if (entry.getValue() instanceof Section inner) {
                         VariationData variationData = new VariationData(
                                 inner.getString("item"),
-                                CustomForm.valueOf(inner.getString("type", "TripWire").toUpperCase(Locale.ENGLISH)).existenceForm(),
+                                CustomForm.valueOf(inner.getString("type", "BLOCK").toUpperCase(Locale.ENGLISH)).existenceForm(),
                                 inner.getDouble("chance")
                         );
                         variationDataList.add(variationData);
diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/config/BukkitConfigManager.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/config/BukkitConfigManager.java
index 248ba43..83f7884 100644
--- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/config/BukkitConfigManager.java
+++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/config/BukkitConfigManager.java
@@ -119,13 +119,13 @@ public class BukkitConfigManager extends ConfigManager {
 
         enableScarecrow = config.getBoolean("mechanics.scarecrow.enable", true);
         scarecrow = new HashSet<>(ListUtils.toList(config.get("mechanics.scarecrow.id")));
-        scarecrowExistenceForm = CustomForm.valueOf(config.getString("mechanics.scarecrow.type", "ITEM_FRAME")).existenceForm();
+        scarecrowExistenceForm = CustomForm.valueOf(config.getString("mechanics.scarecrow.type", "FURNITURE")).existenceForm();
         scarecrowRange = config.getInt("mechanics.scarecrow.range", 7);
         scarecrowProtectChunk = config.getBoolean("mechanics.scarecrow.protect-chunk", false);
 
         enableGreenhouse = config.getBoolean("mechanics.greenhouse.enable", true);
         greenhouse = new HashSet<>(ListUtils.toList(config.get("mechanics.greenhouse.id")));
-        greenhouseExistenceForm = CustomForm.valueOf(config.getString("mechanics.greenhouse.type", "CHORUS")).existenceForm();
+        greenhouseExistenceForm = CustomForm.valueOf(config.getString("mechanics.greenhouse.type", "BLOCK")).existenceForm();
         greenhouseRange = config.getInt("mechanics.greenhouse.range", 5);
 
         syncSeasons = config.getBoolean("mechanics.sync-season.enable", false);
diff --git a/plugin/src/main/resources/contents/crops/default.yml b/plugin/src/main/resources/contents/crops/default.yml
index 1f69aa9..058418b 100644
--- a/plugin/src/main/resources/contents/crops/default.yml
+++ b/plugin/src/main/resources/contents/crops/default.yml
@@ -129,7 +129,7 @@ tomato:
             value:
               golden:
                 item: {0}tomato_stage_golden
-                type: TRIPWIRE
+                type: BLOCK
                 chance: 0.01
         break:
           # 100% chance to drop 1-2 tomato seeds when broken
@@ -160,7 +160,7 @@ tomato:
             value:
               gigantic:
                 item: {0}gigantic_tomato
-                type: CHORUS
+                type: BLOCK
                 chance: 0.02
     # Special configuration for a non-standard growth stage (e.g., rare or unique crops)
     99: