From 7993de9af23b8cc770bc55bcd4e16afcbdbe0488 Mon Sep 17 00:00:00 2001 From: LabyStudio Date: Sun, 13 Jun 2021 08:34:54 +0200 Subject: [PATCH] fix the loading of the default implementation --- .../singlehotswap/hotswap/EnumFileType.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/labymod/intellij/singlehotswap/hotswap/EnumFileType.java b/src/main/java/net/labymod/intellij/singlehotswap/hotswap/EnumFileType.java index 17616dd..370bb45 100644 --- a/src/main/java/net/labymod/intellij/singlehotswap/hotswap/EnumFileType.java +++ b/src/main/java/net/labymod/intellij/singlehotswap/hotswap/EnumFileType.java @@ -38,17 +38,20 @@ public enum EnumFileType { * Creates and instance of the given implementation class for hot-swapping if the required plugin is available * * @param className Hotswap implementation class - * @param requiredPluginId The required plugin for this hotswap type + * @param requiredPluginId The required plugin for this hotswap type. This can be null to skip the requirement. */ EnumFileType( String className, String requiredPluginId ) { try { - // Find plugin by plugin id - @Nullable IdeaPluginDescriptor plugin = requiredPluginId == null ? null : - PluginManager.getInstance().findEnabledPlugin( PluginId.getId( requiredPluginId ) ); + // Check if plugin is required + if ( requiredPluginId != null ) { - // Skip implementation if not plugin is not available - if ( plugin == null || !plugin.isEnabled() ) { - return; + // Find plugin by plugin id + @Nullable IdeaPluginDescriptor plugin = PluginManager.getInstance().findEnabledPlugin( PluginId.getId( requiredPluginId ) ); + + // Skip implementation if not plugin is not available + if ( plugin == null || !plugin.isEnabled() ) { + return; + } } // Load implementation @@ -58,6 +61,7 @@ public enum EnumFileType { } } + /** * Get hotswap implementation for current type *