From fc64be1c4a06e7dec9293d60f8a95fe8726c0656 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Tue, 18 Oct 2016 00:31:42 +0200 Subject: [PATCH 1/2] [BUGFIX] Solved issue with overridding files --- src/main/java/org/parabot/core/ProjectProperties.java | 2 +- .../resources/storage/{app.properties => parabot.properties} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/storage/{app.properties => parabot.properties} (100%) diff --git a/src/main/java/org/parabot/core/ProjectProperties.java b/src/main/java/org/parabot/core/ProjectProperties.java index b6f58e0..d905a29 100644 --- a/src/main/java/org/parabot/core/ProjectProperties.java +++ b/src/main/java/org/parabot/core/ProjectProperties.java @@ -21,7 +21,7 @@ public class ProjectProperties { private void setProperties() { InputStream input; try { - String propertiesFileName = "storage/app.properties"; + String propertiesFileName = "storage/parabot.properties"; input = getClass().getClassLoader() .getResourceAsStream(propertiesFileName); diff --git a/src/main/resources/storage/app.properties b/src/main/resources/storage/parabot.properties similarity index 100% rename from src/main/resources/storage/app.properties rename to src/main/resources/storage/parabot.properties From 5fa29675a7c74f84ae5da11419f0f07aa66cd124 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Tue, 18 Oct 2016 00:31:56 +0200 Subject: [PATCH 2/2] [CLEANUP] Added configuration API extension --- src/main/java/org/parabot/core/Configuration.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index 1b10eb4..d800e6e 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -7,7 +7,7 @@ import org.parabot.environment.api.utils.Version; * * @author Everel */ -public class Configuration { +public class Configuration extends org.parabot.api.Configuration { public static final String LOGIN_SERVER = "http://bdn.parabot.org/api/v2/users/login"; public static final String GET_SCRIPTS = "http://bdn.parabot.org/api/get.php?action=scripts_scripts&server="; public static final String GET_SCRIPT = "http://bdn.parabot.org/api/get.php?action=scripts_script&id="; @@ -23,13 +23,7 @@ public class Configuration { public static final String DATA_API = "http://bdn.parabot.org/api/v2/data/"; public static final String ITEM_API = DATA_API + "items/"; - public static final String COMPARE_VERSION_URL = "http://v3.bdn.parabot.org/api/bot/compare/%s/%s"; - public static final String COMPARE_CHECKSUM_URL = "http://v3.bdn.parabot.org/api/bot/checksum/%s/%s"; - public static final Version BOT_VERSION = ProjectProperties.getProjectVersion(); - public static final String BOT_TITLE = "Parabot"; - public static final String BOT_SLOGAN = "The best RuneScape private server bot"; - public static final String NIGHTLY_APPEND = "nightly=true"; }