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

Merge pull request #6428 from kevlahnota/master2

Browse Source 
fix GameLauncher
This commit is contained in:
kevlahnota
2024-10-25 19:57:43 +08:00
committed by GitHub
parent bd3bf824ed 6f3debba7a
commit 6362796df5
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-gui-mobile-dev/src/forge/app/GameLauncher.java
View File

@@ -16,19 +16,7 @@ import java.nio.file.Paths;
public class GameLauncher { public class GameLauncher {
public GameLauncher(final String versionString) { public GameLauncher(final String versionString) {
// Set this to "true" to make the mobile game port run as a full-screen desktop application String assetsDir = Files.exists(Paths.get("./res")) ? "./" : "../forge-gui/";
boolean desktopMode = true;//cmd.hasOption("fullscreen");
// Set this to the location where you want the mobile game port to look for assets when working as a full-screen desktop application
// (uncomment the bottom version and comment the top one to load the res folder from the current folder the .jar is in if you would
// like to make the game load from a desktop game folder configuration).
//String desktopModeAssetsDir = "../forge-gui/";
String desktopModeAssetsDir = "./";
if (!Files.exists(Paths.get(desktopModeAssetsDir + "res")))
desktopModeAssetsDir = "../forge-gui/";//try IDE run
String assetsDir = "./";
if (!Files.exists(Paths.get(assetsDir + "res")))
assetsDir = "../forge-gui/";
// Place the file "switch_orientation.ini" to your assets folder to make the game switch to landscape orientation (unless desktopMode = true) // Place the file "switch_orientation.ini" to your assets folder to make the game switch to landscape orientation (unless desktopMode = true)
String switchOrientationFile = assetsDir + "switch_orientation.ini"; String switchOrientationFile = assetsDir + "switch_orientation.ini";
@@ -39,7 +27,7 @@ public class GameLauncher {
Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration(); Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
config.setResizable(false); config.setResizable(false);
ApplicationListener start = Forge.getApp(new Lwjgl3Clipboard(), new Main.DesktopAdapter(switchOrientationFile),//todo get totalRAM && isTabletDevice ApplicationListener start = Forge.getApp(new Lwjgl3Clipboard(), new Main.DesktopAdapter(switchOrientationFile),//todo get totalRAM && isTabletDevice
desktopMode ? desktopModeAssetsDir : assetsDir, false, false, 0, false, 0, "", ""); assetsDir, false, false, 0, false, 0, "", "");
if (Config.instance().getSettingData().fullScreen) { if (Config.instance().getSettingData().fullScreen) {
config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode()); config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode());
config.setAutoIconify(true); config.setAutoIconify(true);
@@ -58,8 +46,7 @@ public class GameLauncher {
} }
}); });
if (desktopMode) config.setHdpiMode(HdpiMode.Logical);
config.setHdpiMode(HdpiMode.Logical);
new Lwjgl3Application(start, config); new Lwjgl3Application(start, config);
} }

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

@@ -42,8 +42,7 @@ public class AssetsDownloader {
return; return;
} }
} }
//currently for desktop/mobile-dev release on github
final String releaseTag = Forge.getDeviceAdapter().getReleaseTag(GITHUB_RELEASES_URL_ATOM);
final String packageSize = GuiBase.isAndroid() ? "160MB" : "270MB"; final String packageSize = GuiBase.isAndroid() ? "160MB" : "270MB";
final String apkSize = "12MB"; final String apkSize = "12MB";
@@ -58,6 +57,8 @@ public class AssetsDownloader {
String message; String message;
boolean connectedToInternet = Forge.getDeviceAdapter().isConnectedToInternet(); boolean connectedToInternet = Forge.getDeviceAdapter().isConnectedToInternet();
if (connectedToInternet) { if (connectedToInternet) {
//currently for desktop/mobile-dev release on github
final String releaseTag = Forge.getDeviceAdapter().getReleaseTag(GITHUB_RELEASES_URL_ATOM);
try { try {
URL versionUrl = new URL(versionText); URL versionUrl = new URL(versionText);
String version = FileUtil.readFileToString(versionUrl); String version = FileUtil.readFileToString(versionUrl);