From 6c4bb2e6e8eca293191a10fa8bb92c2bcce9236e Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 16 Jul 2021 13:07:15 +0200 Subject: [PATCH] Fixed poorly named methods --- .../java/com/willfp/eco/core/EcoPlugin.java | 24 +++++++++---------- .../willfp/eco/spigot/EcoSpigotPlugin.java | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java b/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java index 4dec3bbc..b3393e64 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java +++ b/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java @@ -345,7 +345,7 @@ public abstract class EcoPlugin extends JavaPlugin { PlaceholderManager.addIntegration(Eco.getHandler().createPAPIIntegration(this)); } - this.getIntegrationLoaders().forEach((integrationLoader -> { + this.loadIntegrationLoaders().forEach((integrationLoader -> { if (enabledPlugins.contains(integrationLoader.getPluginName())) { this.loadedIntegrations.add(integrationLoader.getPluginName()); integrationLoader.load(); @@ -356,17 +356,17 @@ public abstract class EcoPlugin extends JavaPlugin { Prerequisite.update(); - this.getPacketAdapters().forEach(abstractPacketAdapter -> { + this.loadPacketAdapters().forEach(abstractPacketAdapter -> { if (!abstractPacketAdapter.isPostLoad()) { abstractPacketAdapter.register(); } }); - updatableClasses.addAll(this.getUpdatableClasses()); + updatableClasses.addAll(this.loadUpdatableClasses()); - this.getListeners().forEach(listener -> this.getEventManager().registerListener(listener)); + this.loadListeners().forEach(listener -> this.getEventManager().registerListener(listener)); - this.getPluginCommands().forEach(PluginCommand::register); + this.loadPluginCommands().forEach(PluginCommand::register); this.getScheduler().runLater(this::afterLoad, 1); @@ -429,7 +429,7 @@ public abstract class EcoPlugin extends JavaPlugin { Display.registerDisplayModule(this.getDisplayModule()); } - this.getPacketAdapters().forEach(abstractPacketAdapter -> { + this.loadPacketAdapters().forEach(abstractPacketAdapter -> { if (abstractPacketAdapter.isPostLoad()) { abstractPacketAdapter.register(); } @@ -520,7 +520,7 @@ public abstract class EcoPlugin extends JavaPlugin { * * @return A list of integrations. */ - public List getIntegrationLoaders() { + protected List loadIntegrationLoaders() { return new ArrayList<>(); } @@ -529,7 +529,7 @@ public abstract class EcoPlugin extends JavaPlugin { * * @return A list of commands. */ - public List getPluginCommands() { + protected List loadPluginCommands() { return new ArrayList<>(); } @@ -540,7 +540,7 @@ public abstract class EcoPlugin extends JavaPlugin { * * @return A list of packet adapters. */ - public List getPacketAdapters() { + protected List loadPacketAdapters() { return new ArrayList<>(); } @@ -549,14 +549,14 @@ public abstract class EcoPlugin extends JavaPlugin { * * @return A list of all listeners. */ - public abstract List getListeners(); + protected abstract List loadListeners(); /** * All updatable classes. * * @return A list of all updatable classes. */ - public List> getUpdatableClasses() { + protected List> loadUpdatableClasses() { return new ArrayList<>(); } @@ -580,7 +580,7 @@ public abstract class EcoPlugin extends JavaPlugin { * * @return The version. */ - protected String getMinimumEcoVersion() { + public String getMinimumEcoVersion() { return "6.0.0"; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java index 9fd4fc8f..6e71b431 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java @@ -109,7 +109,7 @@ public abstract class EcoSpigotPlugin extends EcoPlugin { } @Override - public List getIntegrationLoaders() { + public List loadIntegrationLoaders() { return Arrays.asList( // AntiGrief new IntegrationLoader("WorldGuard", () -> AntigriefManager.register(new AntigriefWorldGuard())), @@ -149,7 +149,7 @@ public abstract class EcoSpigotPlugin extends EcoPlugin { } @Override - public List getPacketAdapters() { + public List loadPacketAdapters() { List adapters = new ArrayList<>(Arrays.asList( new PacketAutoRecipe(this), new PacketChat(this), @@ -166,7 +166,7 @@ public abstract class EcoSpigotPlugin extends EcoPlugin { } @Override - public List getListeners() { + public List loadListeners() { return Arrays.asList( new NaturalExpGainListeners(), new ArmorListener(), @@ -180,7 +180,7 @@ public abstract class EcoSpigotPlugin extends EcoPlugin { } @Override - public List> getUpdatableClasses() { + public List> loadUpdatableClasses() { return Arrays.asList( DropManager.class );