From 0a4946c7a84b4c187031ba9210bad186776ccae1 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Sat, 14 Sep 2024 18:29:10 +0800 Subject: [PATCH] Fixed using the wrong plugin instance --- .../api/BukkitCustomCropsPlugin.java | 16 +++++++-------- .../customcrops/api/misc/HologramManager.java | 2 +- .../api/misc/cooldown/CoolDownManager.java | 2 +- .../integration/quest/BattlePassQuest.java | 2 +- .../integration/quest/ClueScrollsQuest.java | 8 ++++---- .../worldedit/WorldEditListener.java | 2 +- .../bukkit/BukkitCustomCropsPluginImpl.java | 20 +++++++++---------- .../bukkit/command/BukkitCommandManager.java | 2 +- .../command/feature/DebugInsightCommand.java | 8 ++++---- .../bukkit/config/BukkitConfigManager.java | 2 +- .../adaptor/BukkitWorldAdaptor.java | 2 +- .../bukkit/item/BukkitItemManager.java | 2 +- .../scheduler/BukkitSchedulerAdapter.java | 4 ++-- .../bukkit/sender/BukkitSenderFactory.java | 4 ++-- .../bukkit/world/BukkitWorldManager.java | 2 +- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/api/src/main/java/net/momirealms/customcrops/api/BukkitCustomCropsPlugin.java b/api/src/main/java/net/momirealms/customcrops/api/BukkitCustomCropsPlugin.java index d1c674f..b3df232 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/BukkitCustomCropsPlugin.java +++ b/api/src/main/java/net/momirealms/customcrops/api/BukkitCustomCropsPlugin.java @@ -46,7 +46,7 @@ import java.util.function.Supplier; public abstract class BukkitCustomCropsPlugin implements CustomCropsPlugin { private static BukkitCustomCropsPlugin instance; - private final Plugin boostrap; + private final Plugin bootstrap; protected static boolean isReloading = false; protected AbstractJavaScheduler scheduler; @@ -67,13 +67,13 @@ public abstract class BukkitCustomCropsPlugin implements CustomCropsPlugin { /** * Constructs a new BukkitCustomCropsPlugin instance. * - * @param boostrap the plugin instance used to initialize this class + * @param bootstrap the plugin instance used to initialize this class */ - public BukkitCustomCropsPlugin(Plugin boostrap) { - if (!boostrap.getName().equals("CustomCrops")) { + public BukkitCustomCropsPlugin(Plugin bootstrap) { + if (!bootstrap.getName().equals("CustomCrops")) { throw new IllegalArgumentException("CustomCrops plugin requires custom crops plugin"); } - this.boostrap = boostrap; + this.bootstrap = bootstrap; instance = this; } @@ -95,8 +95,8 @@ public abstract class BukkitCustomCropsPlugin implements CustomCropsPlugin { * * @return the {@link Plugin} instance */ - public Plugin getBoostrap() { - return boostrap; + public Plugin getBootstrap() { + return bootstrap; } /** @@ -260,7 +260,7 @@ public abstract class BukkitCustomCropsPlugin implements CustomCropsPlugin { * @return the data folder as a {@link File} */ public File getDataFolder() { - return boostrap.getDataFolder(); + return bootstrap.getDataFolder(); } /** diff --git a/api/src/main/java/net/momirealms/customcrops/api/misc/HologramManager.java b/api/src/main/java/net/momirealms/customcrops/api/misc/HologramManager.java index 293499e..8bfd60e 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/misc/HologramManager.java +++ b/api/src/main/java/net/momirealms/customcrops/api/misc/HologramManager.java @@ -58,7 +58,7 @@ public class HologramManager implements Listener, Reloadable { @Override public void load() { - Bukkit.getPluginManager().registerEvents(this, plugin.getBoostrap()); + Bukkit.getPluginManager().registerEvents(this, plugin.getBootstrap()); this.cacheCheckTask = plugin.getScheduler().asyncRepeating(() -> { ArrayList removed = new ArrayList<>(); long current = System.currentTimeMillis(); diff --git a/api/src/main/java/net/momirealms/customcrops/api/misc/cooldown/CoolDownManager.java b/api/src/main/java/net/momirealms/customcrops/api/misc/cooldown/CoolDownManager.java index 5d23652..ceb3318 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/misc/cooldown/CoolDownManager.java +++ b/api/src/main/java/net/momirealms/customcrops/api/misc/cooldown/CoolDownManager.java @@ -60,7 +60,7 @@ public class CoolDownManager implements Listener, Reloadable { @Override public void load() { - Bukkit.getPluginManager().registerEvents(this, plugin.getBoostrap()); + Bukkit.getPluginManager().registerEvents(this, plugin.getBootstrap()); } @Override diff --git a/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/BattlePassQuest.java b/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/BattlePassQuest.java index a8058a8..757103a 100644 --- a/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/BattlePassQuest.java +++ b/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/BattlePassQuest.java @@ -34,7 +34,7 @@ import org.bukkit.plugin.java.JavaPlugin; public class BattlePassQuest implements Listener { public BattlePassQuest() { - Bukkit.getPluginManager().registerEvents(this, BukkitCustomCropsPlugin.getInstance().getBoostrap()); + Bukkit.getPluginManager().registerEvents(this, BukkitCustomCropsPlugin.getInstance().getBootstrap()); } public void register() { diff --git a/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/ClueScrollsQuest.java b/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/ClueScrollsQuest.java index 153fc5f..83ba944 100644 --- a/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/ClueScrollsQuest.java +++ b/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/quest/ClueScrollsQuest.java @@ -18,9 +18,9 @@ package net.momirealms.customcrops.bukkit.integration.quest; import com.electro2560.dev.cluescrolls.api.*; +import net.momirealms.customcrops.api.BukkitCustomCropsPlugin; import net.momirealms.customcrops.api.event.CropBreakEvent; import net.momirealms.customcrops.api.event.CropPlantEvent; -import net.momirealms.customfishing.api.BukkitCustomFishingPlugin; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -32,12 +32,12 @@ public class ClueScrollsQuest implements Listener { private final CustomClue plantClue; public ClueScrollsQuest() { - harvestClue = ClueScrollsAPI.getInstance().registerCustomClue(BukkitCustomFishingPlugin.getInstance().getBoostrap(), "harvest", new ClueConfigData("id", DataType.STRING)); - plantClue = ClueScrollsAPI.getInstance().registerCustomClue(BukkitCustomFishingPlugin.getInstance().getBoostrap(), "plant", new ClueConfigData("id", DataType.STRING)); + harvestClue = ClueScrollsAPI.getInstance().registerCustomClue(BukkitCustomCropsPlugin.getInstance().getBootstrap(), "harvest", new ClueConfigData("id", DataType.STRING)); + plantClue = ClueScrollsAPI.getInstance().registerCustomClue(BukkitCustomCropsPlugin.getInstance().getBootstrap(), "plant", new ClueConfigData("id", DataType.STRING)); } public void register() { - Bukkit.getPluginManager().registerEvents(this, BukkitCustomFishingPlugin.getInstance().getBoostrap()); + Bukkit.getPluginManager().registerEvents(this, BukkitCustomCropsPlugin.getInstance().getBootstrap()); } @EventHandler (ignoreCancelled = true) diff --git a/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/worldedit/WorldEditListener.java b/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/worldedit/WorldEditListener.java index d07e453..25f24e4 100644 --- a/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/worldedit/WorldEditListener.java +++ b/compatibility/src/main/java/net/momirealms/customcrops/bukkit/integration/worldedit/WorldEditListener.java @@ -77,7 +77,7 @@ public class WorldEditListener implements Reloadable, Listener { @Override public void load() { WorldEdit.getInstance().getEventBus().register(this); - Bukkit.getPluginManager().registerEvents(this, BukkitCustomCropsPlugin.getInstance().getBoostrap()); + Bukkit.getPluginManager().registerEvents(this, BukkitCustomCropsPlugin.getInstance().getBootstrap()); } @Subscribe(priority = EventHandler.Priority.LATE) diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java index 416114c..173352b 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java @@ -81,11 +81,11 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin { private String user = "%%__USER__%%"; private String username = "%%__USERNAME__%%"; - public BukkitCustomCropsPluginImpl(Plugin boostrap) { - super(boostrap); + public BukkitCustomCropsPluginImpl(Plugin bootstrap) { + super(bootstrap); VersionHelper.init(getServerVersion()); this.scheduler = new BukkitSchedulerAdapter(this); - this.logger = new JavaPluginLogger(getBoostrap().getLogger()); + this.logger = new JavaPluginLogger(getBootstrap().getLogger()); this.classPathAppender = new ReflectionClassPathAppender(this); this.dependencyManager = new DependencyManagerImpl(this); this.registryAccess = SimpleRegistryAccess.getInstance(); @@ -105,7 +105,7 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin { @Override public InputStream getResourceStream(String filePath) { - return getBoostrap().getResource(filePath); + return getBootstrap().getResource(filePath); } @Override @@ -120,7 +120,7 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin { @Override public Path getDataDirectory() { - return getBoostrap().getDataFolder().toPath().toAbsolutePath(); + return getBootstrap().getDataFolder().toPath().toAbsolutePath(); } @Override @@ -131,7 +131,7 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin { @SuppressWarnings("deprecation") @Override public String getPluginVersion() { - return getBoostrap().getDescription().getVersion(); + return getBootstrap().getDescription().getVersion(); } @Override @@ -174,7 +174,7 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin { boolean downloadFromBBB = buildByBit.equals("true"); this.reload(); - if (ConfigManager.metrics()) new Metrics((JavaPlugin) getBoostrap(), 16593); + if (ConfigManager.metrics()) new Metrics((JavaPlugin) getBootstrap(), 16593); if (ConfigManager.checkUpdate()) { VersionHelper.UPDATE_CHECKER.apply(this).thenAccept(result -> { String link; @@ -197,14 +197,14 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin { ((SimpleRegistryAccess) registryAccess).freeze(); logger.info("Registry access has been frozen"); EventUtils.fireAndForget(new CustomCropsReloadEvent(this)); - ((BukkitItemManager) itemManager).setAntiGriefLib(AntiGriefLib.builder((JavaPlugin) getBoostrap()).silentLogs(true).ignoreOP(true).build()); + ((BukkitItemManager) itemManager).setAntiGriefLib(AntiGriefLib.builder((JavaPlugin) getBootstrap()).silentLogs(true).ignoreOP(true).build()); }; // delayed init task if (VersionHelper.isFolia()) { - Bukkit.getGlobalRegionScheduler().run(getBoostrap(), (scheduledTask) -> delayedInitTask.run()); + Bukkit.getGlobalRegionScheduler().run(getBootstrap(), (scheduledTask) -> delayedInitTask.run()); } else { - Bukkit.getScheduler().runTask(getBoostrap(), delayedInitTask); + Bukkit.getScheduler().runTask(getBootstrap(), delayedInitTask); } } diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/BukkitCommandManager.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/BukkitCommandManager.java index 0dd0c38..41b5666 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/BukkitCommandManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/BukkitCommandManager.java @@ -50,7 +50,7 @@ public class BukkitCommandManager extends AbstractCommandManager public BukkitCommandManager(BukkitCustomCropsPlugin plugin) { super(plugin, new LegacyPaperCommandManager<>( - plugin.getBoostrap(), + plugin.getBootstrap(), ExecutionCoordinator.simpleCoordinator(), SenderMapper.identity() )); diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/feature/DebugInsightCommand.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/feature/DebugInsightCommand.java index c54b151..7cbc288 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/feature/DebugInsightCommand.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/command/feature/DebugInsightCommand.java @@ -58,12 +58,12 @@ public class DebugInsightCommand extends BukkitCommandFeature imp BukkitCustomCropsPlugin plugin = BukkitCustomCropsPlugin.getInstance(); Player player = context.sender(); if (player.hasMetadata("customcrops:insight")) { - player.removeMetadata("customcrops:insight", plugin.getBoostrap()); + player.removeMetadata("customcrops:insight", plugin.getBootstrap()); plugin.getSenderFactory().wrap(player).sendMessage(AdventureHelper.miniMessage("Insight mode: OFF")); return; } - player.setMetadata("customcrops:insight", new FixedMetadataValue(plugin.getBoostrap(), 1)); + player.setMetadata("customcrops:insight", new FixedMetadataValue(plugin.getBootstrap(), 1)); new InsightPlayer(player.getUniqueId()); plugin.getSenderFactory().wrap(player).sendMessage(AdventureHelper.miniMessage("Insight mode: ON")); plugin.getSenderFactory().wrap(player).sendMessage(AdventureHelper.miniMessage("Note that this only shows a snapshot of the data.")); @@ -82,13 +82,13 @@ public class DebugInsightCommand extends BukkitCommandFeature imp @Override public void registerRelatedFunctions() { - Bukkit.getPluginManager().registerEvents(this, BukkitCustomCropsPlugin.getInstance().getBoostrap()); + Bukkit.getPluginManager().registerEvents(this, BukkitCustomCropsPlugin.getInstance().getBootstrap()); } @EventHandler public void onQuit(PlayerQuitEvent event) { Player player = event.getPlayer(); - player.removeMetadata("customcrops:insight", BukkitCustomCropsPlugin.getInstance().getBoostrap()); + player.removeMetadata("customcrops:insight", BukkitCustomCropsPlugin.getInstance().getBootstrap()); } public static class InsightPlayer implements Runnable { 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 e6367f8..0174e5e 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 @@ -190,7 +190,7 @@ public class BukkitConfigManager extends ConfigManager { public void saveResource(String filePath) { File file = new File(plugin.getDataFolder(), filePath); if (!file.exists()) { - plugin.getBoostrap().saveResource(filePath, false); + plugin.getBootstrap().saveResource(filePath, false); addDefaultNamespace(file); } } diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/BukkitWorldAdaptor.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/BukkitWorldAdaptor.java index fc5ab1f..ae7b31c 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/BukkitWorldAdaptor.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/BukkitWorldAdaptor.java @@ -50,7 +50,7 @@ public class BukkitWorldAdaptor extends AbstractWorldAdaptor { private static BiFunction regionFileProvider; private static Function worldFolderProvider; - private static final NamespacedKey WORLD_DATA = new NamespacedKey(BukkitCustomCropsPlugin.getInstance().getBoostrap(), "data"); + private static final NamespacedKey WORLD_DATA = new NamespacedKey(BukkitCustomCropsPlugin.getInstance().getBootstrap(), "data"); private static final String DATA_FILE = "customcrops.dat"; public BukkitWorldAdaptor() { diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java index 7d5cf9d..ebbca6e 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java @@ -104,7 +104,7 @@ public class BukkitItemManager extends AbstractItemManager { HandlerList.unregisterAll(this.eventListener); } this.eventListener = listener; - Bukkit.getPluginManager().registerEvents(this.eventListener, plugin.getBoostrap()); + Bukkit.getPluginManager().registerEvents(this.eventListener, plugin.getBootstrap()); plugin.debug("Custom event listener set to " + listener.getClass().getName()); } diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/scheduler/BukkitSchedulerAdapter.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/scheduler/BukkitSchedulerAdapter.java index b475eca..0b3dd2b 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/scheduler/BukkitSchedulerAdapter.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/scheduler/BukkitSchedulerAdapter.java @@ -40,9 +40,9 @@ public class BukkitSchedulerAdapter extends AbstractJavaScheduler