external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

update constant name

Browse Source
This commit is contained in:
Anthony Calosa
2024-10-28 20:10:33 +08:00
parent f663fc52dc
commit 51e0f37a14
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java
View File

@@ -20,7 +20,7 @@ import forge.util.RSSReader;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_URL_ATOM; import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM;
/** /**
* Controls the utilities submenu in the home UI. * Controls the utilities submenu in the home UI.
@@ -33,7 +33,7 @@ public enum CSubmenuDownloaders implements ICDoc {
SINGLETON_INSTANCE; SINGLETON_INSTANCE;
private final UiCommand cmdLicensing = VSubmenuDownloaders.SINGLETON_INSTANCE::showLicensing; private final UiCommand cmdLicensing = VSubmenuDownloaders.SINGLETON_INSTANCE::showLicensing;
private final UiCommand cmdCheckForUpdates = () -> new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_URL_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp()))); private final UiCommand cmdCheckForUpdates = () -> new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp())));
private final UiCommand cmdPicDownload = () -> new GuiDownloader(new GuiDownloadPicturesLQ()).show(); private final UiCommand cmdPicDownload = () -> new GuiDownloader(new GuiDownloadPicturesLQ()).show();
private final UiCommand cmdPicDownloadHQ = () -> new GuiDownloader(new GuiDownloadPicturesHQ()).show(); private final UiCommand cmdPicDownloadHQ = () -> new GuiDownloader(new GuiDownloadPicturesHQ()).show();

4
forge-gui-desktop/src/main/java/forge/view/FTitleBarBase.java
View File

@@ -28,7 +28,7 @@ import forge.toolbox.FSkin.SkinnedMenuBar;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.RSSReader; import forge.util.RSSReader;
import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_URL_ATOM; import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public abstract class FTitleBarBase extends SkinnedMenuBar { public abstract class FTitleBarBase extends SkinnedMenuBar {
@@ -438,7 +438,7 @@ public abstract class FTitleBarBase extends SkinnedMenuBar {
protected void onClick() { protected void onClick() {
if (!displayText.isEmpty()) { if (!displayText.isEmpty()) {
try { try {
new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_URL_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp()))); new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp())));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

10
forge-gui-mobile/src/forge/assets/AssetsDownloader.java
View File

@@ -24,9 +24,9 @@ import static forge.localinstance.properties.ForgeConstants.ADV_TEXTURE_BG_FILE;
import static forge.localinstance.properties.ForgeConstants.ASSETS_DIR; import static forge.localinstance.properties.ForgeConstants.ASSETS_DIR;
import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL;
import static forge.localinstance.properties.ForgeConstants.DEFAULT_SKINS_DIR; import static forge.localinstance.properties.ForgeConstants.DEFAULT_SKINS_DIR;
import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_URL_ATOM; import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM;
import static forge.localinstance.properties.ForgeConstants.GITHUB_FORGE_URL; import static forge.localinstance.properties.ForgeConstants.GITHUB_FORGE_URL;
import static forge.localinstance.properties.ForgeConstants.GITHUB_RELEASES_URL_ATOM; import static forge.localinstance.properties.ForgeConstants.GITHUB_RELEASES_ATOM;
import static forge.localinstance.properties.ForgeConstants.RELEASE_URL; import static forge.localinstance.properties.ForgeConstants.RELEASE_URL;
import static forge.localinstance.properties.ForgeConstants.RES_DIR; import static forge.localinstance.properties.ForgeConstants.RES_DIR;
@@ -68,7 +68,7 @@ public class AssetsDownloader {
boolean connectedToInternet = Forge.getDeviceAdapter().isConnectedToInternet(); boolean connectedToInternet = Forge.getDeviceAdapter().isConnectedToInternet();
if (connectedToInternet) { if (connectedToInternet) {
//currently for desktop/mobile-dev release on github //currently for desktop/mobile-dev release on github
final String releaseTag = Forge.getDeviceAdapter().getReleaseTag(GITHUB_RELEASES_URL_ATOM); final String releaseTag = Forge.getDeviceAdapter().getReleaseTag(GITHUB_RELEASES_ATOM);
try { try {
URL versionUrl = new URL(versionText); URL versionUrl = new URL(versionText);
String version = ""; String version = "";
@@ -117,7 +117,7 @@ public class AssetsDownloader {
message += " If so, you may want to connect to wifi first. The download is around " + (GuiBase.isAndroid() ? apkSize : packageSize) + "."; message += " If so, you may want to connect to wifi first. The download is around " + (GuiBase.isAndroid() ? apkSize : packageSize) + ".";
} }
if (!GuiBase.isAndroid()) { if (!GuiBase.isAndroid()) {
message += Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_URL_ATOM, null, null); message += Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_ATOM, null, null);
} }
//failed to grab latest github tag //failed to grab latest github tag
if (!isSnapshots && releaseTag.isEmpty()) { if (!isSnapshots && releaseTag.isEmpty()) {
@@ -210,7 +210,7 @@ public class AssetsDownloader {
} }
mandatory = true; mandatory = true;
build += "\nInstalled resources date:\n" + target + "\n"; build += "\nInstalled resources date:\n" + target + "\n";
log = Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_URL_ATOM, buildDate, snapsTimestamp); log = Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_ATOM, buildDate, snapsTimestamp);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }