diff --git a/.gitignore b/.gitignore index 4788b4b..27d5dde 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ out/ *.ctxt # Package Files # -*.jar *.war *.nar *.ear diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/libs/AureliumSkills-Beta1.3.6.jar b/libs/AureliumSkills-Beta1.3.6.jar deleted file mode 100644 index ed284b9..0000000 Binary files a/libs/AureliumSkills-Beta1.3.6.jar and /dev/null differ diff --git a/libs/CrashClaim(premium).txt b/libs/CrashClaim(premium).txt deleted file mode 100644 index 45efd59..0000000 --- a/libs/CrashClaim(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/crashclaim-claiming-plugin.94037/ \ No newline at end of file diff --git a/libs/EcoSkills(premium).txt b/libs/EcoSkills(premium).txt deleted file mode 100644 index 5f772a4..0000000 --- a/libs/EcoSkills(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/ecoskills-%E2%AD%95-addictive-mmorpg-progression-%E2%9C%85-create-custom-effects-%E2%9C%A8-levelling-stats.95541/ \ No newline at end of file diff --git a/libs/KingdomsX(premium).txt b/libs/KingdomsX(premium).txt deleted file mode 100644 index 48ec51a..0000000 --- a/libs/KingdomsX(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/kingdomsx.77670/ \ No newline at end of file diff --git a/libs/Lands(premium).txt b/libs/Lands(premium).txt deleted file mode 100644 index 6d3bff5..0000000 --- a/libs/Lands(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/lands-land-claim-plugin-grief-prevention-protection-gui-management-nations-wars-1-19-support.53313/ \ No newline at end of file diff --git a/libs/MMOCore(premium).txt b/libs/MMOCore(premium).txt deleted file mode 100644 index ecc7e8f..0000000 --- a/libs/MMOCore(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/mmocore.70575/ \ No newline at end of file diff --git a/libs/MythicLib-1.3.31.jar b/libs/MythicLib-1.3.31.jar deleted file mode 100644 index a0ce58f..0000000 Binary files a/libs/MythicLib-1.3.31.jar and /dev/null differ diff --git a/libs/Oraxen(premium).txt b/libs/Oraxen(premium).txt deleted file mode 100644 index 399f3be..0000000 --- a/libs/Oraxen(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/%E2%9C%85-10-%E2%98%84%EF%B8%8F-oraxen-add-items-blocks-armors-hats-food-furnitures-plants-and-gui.72448/ \ No newline at end of file diff --git a/libs/PlotSquared(premium).txt b/libs/PlotSquared(premium).txt deleted file mode 100644 index d39ac33..0000000 --- a/libs/PlotSquared(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/plotsquared-v4-v6-out-now.1177/ \ No newline at end of file diff --git a/libs/RealisticSeasons(premium).txt b/libs/RealisticSeasons(premium).txt deleted file mode 100644 index 3cd2f5c..0000000 --- a/libs/RealisticSeasons(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/realisticseasons-1-16-3-1-19-2-seasons-in-your-minecraft-world-with-temperature-and-calendar.93275/ \ No newline at end of file diff --git a/libs/Residence(premium).txt b/libs/Residence(premium).txt deleted file mode 100644 index c8d65c1..0000000 --- a/libs/Residence(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/residence-1-7-10-up-to-1-19.11480/ \ No newline at end of file diff --git a/libs/libs.jar b/libs/libs.jar new file mode 100644 index 0000000..2257458 Binary files /dev/null and b/libs/libs.jar differ diff --git a/libs/mcMMO(premium).txt b/libs/mcMMO(premium).txt deleted file mode 100644 index d94417c..0000000 --- a/libs/mcMMO(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/official-mcmmo-original-author-returns.64348/ \ No newline at end of file diff --git a/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java b/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java index 016a1d9..b95dcab 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java @@ -22,7 +22,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; -import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WateringCanFillEvent extends PlayerEvent implements Cancellable { diff --git a/src/main/java/net/momirealms/customcrops/integrations/customplugin/itemsadder/ItemsAdderFrameHandler.java b/src/main/java/net/momirealms/customcrops/integrations/customplugin/itemsadder/ItemsAdderFrameHandler.java index 4b073ec..2316bd9 100644 --- a/src/main/java/net/momirealms/customcrops/integrations/customplugin/itemsadder/ItemsAdderFrameHandler.java +++ b/src/main/java/net/momirealms/customcrops/integrations/customplugin/itemsadder/ItemsAdderFrameHandler.java @@ -24,7 +24,6 @@ import dev.lone.itemsadder.api.Events.CustomBlockBreakEvent; import dev.lone.itemsadder.api.Events.FurnitureBreakEvent; import dev.lone.itemsadder.api.Events.FurnitureInteractEvent; import net.momirealms.customcrops.api.crop.Crop; -import net.momirealms.customcrops.api.event.PreActionEvent; import net.momirealms.customcrops.config.BasicItemConfig; import net.momirealms.customcrops.config.MainConfig; import net.momirealms.customcrops.config.SoundConfig; @@ -34,7 +33,6 @@ import net.momirealms.customcrops.managers.CropManager; import net.momirealms.customcrops.objects.Sprinkler; import net.momirealms.customcrops.utils.AdventureUtil; import net.momirealms.customcrops.utils.FurnitureUtil; -import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenFrameHandler.java b/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenFrameHandler.java index 2dfc315..96ea570 100644 --- a/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenFrameHandler.java +++ b/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenFrameHandler.java @@ -32,9 +32,7 @@ import net.momirealms.customcrops.config.SoundConfig; import net.momirealms.customcrops.config.SprinklerConfig; import net.momirealms.customcrops.integrations.AntiGrief; import net.momirealms.customcrops.managers.CropManager; -import net.momirealms.customcrops.managers.CustomWorld; import net.momirealms.customcrops.objects.Sprinkler; -import net.momirealms.customcrops.objects.fertilizer.Fertilizer; import net.momirealms.customcrops.utils.AdventureUtil; import net.momirealms.customcrops.utils.FurnitureUtil; import org.bukkit.GameMode; diff --git a/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenWireHandler.java b/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenWireHandler.java index 19f320c..59adffd 100644 --- a/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenWireHandler.java +++ b/src/main/java/net/momirealms/customcrops/integrations/customplugin/oraxen/OraxenWireHandler.java @@ -30,9 +30,7 @@ import net.momirealms.customcrops.config.SoundConfig; import net.momirealms.customcrops.config.SprinklerConfig; import net.momirealms.customcrops.integrations.AntiGrief; import net.momirealms.customcrops.managers.CropManager; -import net.momirealms.customcrops.managers.CustomWorld; import net.momirealms.customcrops.objects.Sprinkler; -import net.momirealms.customcrops.objects.fertilizer.Fertilizer; import net.momirealms.customcrops.utils.AdventureUtil; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java b/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java index 18deefb..5bb5751 100644 --- a/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java +++ b/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java @@ -87,11 +87,13 @@ public class CustomWorld { public void unload(boolean sync) { if (sync) { unloadData(); + unloadSeason(); backUp(); } else { Bukkit.getScheduler().runTaskAsynchronously(CustomCrops.plugin, () -> { unloadData(); + unloadSeason(); backUp(); Bukkit.getScheduler().runTask(CustomCrops.plugin, () -> { CustomWorldEvent customWorldEvent = new CustomWorldEvent(world, WorldState.UNLOAD); @@ -111,7 +113,6 @@ public class CustomWorld { } public void unloadData() { - unloadSeason(); unloadCrop(); unloadSprinkler(); unloadFertilizer(); @@ -131,17 +132,11 @@ public class CustomWorld { if (!MainConfig.autoBackUp) return; Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss"); - try { - File file = new File(CustomCrops.plugin.getDataFolder().getParentFile().getParentFile(), MainConfig.worldFolder + world.getName() + File.separator + "customcrops_data"); - File[] files = file.listFiles(); - if (files == null) return; - for (File data : files) { - FileUtils.copyFileToDirectory(data, new File(CustomCrops.plugin.getDataFolder(), "backup" + File.separator + world.getName() + "_" + format.format(date))); - } - } - catch (IOException e){ - e.printStackTrace(); - AdventureUtil.consoleMessage("[CustomCrops] Error! Failed to back up data for "); + File file = new File(CustomCrops.plugin.getDataFolder().getParentFile().getParentFile(), MainConfig.worldFolder + world.getName() + File.separator + "customcrops_data"); + File[] files = file.listFiles(); + if (files == null) return; + for (File data : files) { + FileUtils.copyFileToDirectory(data, new File(CustomCrops.plugin.getDataFolder(), "backup" + File.separator + world.getName() + "_" + format.format(date))); } } diff --git a/src/main/java/net/momirealms/customcrops/managers/timer/CrowTask.java b/src/main/java/net/momirealms/customcrops/managers/timer/CrowTask.java index 66afbb2..b6e0aa1 100644 --- a/src/main/java/net/momirealms/customcrops/managers/timer/CrowTask.java +++ b/src/main/java/net/momirealms/customcrops/managers/timer/CrowTask.java @@ -37,7 +37,7 @@ public class CrowTask extends BukkitRunnable { private final Vector vectorUp; private final Location from; private final Player player; - private float yaw; + private final float yaw; public CrowTask(Player player, Location crop, ArmorStandUtil armorStandUtil) {