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

Fix relative paths for files in install directory

Browse Source
This commit is contained in:
drdev
2014-04-10 00:10:19 +00:00
parent 525a18fbfa
commit f09112f747
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui/src/main/java/forge/interfaces/IGuiBase.java
View File

@@ -32,7 +32,8 @@ public interface IGuiBase {
void invokeInEdtLater(Runnable runnable); void invokeInEdtLater(Runnable runnable);
void invokeInEdtAndWait(final Runnable proc); void invokeInEdtAndWait(final Runnable proc);
boolean isGuiThread(); boolean isGuiThread();
String getAssetsRoot(); String getInstallRoot();
String getAssetsDir();
boolean mayShowCard(Card card); boolean mayShowCard(Card card);
void reportBug(String details); void reportBug(String details);
void reportException(Throwable ex); void reportException(Throwable ex);

11
forge-gui/src/main/java/forge/properties/ForgeConstants.java
View File

@@ -23,11 +23,12 @@ import java.util.Map;
import forge.GuiBase; import forge.GuiBase;
public final class ForgeConstants { public final class ForgeConstants {
public static final String PROFILE_FILE = "forge.profile.properties"; private static final String _INSTALL_ROOT = GuiBase.getInterface().getInstallRoot();
public static final String PROFILE_FILE = _INSTALL_ROOT + "forge.profile.properties";
public static final String PROFILE_TEMPLATE_FILE = PROFILE_FILE + ".example"; public static final String PROFILE_TEMPLATE_FILE = PROFILE_FILE + ".example";
// data that is only in the program dir // data that is only in the program dir
private static final String _ASSETS_ROOT = GuiBase.getInterface().getAssetsRoot(); private static final String _ASSETS_ROOT = _INSTALL_ROOT + GuiBase.getInterface().getAssetsDir();
private static final String _LIST_DIR = _ASSETS_ROOT + "lists/"; private static final String _LIST_DIR = _ASSETS_ROOT + "lists/";
public static final String KEYWORD_LIST_FILE = _LIST_DIR + "NonStackingKWList.txt"; public static final String KEYWORD_LIST_FILE = _LIST_DIR + "NonStackingKWList.txt";
@@ -41,7 +42,11 @@ public final class ForgeConstants {
public static final String IMAGE_LIST_QUEST_PRECONS_FILE = _LIST_DIR + "precon-images.txt"; public static final String IMAGE_LIST_QUEST_PRECONS_FILE = _LIST_DIR + "precon-images.txt";
public static final String IMAGE_LIST_QUEST_TOURNAMENTPACKS_FILE = _LIST_DIR + "tournamentpack-images.txt"; public static final String IMAGE_LIST_QUEST_TOURNAMENTPACKS_FILE = _LIST_DIR + "tournamentpack-images.txt";
public static final String TEXT_HOWTO_FILE = _ASSETS_ROOT + "howto.txt"; public static final String CHANGES_FILE = _INSTALL_ROOT + "CHANGES.txt";
public static final String LICENSE_FILE = _INSTALL_ROOT + "LICENSE.txt";
public static final String README_FILE = _INSTALL_ROOT + "README.txt";
public static final String HOWTO_FILE = _ASSETS_ROOT + "howto.txt";
public static final String DRAFT_DIR = _ASSETS_ROOT + "draft/"; public static final String DRAFT_DIR = _ASSETS_ROOT + "draft/";
public static final String DRAFT_RANKINGS_FILE = DRAFT_DIR + "rankings.txt"; public static final String DRAFT_RANKINGS_FILE = DRAFT_DIR + "rankings.txt";
public static final String SEALED_DIR = _ASSETS_ROOT + "sealed/"; public static final String SEALED_DIR = _ASSETS_ROOT + "sealed/";