From 73e6b4a3caa3bc35119dcb895ca2dfbba7f1a177 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Wed, 3 Jan 2024 18:21:07 +0800 Subject: [PATCH] fix scheduler and browser on linux --- build.gradle.kts | 2 +- .../momirealms/customfishing/gui/icon/BackToFolderItem.java | 4 ++-- .../momirealms/customfishing/gui/page/file/FileSelector.java | 4 ++-- .../customfishing/scheduler/FoliaSchedulerImpl.java | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 19c055c4..a340c4f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { - version = "2.0.10" + version = "2.0.10.2" apply() apply(plugin = "java") diff --git a/plugin/src/main/java/net/momirealms/customfishing/gui/icon/BackToFolderItem.java b/plugin/src/main/java/net/momirealms/customfishing/gui/icon/BackToFolderItem.java index f2627e6b..dad6a4e1 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/gui/icon/BackToFolderItem.java +++ b/plugin/src/main/java/net/momirealms/customfishing/gui/icon/BackToFolderItem.java @@ -44,7 +44,7 @@ public class BackToFolderItem extends AbstractItem implements Icon { @Override public ItemProvider getItemProvider() { - if (file != null && file.getPath().startsWith("plugins\\CustomFishing\\contents")) { + if (file != null && (file.getPath().startsWith("plugins\\CustomFishing\\contents") || file.getPath().startsWith("plugins/CustomFishing/contents"))) { return new ItemBuilder(Material.ORANGE_STAINED_GLASS_PANE) .setDisplayName(new ShadedAdventureComponentWrapper(AdventureManagerImpl.getInstance().getComponentFromMiniMessage( CFLocale.GUI_BACK_TO_PARENT_FOLDER @@ -59,7 +59,7 @@ public class BackToFolderItem extends AbstractItem implements Icon { @Override public void handleClick(@NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) { - if (file != null && file.getPath().startsWith("plugins\\CustomFishing\\contents")) + if (file != null && (file.getPath().startsWith("plugins\\CustomFishing\\contents") || file.getPath().startsWith("plugins/CustomFishing/contents"))) new FileSelector(player, file); } } diff --git a/plugin/src/main/java/net/momirealms/customfishing/gui/page/file/FileSelector.java b/plugin/src/main/java/net/momirealms/customfishing/gui/page/file/FileSelector.java index a7cf320d..25b1c6f9 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/gui/page/file/FileSelector.java +++ b/plugin/src/main/java/net/momirealms/customfishing/gui/page/file/FileSelector.java @@ -56,7 +56,7 @@ public class FileSelector { if (file.isFile() && file.getName().endsWith(".yml")) { items.addLast(new FileItem(file)); } else if (file.isDirectory()) { - String path = file.getPath(); + String path = file.getPath().replace("/", "\\"); String[] split = path.split("\\\\"); String type = split[3]; switch (type) { @@ -117,7 +117,7 @@ public class FileSelector { @Override public void handleClick(@NotNull ClickType clickType, @NotNull Player player, @NotNull InventoryClickEvent event) { - String path = file.getPath(); + String path = file.getPath().replace("/", "\\"); String[] split = path.split("\\\\"); String type = split[3]; switch (type) { diff --git a/plugin/src/main/java/net/momirealms/customfishing/scheduler/FoliaSchedulerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/scheduler/FoliaSchedulerImpl.java index 1450ca05..01540973 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/scheduler/FoliaSchedulerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/scheduler/FoliaSchedulerImpl.java @@ -72,6 +72,9 @@ public class FoliaSchedulerImpl implements SyncScheduler { */ @Override public CancellableTask runTaskSyncLater(Runnable runnable, Location location, long delay) { + if (delay == 0) { + return new FoliaSchedulerImpl.FoliaCancellableTask(Bukkit.getRegionScheduler().run(plugin, location, (scheduledTask -> runnable.run()))); + } return new FoliaCancellableTask(Bukkit.getRegionScheduler().runDelayed(plugin, location, (scheduledTask -> runnable.run()), delay)); }