Repo-Mirror/Custom-Crops
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Crops.git synced 2025-12-26 18:39:17 +00:00
Code Issues Releases Activity

Fixed using the wrong plugin instance

Browse Source
This commit is contained in:
XiaoMoMi
2024-09-14 18:29:10 +08:00
parent 60d2525fbb
commit 0a4946c7a8
15 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java
View File

@@ -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);
}
}

2
plugin/src/main/java/net/momirealms/customcrops/bukkit/command/BukkitCommandManager.java
View File

@@ -50,7 +50,7 @@ public class BukkitCommandManager extends AbstractCommandManager<CommandSender>
public BukkitCommandManager(BukkitCustomCropsPlugin plugin) {
super(plugin, new LegacyPaperCommandManager<>(
plugin.getBoostrap(),
plugin.getBootstrap(),
ExecutionCoordinator.simpleCoordinator(),
SenderMapper.identity()
));

8
plugin/src/main/java/net/momirealms/customcrops/bukkit/command/feature/DebugInsightCommand.java
View File

@@ -58,12 +58,12 @@ public class DebugInsightCommand extends BukkitCommandFeature<CommandSender> 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("<red>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("<green>Insight mode: ON"));
plugin.getSenderFactory().wrap(player).sendMessage(AdventureHelper.miniMessage("<white>Note that this only shows a snapshot of the data."));
@@ -82,13 +82,13 @@ public class DebugInsightCommand extends BukkitCommandFeature<CommandSender> 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 {

2
plugin/src/main/java/net/momirealms/customcrops/bukkit/config/BukkitConfigManager.java
View File

@@ -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);
}
}

2
plugin/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/BukkitWorldAdaptor.java
View File

@@ -50,7 +50,7 @@ public class BukkitWorldAdaptor extends AbstractWorldAdaptor<World> {
private static BiFunction<World, RegionPos, File> regionFileProvider;
private static Function<World, File> 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() {

2
plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java
View File

@@ -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());
}

4
plugin/src/main/java/net/momirealms/customcrops/bukkit/scheduler/BukkitSchedulerAdapter.java
View File

@@ -40,9 +40,9 @@ public class BukkitSchedulerAdapter extends AbstractJavaScheduler<Location, Worl
public BukkitSchedulerAdapter(BukkitCustomCropsPlugin plugin) {
super(plugin);
if (VersionHelper.isFolia()) {
this.sync = new FoliaExecutor(plugin.getBoostrap());
this.sync = new FoliaExecutor(plugin.getBootstrap());
} else {
this.sync = new BukkitExecutor(plugin.getBoostrap());
this.sync = new BukkitExecutor(plugin.getBootstrap());
}
}

4
plugin/src/main/java/net/momirealms/customcrops/bukkit/sender/BukkitSenderFactory.java
View File

@@ -44,7 +44,7 @@ public class BukkitSenderFactory extends SenderFactory<BukkitCustomCropsPlugin,
public BukkitSenderFactory(BukkitCustomCropsPlugin plugin) {
super(plugin);
this.audiences = BukkitAudiences.create(plugin.getBoostrap());
this.audiences = BukkitAudiences.create(plugin.getBootstrap());
}
@Override
@@ -96,7 +96,7 @@ public class BukkitSenderFactory extends SenderFactory<BukkitCustomCropsPlugin,
@Override
protected void performCommand(CommandSender sender, String command) {
getPlugin().getBoostrap().getServer().dispatchCommand(sender, command);
getPlugin().getBootstrap().getServer().dispatchCommand(sender, command);
}
@Override

2
plugin/src/main/java/net/momirealms/customcrops/bukkit/world/BukkitWorldManager.java
View File

@@ -123,7 +123,7 @@ public class BukkitWorldManager implements WorldManager, Listener {
@Override
public void load() {
this.loadConfig();
Bukkit.getPluginManager().registerEvents(this, plugin.getBoostrap());
Bukkit.getPluginManager().registerEvents(this, plugin.getBootstrap());
// load and unload worlds
for (World world : Bukkit.getWorlds()) {
if (isMechanicEnabled(world)) {