diff --git a/PlayWall/.classpath b/PlayWall/.classpath index a8ad48e81f02fb008bf288df3ca4de61c39311b2..d2cd0493fcde2baf421f34395e597c63978e8ebe 100644 --- a/PlayWall/.classpath +++ b/PlayWall/.classpath @@ -15,5 +15,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JLayer"/> <classpathentry combineaccessrules="false" kind="src" path="/PlayWallCore"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> + <classpathentry combineaccessrules="false" kind="src" path="/Updater"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/PlayWall/src/de/tobias/playpad/PlayPadImpl.java b/PlayWall/src/de/tobias/playpad/PlayPadImpl.java index 83a786bb19b6698b8ecda075b83d11adb95a3cab..b99b1c7a5340b8dd9fe312fac84a2539f3e1211e 100644 --- a/PlayWall/src/de/tobias/playpad/PlayPadImpl.java +++ b/PlayWall/src/de/tobias/playpad/PlayPadImpl.java @@ -31,13 +31,13 @@ import de.tobias.playpad.plugin.WindowListener; import de.tobias.playpad.project.Project; import de.tobias.playpad.registry.NoSuchComponentException; import de.tobias.playpad.settings.GlobalSettings; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateRegistery; import de.tobias.playpad.view.MapperOverviewViewController; import de.tobias.playpad.viewcontroller.IPadSettingsViewController; import de.tobias.playpad.viewcontroller.main.IMainViewController; import de.tobias.playpad.viewcontroller.main.MainViewController; import de.tobias.playpad.viewcontroller.option.IProfileSettingsViewController; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateRegistery; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java index 2e7f4e6660a66514b58f1d686892417bf946f3cc..92aeeaf123cbe7ddaccbe5cc41e0aea0ccc77d12 100644 --- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java +++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java @@ -14,11 +14,11 @@ import de.tobias.playpad.project.ref.ProjectReference; import de.tobias.playpad.settings.GlobalSettings; import de.tobias.playpad.settings.ProfileReference; import de.tobias.playpad.update.PlayPadUpdater; -import de.tobias.playpad.update.UpdateRegistery; import de.tobias.playpad.update.Updates; import de.tobias.playpad.viewcontroller.LaunchDialog; import de.tobias.playpad.viewcontroller.dialog.AutoUpdateDialog; import de.tobias.playpad.viewcontroller.dialog.ChangelogDialog; +import de.tobias.updater.client.UpdateRegistery; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; diff --git a/PlayWall/src/de/tobias/playpad/update/PlayPadUpdater.java b/PlayWall/src/de/tobias/playpad/update/PlayPadUpdater.java index 2ba459e5dd0d50b6e6a5739c57ba88ecc0bf225f..7ce8cc5f331161bee409c52ada6920d7a8056326 100644 --- a/PlayWall/src/de/tobias/playpad/update/PlayPadUpdater.java +++ b/PlayWall/src/de/tobias/playpad/update/PlayPadUpdater.java @@ -8,6 +8,8 @@ import java.nio.file.Path; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.util.SystemUtils; diff --git a/PlayWall/src/de/tobias/playpad/update/Updates.java b/PlayWall/src/de/tobias/playpad/update/Updates.java index a507e8d4b28ca862fb5a59a0dbf9248366f4145e..76dbd21de4eed6736c525f89a7d20b070cb2cd2b 100644 --- a/PlayWall/src/de/tobias/playpad/update/Updates.java +++ b/PlayWall/src/de/tobias/playpad/update/Updates.java @@ -9,6 +9,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import de.tobias.playpad.AppUserInfoStrings; +import de.tobias.updater.client.UpdateRegistery; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.NativeLauncher; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java b/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java index c33fffdfd7df206c1edeff9ee6a14c09e93a8b25..5ba3fce1254df6bb2cc80eee1e0e1528ec1e2e56 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java @@ -2,7 +2,7 @@ package de.tobias.playpad.viewcontroller.cell; import de.tobias.playpad.Strings; import de.tobias.playpad.update.PlayPadUpdater; -import de.tobias.playpad.update.Updatable; +import de.tobias.updater.client.Updatable; import de.tobias.utils.util.Localization; import javafx.scene.control.ListCell; import javafx.scene.image.ImageView; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java index ea4b89db2e8c5e7d0095af096e7d341257faf87f..c8fb0d37cfe613c92dba330cc96c09af40bb4321 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java @@ -4,8 +4,8 @@ import java.util.Set; import de.tobias.playpad.PlayPadMain; import de.tobias.playpad.Strings; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateRegistery; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateRegistery; import de.tobias.utils.ui.AdvancedDialog; import de.tobias.utils.util.Localization; import javafx.scene.control.ButtonBar.ButtonData; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PluginViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PluginViewController.java index 1f09405add4ba137a97111be62974b61852813f4..cf25ad254df4a91b277777fe4364e8ce279f28da 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PluginViewController.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PluginViewController.java @@ -16,8 +16,8 @@ import de.tobias.playpad.plugin.PluginDescription; import de.tobias.playpad.plugin.Plugins; import de.tobias.playpad.settings.GlobalSettings; import de.tobias.playpad.settings.Profile; -import de.tobias.playpad.update.UpdateChannel; import de.tobias.playpad.viewcontroller.cell.PluginCell; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.ui.ViewController; import de.tobias.utils.util.Localization; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java index bc7aeddd7ec4750cb9aae7cd1b5ec6614a03a483..805b15feba95781de7a272f13aff4e475a19f363 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java @@ -7,14 +7,14 @@ import de.tobias.playpad.PlayPadPlugin; import de.tobias.playpad.Strings; import de.tobias.playpad.settings.GlobalSettings; import de.tobias.playpad.settings.Profile; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateChannel; -import de.tobias.playpad.update.UpdateRegistery; import de.tobias.playpad.update.Updates; import de.tobias.playpad.viewcontroller.cell.EnumCell; import de.tobias.playpad.viewcontroller.cell.UpdateCell; import de.tobias.playpad.viewcontroller.dialog.UpdaterDialog; import de.tobias.playpad.viewcontroller.option.GlobalSettingsTabViewController; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateChannel; +import de.tobias.updater.client.UpdateRegistery; import de.tobias.utils.application.ApplicationInfo; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.util.Localization; diff --git a/PlayWallCore/.classpath b/PlayWallCore/.classpath index a6fa9547a624843a634dba5d8d42da36ce69f661..5a6addb13d75837e0d5b1ea9f59ccce4810e8dc6 100644 --- a/PlayWallCore/.classpath +++ b/PlayWallCore/.classpath @@ -11,5 +11,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JLayer"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Json"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> + <classpathentry combineaccessrules="false" kind="src" path="/Updater"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/PlayWallCore/src/de/tobias/playpad/Updatable.java b/PlayWallCore/src/de/tobias/playpad/Updatable.java deleted file mode 100644 index 7b3faf36dedc3414f981e5262b0aaf333f6d59f7..0000000000000000000000000000000000000000 --- a/PlayWallCore/src/de/tobias/playpad/Updatable.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.tobias.playpad; - -import java.net.URL; -import java.nio.file.Path; - -/** - * Diese Schnittstelle wird dafür verwendet, damit das Programm für Plugins nach Updates suchen kann und diese auch durchführen kann. - * - * @author tobias - * - * @since 5.0.0 - */ -@Deprecated -public interface Updatable { - - /** - * Gibt die aktuelle Build Nummer zurück - * - * @return build number - */ - public int getCurrentBuild(); - - /** - * Gibt die altuelle Programmversion (lesbar) für den Nutzer zurück. - * - * @return version string - */ - public String getCurrentVersion(); - - /** - * Gibt die neue Buildnummer zurück. - * - * @return build number - */ - public int getNewBuild(); - - /** - * Gibt die neue Versionsnummer (lesbar) zurück. - * - * @return version string - */ - public String getNewVersion(); - - /** - * Lädt alle Informationen für Updates vom Server, sodass die Methoden bescheid wissen. - * - * @return <code>true</code> Erfolgreich. - */ - public boolean checkUpdate(); - - /** - * Gibt den Downloadlink für das Update zurück. - * - * @return server url - */ - public URL getDownloadPath(); - - /** - * Gibt den Lokalen Pfad zur Datei. - * - * @return local path - */ - public Path getLocalPath(); - - /** - * Gibt den Display Namen zurück. (lesbar) - * - * @return name - */ - public String name(); - -} diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/AdvancedPlugin.java b/PlayWallCore/src/de/tobias/playpad/plugin/AdvancedPlugin.java index 619a86a08c3f2387b4427d47ccf87a739c5ad412..53ec30f551d93832e2605299af88c1e9820c011e 100644 --- a/PlayWallCore/src/de/tobias/playpad/plugin/AdvancedPlugin.java +++ b/PlayWallCore/src/de/tobias/playpad/plugin/AdvancedPlugin.java @@ -1,6 +1,6 @@ package de.tobias.playpad.plugin; -import de.tobias.playpad.update.Updatable; +import de.tobias.updater.client.Updatable; /** * Schnittatelle, von der Plugins erben, damit diese alle notwendigen Services unterstützen. diff --git a/PlayWallCore/src/de/tobias/playpad/settings/GlobalSettings.java b/PlayWallCore/src/de/tobias/playpad/settings/GlobalSettings.java index 3caa9fa0d669543ae5b71f6e3b9734c14f5a2233..7dd126156c4cf9287e2ecfaf9dbdc6fb83f2784b 100644 --- a/PlayWallCore/src/de/tobias/playpad/settings/GlobalSettings.java +++ b/PlayWallCore/src/de/tobias/playpad/settings/GlobalSettings.java @@ -16,7 +16,7 @@ import org.dom4j.io.XMLWriter; import de.tobias.playpad.PlayPad; import de.tobias.playpad.settings.keys.KeyCollection; -import de.tobias.playpad.update.UpdateChannel; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; import de.tobias.utils.settings.Storable; diff --git a/PlayWallCore/src/de/tobias/playpad/update/Updatable.java b/PlayWallCore/src/de/tobias/playpad/update/Updatable.java deleted file mode 100644 index 88c493aec8cd4b9741f2e46dadfb71df421aec90..0000000000000000000000000000000000000000 --- a/PlayWallCore/src/de/tobias/playpad/update/Updatable.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.tobias.playpad.update; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Path; - -public interface Updatable { - - public int getCurrentBuild(); - - public String getCurrentVersion(); - - public int getNewBuild(); - - public String getNewVersion(); - - public boolean isUpdateAvailable(); - - public void loadInformation(UpdateChannel channel) throws IOException, URISyntaxException; - - public URL getDownloadPath(); - - public Path getLocalPath(); - - public String name(); - -} diff --git a/PlayWallCore/src/de/tobias/playpad/update/UpdateChannel.java b/PlayWallCore/src/de/tobias/playpad/update/UpdateChannel.java deleted file mode 100644 index ca0367b83d6e1209be9076f625caafde2e759364..0000000000000000000000000000000000000000 --- a/PlayWallCore/src/de/tobias/playpad/update/UpdateChannel.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.tobias.playpad.update; - -public enum UpdateChannel { - - STABLE("stable"), - BETA("beta"); - - private String name; - - private UpdateChannel(String name) { - this.name = name; - } - - @Override - public String toString() { - return name; - } -} diff --git a/PlayWallCore/src/de/tobias/playpad/update/UpdateRegistery.java b/PlayWallCore/src/de/tobias/playpad/update/UpdateRegistery.java deleted file mode 100644 index 8dfa58c1a3affc3f217f5d22e6b9af2a19a4ba6c..0000000000000000000000000000000000000000 --- a/PlayWallCore/src/de/tobias/playpad/update/UpdateRegistery.java +++ /dev/null @@ -1,86 +0,0 @@ -package de.tobias.playpad.update; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.nio.file.Files; -import java.util.HashSet; -import java.util.Set; - -import de.tobias.utils.util.OS; -import de.tobias.utils.util.SystemUtils; -import net.minidev.json.JSONArray; -import net.minidev.json.JSONObject; -import net.minidev.json.JSONStyle; - -public class UpdateRegistery { - - private static Set<Updatable> updatables = new HashSet<>(); - private static Set<Updatable> availableUpdates = new HashSet<>(); - - public static void registerUpdateable(Updatable updatable) { - updatables.add(updatable); - } - - public static Set<Updatable> getAvailableUpdates() { - return availableUpdates; - } - - public static Set<Updatable> lookupUpdates(UpdateChannel channel) { - availableUpdates.clear(); - for (Updatable updatable : UpdateRegistery.updatables) { - try { - updatable.loadInformation(channel); - if (updatable.isUpdateAvailable()) { - availableUpdates.add(updatable); - } - } catch (IOException | URISyntaxException e) { - - } - } - return availableUpdates; - } - - private static final String DOWNLOAD_PATH = "downloadPath"; - private static final String FILES = "files"; - private static final String LOCAL = "local"; - private static final String URL = "url"; - private static final String EXECUTE_FILE = "executePath"; - - public static String buildParamaterString(String downloadPath) { - JSONObject data = new JSONObject(); - data.put(DOWNLOAD_PATH, downloadPath); - - JSONArray array = new JSONArray(); - for (Updatable updatable : availableUpdates) { - JSONObject file = new JSONObject(); - file.put(URL, updatable.getDownloadPath().toString()); - file.put(LOCAL, updatable.getLocalPath().toString()); - array.add(file); - } - data.put(FILES, array); - try { - data.put(EXECUTE_FILE, SystemUtils.getRunPath().toString()); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - - String json = data.toJSONString(JSONStyle.MAX_COMPRESS); - return json; - } - - public static boolean needsAdminPermission() { - for (Updatable updatable : availableUpdates) { - if (!Files.isWritable(updatable.getLocalPath())) { - return true; - } - if (OS.isWindows()) { - try { - if (Files.getOwner(updatable.getLocalPath()).getName().toLowerCase().contains("admin")) { - return true; - } - } catch (IOException e) {} - } - } - return false; - } -} diff --git a/PlayWallPlugins/.classpath b/PlayWallPlugins/.classpath index dff7fdd8d23f0ac9b407b77addb5d79e1997cc9f..a6483b754d078603c9f404278f592d1cada08d7e 100644 --- a/PlayWallPlugins/.classpath +++ b/PlayWallPlugins/.classpath @@ -13,5 +13,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ControlFx"/> <classpathentry combineaccessrules="false" kind="src" path="/PlayWallCore"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/YML"/> + <classpathentry combineaccessrules="false" kind="src" path="/Updater"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java b/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java index 31b62316d5510e01b49c088868b1a26f6edbac14..0c286fdd56bb436caddbbdc3c08520cc648e0878 100644 --- a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java +++ b/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginImpl.java @@ -14,8 +14,8 @@ import de.tobias.playpad.plugin.WindowListener; import de.tobias.playpad.registry.Registry; import de.tobias.playpad.settings.Profile; import de.tobias.playpad.settings.ProfileListener; -import de.tobias.playpad.update.Updatable; import de.tobias.playpad.viewcontroller.main.IMainViewController; +import de.tobias.updater.client.Updatable; import de.tobias.utils.ui.HUD; import de.tobias.utils.ui.icon.FontIcon; import de.tobias.utils.ui.icon.MaterialDesignIcon; diff --git a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java b/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java index 23e473ca7bcea6212eba271ec9e5c3d1e05e4416..1b7f0f3ac590c8fc8169ec3a23c41fe5afd1cd35 100644 --- a/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java +++ b/PlayWallPlugins/actionsplugin/de/tobias/playpad/actionsplugin/impl/ActionsPluginUpdater.java @@ -7,8 +7,8 @@ import java.nio.file.Path; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateChannel; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; diff --git a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java b/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java index 37564d3d5f8a3e5ff833bcf2f3d0268227a09e9a..6609f50a45576fad6763fa0c5d510cfb065159dc 100644 --- a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java +++ b/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginImpl.java @@ -16,10 +16,10 @@ import de.tobias.playpad.plugin.Module; import de.tobias.playpad.plugin.SettingsListener; import de.tobias.playpad.plugin.WindowListener; import de.tobias.playpad.settings.Profile; -import de.tobias.playpad.update.Updatable; import de.tobias.playpad.view.main.MenuType; import de.tobias.playpad.viewcontroller.main.IMainViewController; import de.tobias.playpad.viewcontroller.main.MenuToolbarViewController; +import de.tobias.updater.client.Updatable; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; import de.tobias.utils.ui.icon.FontAwesomeType; diff --git a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java b/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java index f01105e81cf501a47e51f9889ab0de6cd0772eca..30e9472ee227d248c1f6d780114abb90ff1380f6 100644 --- a/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java +++ b/PlayWallPlugins/awakeplugin/de/tobias/playpad/awakeplugin/impl/AwakePluginUpdater.java @@ -7,8 +7,8 @@ import java.nio.file.Path; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateChannel; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java b/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java index afdd5cba281c43519ae2fb111f0315a739548944..60cfab938d8e09c17b3e268e4ca74e7be134a3f5 100644 --- a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java +++ b/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java @@ -14,9 +14,9 @@ import de.tobias.playpad.pad.conntent.PadContent; import de.tobias.playpad.plugin.Module; import de.tobias.playpad.plugin.PadListener; import de.tobias.playpad.plugin.WindowListener; -import de.tobias.playpad.update.Updatable; import de.tobias.playpad.view.main.MenuType; import de.tobias.playpad.viewcontroller.main.IMainViewController; +import de.tobias.updater.client.Updatable; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; import de.tobias.utils.util.Localization; diff --git a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java b/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java index 276150dd42dacbf386a23da14716c1ee3a3b08d5..b3f3eeabc7857679a82727095878121c0b2a87a6 100644 --- a/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java +++ b/PlayWallPlugins/equalizerplugin/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginUpdater.java @@ -7,8 +7,8 @@ import java.nio.file.Path; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateChannel; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java b/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java index 1b0ced1716cfb8f829707e68c83a024b877425cb..a72e595c3f76eb3080ef1969bd88f15013f41324 100644 --- a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java +++ b/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchPadPluginUpdater.java @@ -7,8 +7,8 @@ import java.nio.file.Path; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateChannel; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType; diff --git a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java b/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java index d3ebeffe2c87843472bcaac9aa4920488e5a5371..c10a73e8915de7dbaf2ccb24688abbccac7bf934 100644 --- a/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java +++ b/PlayWallPlugins/launchpadplugin/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java @@ -7,7 +7,7 @@ import de.tobias.playpad.launchpadplugin.midi.device.mk2.LaunchPadMK2; import de.tobias.playpad.launchpadplugin.midi.device.s.LaunchPadS; import de.tobias.playpad.midi.device.DeviceRegistry; import de.tobias.playpad.plugin.Module; -import de.tobias.playpad.update.Updatable; +import de.tobias.updater.client.Updatable; import de.tobias.utils.util.Localization; import net.xeoh.plugins.base.annotations.PluginImplementation; import net.xeoh.plugins.base.annotations.events.PluginLoaded; diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java index 7aae50323fa1dac3be752697e17fce6e2878ddb4..8229a6c7e7c0043185c5363d635b6738989eda2d 100644 --- a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java +++ b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java @@ -16,7 +16,7 @@ import de.tobias.playpad.plugin.Module; import de.tobias.playpad.plugin.SettingsListener; import de.tobias.playpad.registry.Registry; import de.tobias.playpad.settings.Profile; -import de.tobias.playpad.update.Updatable; +import de.tobias.updater.client.Updatable; import de.tobias.utils.ui.HUD; import de.tobias.utils.ui.icon.FontAwesomeType; import de.tobias.utils.ui.icon.FontIcon; diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java index af6501af8ef2759eb21310878740d5d4f5ad33b2..94739f2f6bf3bf5b7ff07424a17d53ef1cb76c89 100644 --- a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java +++ b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java @@ -7,8 +7,8 @@ import java.nio.file.Path; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import de.tobias.playpad.update.Updatable; -import de.tobias.playpad.update.UpdateChannel; +import de.tobias.updater.client.Updatable; +import de.tobias.updater.client.UpdateChannel; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.application.container.PathType;