1.5.26

build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 
 group = 'net.momirealms'
-version = '1.5.25'
+version = '1.5.26.1'
 
 repositories {
     mavenCentral()
@@ -100,8 +100,8 @@ tasks.withType(JavaCompile) {
 }
 
 shadowJar {
-    relocate ('de.tr7zw', 'libs.tr7zw')
+    relocate ('de.tr7zw', 'net.momirealms.customcrops.libs.tr7zw')
-    relocate ('net.kyori', 'libs.kyori')
+    relocate ('net.kyori', 'net.momirealms.customcrops.libs.kyori')
 }
 
 tasks.register("delete", Delete).get().delete("build/libs/"+project.name+"-"+project.version+".jar")

src/main/java/net/momirealms/customcrops/ConfigReader.java

@@ -30,10 +30,7 @@ import net.momirealms.customcrops.fertilizer.RetainingSoil;
 import net.momirealms.customcrops.fertilizer.SpeedGrow;
 import net.momirealms.customcrops.helper.Log;
 import net.momirealms.customcrops.integrations.protection.*;
-import net.momirealms.customcrops.integrations.skill.Aurelium;
+import net.momirealms.customcrops.integrations.skill.*;
-import net.momirealms.customcrops.integrations.skill.MMOCore;
-import net.momirealms.customcrops.integrations.skill.SkillXP;
-import net.momirealms.customcrops.integrations.skill.mcMMO;
 import net.momirealms.customcrops.requirements.Biome;
 import net.momirealms.customcrops.requirements.Permission;
 import net.momirealms.customcrops.requirements.Requirement;
@@ -109,15 +106,10 @@ public class ConfigReader {
         public static double quality_1;
         public static double quality_2;
         public static SkillXP skillXP;
+        public static int version;
 
         public static void loadConfig(){
 
-            try {
-                YamlDocument.create(new File(CustomCrops.instance.getDataFolder(), "config.yml"), CustomCrops.instance.getResource("config.yml"), GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("config-version")).build());
-            }catch (IOException e){
-                Log.warn(e.getMessage());
-            }
-
             //存读基本配置文件
             CustomCrops.instance.saveDefaultConfig();
             CustomCrops.instance.reloadConfig();
@@ -182,6 +174,7 @@ public class ConfigReader {
 
             sprinklerRefill = config.getInt("config.sprinkler-refill",2);
             waterCanRefill = config.getInt("config.water-can-refill",1);
+            version = config.getInt("config-version",1);
             canAddWater = config.getBoolean("config.water-can-add-water-to-sprinkler",true);
 
             if (allWorld){
@@ -297,6 +290,14 @@ public class ConfigReader {
                     AdventureManager.consoleMessage("<gradient:#ff206c:#fdee55>[CustomCrops] </gradient><gold>MMOCore <color:#FFEBCD>Hooked!");
                 }
             }
+            if(config.getBoolean("config.integration.EcoSkills",false)){
+                if(Bukkit.getPluginManager().getPlugin("EcoSkills") == null){
+                    CustomCrops.instance.getLogger().warning("Failed to initialize EcoSkills!");
+                }else {
+                    skillXP = new EcoSkill();
+                    AdventureManager.consoleMessage("<gradient:#ff206c:#fdee55>[CustomCrops] </gradient><gold>EcoSkills <color:#FFEBCD>Hooked!");
+                }
+            }
         }
     }
 

src/main/java/net/momirealms/customcrops/CustomCrops.java

@@ -24,10 +24,7 @@ import net.momirealms.customcrops.datamanager.*;
 import net.momirealms.customcrops.helper.LibraryLoader;
 import net.momirealms.customcrops.listener.*;
 import net.momirealms.customcrops.timer.CropTimer;
-import net.momirealms.customcrops.utils.AdventureManager;
+import net.momirealms.customcrops.utils.*;
-import net.momirealms.customcrops.utils.BackUp;
-import net.momirealms.customcrops.utils.HoloUtil;
-import net.momirealms.customcrops.utils.Placeholders;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -64,16 +61,11 @@ public final class CustomCrops extends JavaPlugin {
 
     @Override
     public void onEnable() {
-
         plugin = this;
-
         instance = this;
         adventure = BukkitAudiences.create(instance);
-
         AdventureManager.consoleMessage("<gradient:#ff206c:#fdee55>[CustomCrops] </gradient><color:#FFEBCD>Running on " + Bukkit.getVersion());
-
         ConfigReader.ReloadConfig();
-
         if(Bukkit.getPluginManager().getPlugin("PlaceHolderAPI") != null){
             placeholders = new Placeholders();
             placeholders.register();
@@ -96,7 +88,6 @@ public final class CustomCrops extends JavaPlugin {
             this.seasonManager = new SeasonManager();
             this.seasonManager.loadData();
         }
-
         this.cropManager = new CropManager();
         this.cropManager.loadData();
         this.sprinklerManager = new SprinklerManager();
@@ -104,9 +95,10 @@ public final class CustomCrops extends JavaPlugin {
         this.potManager = new PotManager();
         this.potManager.loadData();
         this.cropTimer = new CropTimer(this);
-
         checkIAConfig();
-
+        if (ConfigReader.Config.version != 1){
+            UpdateConfig.update();
+        }
         AdventureManager.consoleMessage("<gradient:#ff206c:#fdee55>[CustomCrops] </gradient><color:#F5DEB3>Plugin Enabled!");
     }
 

src/main/java/net/momirealms/customcrops/integrations/skill/EcoSkill.java

@@ -0,0 +1,13 @@
+package net.momirealms.customcrops.integrations.skill;
+
+import com.willfp.ecoskills.api.EcoSkillsAPI;
+import com.willfp.ecoskills.skills.Skills;
+import org.bukkit.entity.Player;
+
+public class EcoSkill implements SkillXP{
+
+    @Override
+    public void addXp(Player player, double amount) {
+        EcoSkillsAPI.getInstance().giveSkillExperience(player, Skills.FARMING, amount);
+    }
+}

src/main/java/net/momirealms/customcrops/utils/UpdateConfig.java

@@ -0,0 +1,24 @@
+package net.momirealms.customcrops.utils;
+
+import dev.dejvokep.boostedyaml.YamlDocument;
+import dev.dejvokep.boostedyaml.dvs.versioning.BasicVersioning;
+import dev.dejvokep.boostedyaml.settings.dumper.DumperSettings;
+import dev.dejvokep.boostedyaml.settings.general.GeneralSettings;
+import dev.dejvokep.boostedyaml.settings.loader.LoaderSettings;
+import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings;
+import net.momirealms.customcrops.CustomCrops;
+import net.momirealms.customcrops.helper.Log;
+
+import java.io.File;
+import java.io.IOException;
+
+public class UpdateConfig {
+
+    public static void update(){
+        try {
+            YamlDocument.create(new File(CustomCrops.instance.getDataFolder(), "config.yml"), CustomCrops.instance.getResource("config.yml"), GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("config-version")).build());
+        }catch (IOException e){
+            Log.warn(e.getMessage());
+        }
+    }
+}

src/main/resources/config.yml

@@ -19,6 +19,7 @@ config:
     AureliumSkills: false
     mcMMO: false
     MMOCore: false
+    EcoSkills: false
   #=============================================================#
   #Mode 1:
   #  Crops in loaded chunks will grow

src/main/resources/plugin.yml

@@ -19,6 +19,7 @@ softdepend:
   - mcMMO
   - AureliumSkills
   - MMOCore
+  - EcoSkills
 commands:
   customcrops:
     usage: /customcrops <args>

src/main/resources/zh-cn/config.yml

@@ -14,6 +14,7 @@ config:
     AureliumSkills: false
     mcMMO: false
     MMOCore: false
+    EcoSkills: false
 
   #生长时间点(tick)
   #1000代表上午7点，农作物陆续开始生长