diff --git a/recaf-core/src/main/java/software/coley/recaf/plugin/AllocationException.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/AllocationException.java similarity index 93% rename from recaf-core/src/main/java/software/coley/recaf/plugin/AllocationException.java rename to recaf-core/src/main/java/software/coley/recaf/services/plugin/AllocationException.java index 0475c8338..b09b58fce 100644 --- a/recaf-core/src/main/java/software/coley/recaf/plugin/AllocationException.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/AllocationException.java @@ -1,4 +1,4 @@ -package software.coley.recaf.plugin; +package software.coley.recaf.services.plugin; import jakarta.annotation.Nonnull; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/CdiClassAllocator.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/CdiClassAllocator.java index 55412fc39..02cb822b5 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/CdiClassAllocator.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/CdiClassAllocator.java @@ -5,8 +5,6 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.*; import jakarta.inject.Inject; -import software.coley.recaf.plugin.AllocationException; -import software.coley.recaf.plugin.ClassAllocator; import java.util.IdentityHashMap; import java.util.Map; diff --git a/recaf-core/src/main/java/software/coley/recaf/plugin/ClassAllocator.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/ClassAllocator.java similarity index 91% rename from recaf-core/src/main/java/software/coley/recaf/plugin/ClassAllocator.java rename to recaf-core/src/main/java/software/coley/recaf/services/plugin/ClassAllocator.java index 48e251d38..c0a5b10a7 100644 --- a/recaf-core/src/main/java/software/coley/recaf/plugin/ClassAllocator.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/ClassAllocator.java @@ -1,4 +1,4 @@ -package software.coley.recaf.plugin; +package software.coley.recaf.services.plugin; import jakarta.annotation.Nonnull; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java index 6645520ec..097f93cdc 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java @@ -2,7 +2,6 @@ import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; -import software.coley.recaf.plugin.PluginSource; import software.coley.recaf.util.io.ByteSource; import java.io.IOException; diff --git a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginContainer.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainer.java similarity index 81% rename from recaf-core/src/main/java/software/coley/recaf/plugin/PluginContainer.java rename to recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainer.java index 37e0e5853..763c54d5b 100644 --- a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginContainer.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainer.java @@ -1,6 +1,7 @@ -package software.coley.recaf.plugin; +package software.coley.recaf.services.plugin; import jakarta.annotation.Nonnull; +import software.coley.recaf.plugin.Plugin; /** * Object that holds reference to a plugin and it's information. diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainerImpl.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainerImpl.java index 28e39448c..df8f41b61 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainerImpl.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainerImpl.java @@ -2,8 +2,6 @@ import jakarta.annotation.Nonnull; import software.coley.recaf.plugin.Plugin; -import software.coley.recaf.plugin.PluginContainer; -import software.coley.recaf.plugin.PluginInfo; /** * Plugin container implementation. diff --git a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginException.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginException.java similarity index 94% rename from recaf-core/src/main/java/software/coley/recaf/plugin/PluginException.java rename to recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginException.java index 9cc95076f..99bce9aad 100644 --- a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginException.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginException.java @@ -1,4 +1,4 @@ -package software.coley.recaf.plugin; +package software.coley.recaf.services.plugin; /** * Exception thrown when action involving plugins fail. diff --git a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginInfo.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginInfo.java similarity index 93% rename from recaf-core/src/main/java/software/coley/recaf/plugin/PluginInfo.java rename to recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginInfo.java index c8cc7c2c4..eff1ec1a9 100644 --- a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginInfo.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginInfo.java @@ -1,6 +1,8 @@ -package software.coley.recaf.plugin; +package software.coley.recaf.services.plugin; import jakarta.annotation.Nonnull; +import software.coley.recaf.plugin.Plugin; +import software.coley.recaf.plugin.PluginInformation; import java.util.Set; diff --git a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginLoader.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginLoader.java similarity index 73% rename from recaf-core/src/main/java/software/coley/recaf/plugin/PluginLoader.java rename to recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginLoader.java index c6a26d691..1d4971814 100644 --- a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginLoader.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginLoader.java @@ -1,13 +1,13 @@ -package software.coley.recaf.plugin; +package software.coley.recaf.services.plugin; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import software.coley.recaf.services.plugin.PluginException; import software.coley.recaf.services.plugin.PreparedPlugin; import software.coley.recaf.util.io.ByteSource; /** - * The plugin loader. - * This interface is responsible for loading plugins from different sources. + * The plugin loader is responsible for loading plugins from different sources. * * @author xDark */ diff --git a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginSource.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginSource.java similarity index 90% rename from recaf-core/src/main/java/software/coley/recaf/plugin/PluginSource.java rename to recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginSource.java index c676c97bb..36c502657 100644 --- a/recaf-core/src/main/java/software/coley/recaf/plugin/PluginSource.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginSource.java @@ -1,4 +1,4 @@ -package software.coley.recaf.plugin; +package software.coley.recaf.services.plugin; import jakarta.annotation.Nullable; import software.coley.recaf.util.io.ByteSource; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginUnloader.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginUnloader.java index bc65c7b45..1779dd6cc 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginUnloader.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginUnloader.java @@ -1,8 +1,6 @@ package software.coley.recaf.services.plugin; import jakarta.annotation.Nonnull; -import software.coley.recaf.plugin.PluginException; -import software.coley.recaf.plugin.PluginInfo; import java.util.stream.Stream; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PreparedPlugin.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PreparedPlugin.java index 62452db99..63f45f50a 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PreparedPlugin.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PreparedPlugin.java @@ -1,10 +1,6 @@ package software.coley.recaf.services.plugin; import jakarta.annotation.Nonnull; -import software.coley.recaf.plugin.PluginContainer; -import software.coley.recaf.plugin.PluginException; -import software.coley.recaf.plugin.PluginInfo; -import software.coley.recaf.plugin.PluginSource; import software.coley.recaf.services.plugin.discovery.DiscoveredPluginSource; import software.coley.recaf.services.plugin.discovery.PluginDiscoverer; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/DirectoryPluginDiscoverer.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/DirectoryPluginDiscoverer.java index 1e02fec20..d0b783fda 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/DirectoryPluginDiscoverer.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/DirectoryPluginDiscoverer.java @@ -1,7 +1,7 @@ package software.coley.recaf.services.plugin.discovery; import jakarta.annotation.Nonnull; -import software.coley.recaf.plugin.PluginException; +import software.coley.recaf.services.plugin.PluginException; import java.io.IOException; import java.nio.file.Files; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PathPluginDiscoverer.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PathPluginDiscoverer.java index 7b33b7243..fce456622 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PathPluginDiscoverer.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PathPluginDiscoverer.java @@ -1,7 +1,7 @@ package software.coley.recaf.services.plugin.discovery; import jakarta.annotation.Nonnull; -import software.coley.recaf.plugin.PluginException; +import software.coley.recaf.services.plugin.PluginException; import software.coley.recaf.util.io.ByteSources; import java.nio.file.Path; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PluginDiscoverer.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PluginDiscoverer.java index 3a2572acc..631029c86 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PluginDiscoverer.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/discovery/PluginDiscoverer.java @@ -1,7 +1,7 @@ package software.coley.recaf.services.plugin.discovery; import jakarta.annotation.Nonnull; -import software.coley.recaf.plugin.PluginException; +import software.coley.recaf.services.plugin.PluginException; import java.util.List; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPluginLoader.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPluginLoader.java index 287377396..2d2786f78 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPluginLoader.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPluginLoader.java @@ -16,6 +16,9 @@ import software.coley.lljzip.ZipIO; import software.coley.lljzip.format.model.ZipArchive; import software.coley.recaf.plugin.*; +import software.coley.recaf.services.plugin.PluginException; +import software.coley.recaf.services.plugin.PluginInfo; +import software.coley.recaf.services.plugin.PluginLoader; import software.coley.recaf.services.plugin.PreparedPlugin; import software.coley.recaf.util.IOUtil; import software.coley.recaf.util.io.ByteSource; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPreparedPlugin.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPreparedPlugin.java index a577b476e..480ef58c6 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPreparedPlugin.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPreparedPlugin.java @@ -1,9 +1,9 @@ package software.coley.recaf.services.plugin.zip; import jakarta.annotation.Nonnull; -import software.coley.recaf.plugin.PluginException; -import software.coley.recaf.plugin.PluginInfo; -import software.coley.recaf.plugin.PluginSource; +import software.coley.recaf.services.plugin.PluginException; +import software.coley.recaf.services.plugin.PluginInfo; +import software.coley.recaf.services.plugin.PluginSource; import software.coley.recaf.services.plugin.PreparedPlugin; import java.io.IOException; diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipSource.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipSource.java index 488943222..f5a8af097 100644 --- a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipSource.java +++ b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipSource.java @@ -2,7 +2,7 @@ import jakarta.annotation.Nonnull; import software.coley.lljzip.format.model.LocalFileHeader; -import software.coley.recaf.plugin.PluginSource; +import software.coley.recaf.services.plugin.PluginSource; import software.coley.recaf.util.io.ByteSource; import software.coley.recaf.util.io.LocalFileHeaderSource; diff --git a/recaf-ui/src/main/java/software/coley/recaf/Main.java b/recaf-ui/src/main/java/software/coley/recaf/Main.java index b4c36b3d7..be1d8ab8f 100644 --- a/recaf-ui/src/main/java/software/coley/recaf/Main.java +++ b/recaf-ui/src/main/java/software/coley/recaf/Main.java @@ -11,8 +11,8 @@ import software.coley.recaf.launch.LaunchArguments; import software.coley.recaf.launch.LaunchCommand; import software.coley.recaf.launch.LaunchHandler; -import software.coley.recaf.plugin.PluginContainer; -import software.coley.recaf.plugin.PluginException; +import software.coley.recaf.services.plugin.PluginContainer; +import software.coley.recaf.services.plugin.PluginException; import software.coley.recaf.services.file.RecafDirectoriesConfig; import software.coley.recaf.services.plugin.PluginManager; import software.coley.recaf.services.plugin.discovery.DirectoryPluginDiscoverer;