From 033e334877befef6e6cee3164f5eab19c148dcd5 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 22 Apr 2022 09:53:40 +0100 Subject: [PATCH] Codestyle and reduced memory garbage --- .../eco/internal/drops/EcoDropQueueFactory.kt | 2 +- .../willfp/eco/internal/gui/EcoGUIFactory.kt | 2 +- .../willfp/eco/internal/spigot/EcoHandler.kt | 131 ++++++++---------- 3 files changed, 56 insertions(+), 79 deletions(-) diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/EcoDropQueueFactory.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/EcoDropQueueFactory.kt index 8466c8c2..da9bd5a1 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/EcoDropQueueFactory.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/EcoDropQueueFactory.kt @@ -6,7 +6,7 @@ import com.willfp.eco.internal.drops.impl.EcoDropQueue import com.willfp.eco.internal.drops.impl.EcoFastCollatedDropQueue import org.bukkit.entity.Player -class EcoDropQueueFactory : DropQueueFactory { +object EcoDropQueueFactory : DropQueueFactory { override fun create(player: Player): InternalDropQueue { return if (DropManager.type == DropQueueType.COLLATED) EcoFastCollatedDropQueue(player) else EcoDropQueue( player diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt index f9ceb0a2..f308a87f 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt @@ -7,7 +7,7 @@ import com.willfp.eco.core.gui.slot.functional.SlotProvider import com.willfp.eco.internal.gui.menu.EcoMenuBuilder import com.willfp.eco.internal.gui.slot.EcoSlotBuilder -class EcoGUIFactory : GUIFactory { +object EcoGUIFactory : GUIFactory { override fun createSlotBuilder(provider: SlotProvider): SlotBuilder { return EcoSlotBuilder(provider) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoHandler.kt index d25b17b2..fee77dbf 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoHandler.kt @@ -61,116 +61,93 @@ class EcoHandler : EcoSpigotPlugin(), Handler { if (this.configYml.getBool("use-safer-namespacedkey-creation")) SafeInternalNamespacedKeyFactory() else FastInternalNamespacedKeyFactory() - override fun createScheduler(plugin: EcoPlugin): EcoScheduler = EcoScheduler(plugin) + override fun createScheduler(plugin: EcoPlugin): EcoScheduler = + EcoScheduler(plugin) - override fun createEventManager(plugin: EcoPlugin) = EcoEventManager(plugin) + override fun createEventManager(plugin: EcoPlugin): EcoEventManager = + EcoEventManager(plugin) - override fun createNamespacedKeyFactory(plugin: EcoPlugin): EcoNamespacedKeyFactory { - return EcoNamespacedKeyFactory(plugin) - } + override fun createNamespacedKeyFactory(plugin: EcoPlugin): EcoNamespacedKeyFactory = + EcoNamespacedKeyFactory(plugin) - override fun createMetadataValueFactory(plugin: EcoPlugin): EcoMetadataValueFactory { - return EcoMetadataValueFactory(plugin) - } + override fun createMetadataValueFactory(plugin: EcoPlugin): EcoMetadataValueFactory = + EcoMetadataValueFactory(plugin) - override fun createRunnableFactory(plugin: EcoPlugin): EcoRunnableFactory { - return EcoRunnableFactory(plugin) - } + override fun createRunnableFactory(plugin: EcoPlugin): EcoRunnableFactory = + EcoRunnableFactory(plugin) - override fun createExtensionLoader(plugin: EcoPlugin): EcoExtensionLoader { - return EcoExtensionLoader(plugin) - } + override fun createExtensionLoader(plugin: EcoPlugin): EcoExtensionLoader = + EcoExtensionLoader(plugin) - override fun createConfigHandler(plugin: EcoPlugin): EcoConfigHandler { - return EcoConfigHandler(plugin) - } + override fun createConfigHandler(plugin: EcoPlugin): EcoConfigHandler = + EcoConfigHandler(plugin) - override fun createLogger(plugin: EcoPlugin): Logger { - return EcoLogger(plugin) - } + override fun createLogger(plugin: EcoPlugin): Logger = + EcoLogger(plugin) - override fun createPAPIIntegration(plugin: EcoPlugin): PlaceholderIntegration { - return PlaceholderIntegrationPAPI(plugin) - } + override fun createPAPIIntegration(plugin: EcoPlugin): PlaceholderIntegration = + PlaceholderIntegrationPAPI(plugin) - override fun getEcoPlugin(): EcoPlugin { - return this - } + override fun getEcoPlugin(): EcoPlugin = + this - override fun getConfigFactory(): EcoConfigFactory { - return EcoConfigFactory - } + override fun getConfigFactory(): EcoConfigFactory = + EcoConfigFactory - override fun getDropQueueFactory(): EcoDropQueueFactory { - return EcoDropQueueFactory() - } + override fun getDropQueueFactory(): EcoDropQueueFactory = + EcoDropQueueFactory - override fun getGUIFactory(): EcoGUIFactory { - return EcoGUIFactory() - } + override fun getGUIFactory(): EcoGUIFactory = + EcoGUIFactory - override fun getCleaner(): EcoCleaner { - return cleaner - } + override fun getCleaner(): EcoCleaner = + cleaner - override fun createProxyFactory(plugin: EcoPlugin): EcoProxyFactory { - return EcoProxyFactory(plugin) - } + override fun createProxyFactory(plugin: EcoPlugin): EcoProxyFactory = + EcoProxyFactory(plugin) override fun addNewPlugin(plugin: EcoPlugin) { Plugins.LOADED_ECO_PLUGINS[plugin.name.lowercase()] = plugin } - override fun getLoadedPlugins(): List { - return Plugins.LOADED_ECO_PLUGINS.keys.toMutableList() - } + override fun getLoadedPlugins(): List = + Plugins.LOADED_ECO_PLUGINS.keys.toMutableList() - override fun getPluginByName(name: String): EcoPlugin? { - return Plugins.LOADED_ECO_PLUGINS[name.lowercase()] - } + override fun getPluginByName(name: String): EcoPlugin? = + Plugins.LOADED_ECO_PLUGINS[name.lowercase()] - override fun createFastItemStack(itemStack: ItemStack): FastItemStack { - return getProxy(FastItemStackFactoryProxy::class.java).create(itemStack) - } + override fun createFastItemStack(itemStack: ItemStack): FastItemStack = + getProxy(FastItemStackFactoryProxy::class.java).create(itemStack) - override fun registerBStats(plugin: EcoPlugin) { + override fun registerBStats(plugin: EcoPlugin) = MetricHandler.createMetrics(plugin) - } - override fun getAdventure(): BukkitAudiences? { - return adventure - } + override fun getAdventure(): BukkitAudiences? = + adventure - override fun getKeyRegistry(): EcoKeyRegistry { - return keyRegistry - } + override fun getKeyRegistry(): EcoKeyRegistry = + keyRegistry - override fun getProfileHandler(): EcoProfileHandler { - return playerProfileHandler - } + override fun getProfileHandler(): EcoProfileHandler = + playerProfileHandler fun setAdventure(adventure: BukkitAudiences) { this.adventure = adventure } - override fun createDummyEntity(location: Location): Entity { - return getProxy(DummyEntityFactoryProxy::class.java).createDummyEntity(location) - } + override fun createDummyEntity(location: Location): Entity = + getProxy(DummyEntityFactoryProxy::class.java).createDummyEntity(location) - override fun createNamespacedKey(namespace: String, key: String): NamespacedKey { - @Suppress("DEPRECATION") - return keyFactory?.create(namespace, key) ?: NamespacedKey(namespace, key) - } + @Suppress("DEPRECATION") + override fun createNamespacedKey(namespace: String, key: String): NamespacedKey = + keyFactory?.create(namespace, key) ?: NamespacedKey(namespace, key) - override fun getProps(existing: PluginProps?, plugin: Class): PluginProps { - return existing ?: EcoPropsParser.parseForPlugin(plugin) - } + override fun getProps(existing: PluginProps?, plugin: Class): PluginProps = + existing ?: EcoPropsParser.parseForPlugin(plugin) - override fun createEntityController(mob: T): EntityController { - return getProxy(EntityControllerFactoryProxy::class.java).createEntityController(mob) - } + override fun createEntityController(mob: T): EntityController = + getProxy(EntityControllerFactoryProxy::class.java).createEntityController(mob) - override fun formatMiniMessage(message: String): String { - return getProxy(MiniMessageTranslatorProxy::class.java).format(message) - } + override fun formatMiniMessage(message: String): String = + getProxy(MiniMessageTranslatorProxy::class.java).format(message) }