Loading pkgs/by-name/ed/ed-odyssey-materials-helper/disable-broken-features.patch 0 → 100644 +35 −0 Original line number Diff line number Diff line diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java index e6d0e84d..aeaa32af 100644 --- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java +++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java @@ -408,7 +408,7 @@ public class EDDNService { private static void send(final Object message, final Event event, final String schemaName, final int delaySecondsAllowed) { final boolean isLive = ApplicationState.getInstance().getGameVersion().equals(GameVersion.LIVE); final boolean isNew = isNew(event, delaySecondsAllowed); - final Boolean isEnabled = PreferencesService.getPreference(PreferenceConstants.EDDN_ENABLED, Boolean.FALSE); + final Boolean isEnabled = false; if (isLive && isNew && isEnabled) { final Runnable run = () -> { try { diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java index f39a7a17..0dd77370 100644 --- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java +++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java @@ -43,16 +43,13 @@ public class SettingsTab extends MainTab implements DestroyableTemplate { new HorizonsWishlist(), new HorizonsShips(), new HorizonsColonisation(), - new Notifications(), - new FrontierAPI() + new Notifications() ) .buildVBox(); //AR if (OsCheck.isWindows()) { settings.getNodes().add(new AugmentedReality()); } - //Tracking - settings.getNodes().add(new Tracking()); ScrollPane scrollPane = register(ScrollPaneBuilder.builder() .withStyleClass("settings-tab-content") pkgs/by-name/ed/ed-odyssey-materials-helper/eula.patch 0 → 100644 +13 −0 Original line number Diff line number Diff line diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java index 260ecd78..7b5c5649 100644 --- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java +++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java @@ -61,7 +61,7 @@ public class StartDialog extends DestroyableVBox implements DestroyableTemplate .withStyleClass("buttons") .withNodes(createButtons()) .buildHBox(); - this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, eulaTitle, eulaContent, buttonsBox); + this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, buttonsBox); if(!VersionService.isDev()){ PreferencesService.setPreference(PreferenceConstants.WHATS_NEW_VERSION, VersionService.getBuildVersion()); } pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +9 −7 Original line number Diff line number Diff line Loading @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { # so this removes 1) the popup about it when you first start the program, 2) the option in the settings # and makes the program always know that it is set up ./remove-urlscheme-settings.patch ./eula.patch # EULA doesn't apply to nixpkgs build, only the upstream build, don't show it ./disable-broken-features.patch # some features require things not included in the source code, we'll disable/hide those ]; postPatch = '' # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb Loading @@ -51,12 +54,15 @@ stdenv.mkDerivation rec { substituteInPlace application/src/main/java/module-info.java \ --replace-fail 'requires oslib.master.SNAPSHOT;' 'requires oslib.d6ee6549bb;' # remove "new version available" popup # remove "new version available" (not needed) and eddn question (eddn doesn't work in this build) popups substituteInPlace application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java \ --replace-fail 'versionPopup();' "" --replace-fail 'versionPopup();' "" \ --replace-fail 'eddnPopup();' "" substituteInPlace build.gradle bootstrap/build.gradle application/build.gradle \ --replace-fail 'vendor = JvmVendorSpec.AZUL' "" echo "This nixpkgs-packaged version of Elite Dangerous Odyssey Materials Helper doesn't upload any data." > application/src/main/resources/text/privacy.txt ''; mitmCache = gradle.fetchDeps { Loading @@ -73,12 +79,8 @@ stdenv.mkDerivation rec { gradleBuildTask = "application:jpackage"; env = { EDDN_SOFTWARE_NAME = "EDO Materials Helper"; }; preBuild = '' # required to make EDDN_SOFTWARE_NAME work and for the program to know its own version # required for the program to know its own version gradle $gradleFlags application:generateSecrets ''; Loading Loading
pkgs/by-name/ed/ed-odyssey-materials-helper/disable-broken-features.patch 0 → 100644 +35 −0 Original line number Diff line number Diff line diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java index e6d0e84d..aeaa32af 100644 --- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java +++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java @@ -408,7 +408,7 @@ public class EDDNService { private static void send(final Object message, final Event event, final String schemaName, final int delaySecondsAllowed) { final boolean isLive = ApplicationState.getInstance().getGameVersion().equals(GameVersion.LIVE); final boolean isNew = isNew(event, delaySecondsAllowed); - final Boolean isEnabled = PreferencesService.getPreference(PreferenceConstants.EDDN_ENABLED, Boolean.FALSE); + final Boolean isEnabled = false; if (isLive && isNew && isEnabled) { final Runnable run = () -> { try { diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java index f39a7a17..0dd77370 100644 --- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java +++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java @@ -43,16 +43,13 @@ public class SettingsTab extends MainTab implements DestroyableTemplate { new HorizonsWishlist(), new HorizonsShips(), new HorizonsColonisation(), - new Notifications(), - new FrontierAPI() + new Notifications() ) .buildVBox(); //AR if (OsCheck.isWindows()) { settings.getNodes().add(new AugmentedReality()); } - //Tracking - settings.getNodes().add(new Tracking()); ScrollPane scrollPane = register(ScrollPaneBuilder.builder() .withStyleClass("settings-tab-content")
pkgs/by-name/ed/ed-odyssey-materials-helper/eula.patch 0 → 100644 +13 −0 Original line number Diff line number Diff line diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java index 260ecd78..7b5c5649 100644 --- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java +++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java @@ -61,7 +61,7 @@ public class StartDialog extends DestroyableVBox implements DestroyableTemplate .withStyleClass("buttons") .withNodes(createButtons()) .buildHBox(); - this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, eulaTitle, eulaContent, buttonsBox); + this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, buttonsBox); if(!VersionService.isDev()){ PreferencesService.setPreference(PreferenceConstants.WHATS_NEW_VERSION, VersionService.getBuildVersion()); }
pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +9 −7 Original line number Diff line number Diff line Loading @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { # so this removes 1) the popup about it when you first start the program, 2) the option in the settings # and makes the program always know that it is set up ./remove-urlscheme-settings.patch ./eula.patch # EULA doesn't apply to nixpkgs build, only the upstream build, don't show it ./disable-broken-features.patch # some features require things not included in the source code, we'll disable/hide those ]; postPatch = '' # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb Loading @@ -51,12 +54,15 @@ stdenv.mkDerivation rec { substituteInPlace application/src/main/java/module-info.java \ --replace-fail 'requires oslib.master.SNAPSHOT;' 'requires oslib.d6ee6549bb;' # remove "new version available" popup # remove "new version available" (not needed) and eddn question (eddn doesn't work in this build) popups substituteInPlace application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java \ --replace-fail 'versionPopup();' "" --replace-fail 'versionPopup();' "" \ --replace-fail 'eddnPopup();' "" substituteInPlace build.gradle bootstrap/build.gradle application/build.gradle \ --replace-fail 'vendor = JvmVendorSpec.AZUL' "" echo "This nixpkgs-packaged version of Elite Dangerous Odyssey Materials Helper doesn't upload any data." > application/src/main/resources/text/privacy.txt ''; mitmCache = gradle.fetchDeps { Loading @@ -73,12 +79,8 @@ stdenv.mkDerivation rec { gradleBuildTask = "application:jpackage"; env = { EDDN_SOFTWARE_NAME = "EDO Materials Helper"; }; preBuild = '' # required to make EDDN_SOFTWARE_NAME work and for the program to know its own version # required for the program to know its own version gradle $gradleFlags application:generateSecrets ''; Loading