From 05dc2eb39ed3a7619caebf0d908da2ec9a5929c4 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 6 Jan 2018 22:54:24 -0500 Subject: [PATCH] Consistently capitalize RuneLite --- README.md | 2 +- .../{RuneliteAPI.java => RuneLiteAPI.java} | 8 +++---- .../http/api/account/AccountClient.java | 20 ++++++++--------- .../http/api/config/ConfigClient.java | 22 +++++++++---------- .../http/api/examine/ExamineClient.java | 6 ++--- .../http/api/hiscore/HiscoreClient.java | 14 ++++++------ .../runelite/http/api/item/ItemClient.java | 14 ++++++------ .../api/updatecheck/UpdateCheckClient.java | 8 +++---- .../runelite/http/api/worlds/WorldClient.java | 8 +++---- .../runelite/http/api/xtea/XteaClient.java | 20 ++++++++--------- .../http/service/account/AccountService.java | 6 ++--- .../http/service/account/AuthFilter.java | 4 ++-- .../http/service/cache/CacheUpdater.java | 4 ++-- .../http/service/hiscore/HiscoreService.java | 4 ++-- .../http/service/item/ItemService.java | 10 ++++----- .../updatecheck/UpdateCheckService.java | 4 ++-- .../http/service/worlds/WorldsService.java | 4 ++-- http-service/src/main/webapp/WEB-INF/web.xml | 2 +- pom.xml | 6 ++--- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- .../net/runelite/client/ClientLoader.java | 8 +++---- .../net/runelite/client/ConfigLoader.java | 4 ++-- .../java/net/runelite/client/RuneLite.java | 6 ++--- ...uneliteModule.java => RuneLiteModule.java} | 12 +++++----- ...roperties.java => RuneLiteProperties.java} | 4 ++-- .../net/runelite/client/account/WSClient.java | 4 ++-- .../client/chat/ChatMessageManager.java | 6 ++--- .../runelite/client/config/ConfigManager.java | 2 +- ...uneliteConfig.java => RuneLiteConfig.java} | 6 ++--- .../client/plugins/PluginWatcher.java | 6 ++--- .../java/net/runelite/client/ui/ClientUI.java | 8 +++---- ...oduleTest.java => RuneLiteModuleTest.java} | 4 ++-- .../client/config/ConfigManagerTest.java | 2 +- .../client/plugins/PluginManagerTest.java | 6 ++--- runelite-mixins/pom.xml | 2 +- runelite-plugin-archetype/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 2 +- 38 files changed, 127 insertions(+), 127 deletions(-) rename http-api/src/main/java/net/runelite/http/api/{RuneliteAPI.java => RuneLiteAPI.java} (95%) rename runelite-client/src/main/java/net/runelite/client/{RuneliteModule.java => RuneLiteModule.java} (91%) rename runelite-client/src/main/java/net/runelite/client/{RuneliteProperties.java => RuneLiteProperties.java} (97%) rename runelite-client/src/main/java/net/runelite/client/config/{RuneliteConfig.java => RuneLiteConfig.java} (94%) rename runelite-client/src/test/java/net/runelite/client/{RuneliteModuleTest.java => RuneLiteModuleTest.java} (92%) diff --git a/README.md b/README.md index fcb2b7715a..a612d4ac09 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ For more information visit the [RuneLite Wiki](https://github.com/runelite/runel ### License -Most of Runelite is licensed under the BSD 2-clause license. See the license header in the respective file to be sure. +Most of RuneLite is licensed under the BSD 2-clause license. See the license header in the respective file to be sure. Some of the code, like everything in runescape-client, is automatically generated, and is not licensed. ## Contribute and Develop diff --git a/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java similarity index 95% rename from http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java rename to http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 80499ca8d5..6900482485 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -33,9 +33,9 @@ import okhttp3.OkHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RuneliteAPI +public class RuneLiteAPI { - private static final Logger logger = LoggerFactory.getLogger(RuneliteAPI.class); + private static final Logger logger = LoggerFactory.getLogger(RuneLiteAPI.class); public static final String RUNELITE_AUTH = "RUNELITE-AUTH"; @@ -52,7 +52,7 @@ public class RuneliteAPI { try { - InputStream in = RuneliteAPI.class.getResourceAsStream("/runelite.properties"); + InputStream in = RuneLiteAPI.class.getResourceAsStream("/runelite.properties"); properties.load(in); version = properties.getProperty("runelite.version"); @@ -81,7 +81,7 @@ public class RuneliteAPI public static void setVersion(String version) { - RuneliteAPI.version = version; + RuneLiteAPI.version = version; } public static int getRsVersion() diff --git a/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java b/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java index 21aa5683a0..b29742c9ea 100644 --- a/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java +++ b/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.UUID; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; @@ -53,7 +53,7 @@ public class AccountClient public OAuthResponse login() throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("account") .addPathSegment("login") .build(); @@ -64,10 +64,10 @@ public class AccountClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), OAuthResponse.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), OAuthResponse.class); } catch (JsonParseException ex) { @@ -77,7 +77,7 @@ public class AccountClient public void logout() throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("account") .addPathSegment("logout") .build(); @@ -85,11 +85,11 @@ public class AccountClient logger.debug("Built URI: {}", url); Request request = new Request.Builder() - .header(RuneliteAPI.RUNELITE_AUTH, uuid.toString()) + .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { logger.debug("Sent logout request"); } @@ -97,7 +97,7 @@ public class AccountClient public boolean sesssionCheck() { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("account") .addPathSegment("session-check") .build(); @@ -105,11 +105,11 @@ public class AccountClient logger.debug("Built URI: {}", url); Request request = new Request.Builder() - .header(RuneliteAPI.RUNELITE_AUTH, uuid.toString()) + .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { return response.isSuccessful(); } diff --git a/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java b/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java index 36f62ed7a9..a624bf0654 100644 --- a/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java +++ b/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.UUID; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.MediaType; import okhttp3.Request; @@ -53,21 +53,21 @@ public class ConfigClient public Configuration get() throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("config") .build(); logger.debug("Built URI: {}", url); Request request = new Request.Builder() - .header(RuneliteAPI.RUNELITE_AUTH, uuid.toString()) + .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), Configuration.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), Configuration.class); } catch (JsonParseException ex) { @@ -77,7 +77,7 @@ public class ConfigClient public void set(String key, String value) throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("config") .addPathSegment(key) .build(); @@ -86,11 +86,11 @@ public class ConfigClient Request request = new Request.Builder() .put(RequestBody.create(TEXT_PLAIN, value)) - .header(RuneliteAPI.RUNELITE_AUTH, uuid.toString()) + .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { logger.debug("Set configuration value '{}' to '{}'", key, value); } @@ -98,7 +98,7 @@ public class ConfigClient public void unset(String key) throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("config") .addPathSegment(key) .build(); @@ -107,11 +107,11 @@ public class ConfigClient Request request = new Request.Builder() .delete() - .header(RuneliteAPI.RUNELITE_AUTH, uuid.toString()) + .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { logger.debug("Unset configuration value '{}'", key); } diff --git a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java index b02b91b6a9..5b01ef2ee6 100644 --- a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java +++ b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java @@ -25,7 +25,7 @@ package net.runelite.http.api.examine; import java.io.IOException; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.MediaType; import okhttp3.Request; @@ -57,7 +57,7 @@ public class ExamineClient private void submit(String type, int id, String text) throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("examine") .addPathSegment(type) .addPathSegment(Integer.toString(id)) @@ -70,7 +70,7 @@ public class ExamineClient .post(RequestBody.create(TEXT, text)) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { logger.debug("Submitted examine info for {} {}: {}", type, id, text); diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java index c0843a5fed..3ec6cb5448 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java @@ -28,7 +28,7 @@ import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; @@ -41,7 +41,7 @@ public class HiscoreClient public HiscoreResult lookup(String username, HiscoreEndpoint endpoint) throws IOException { - HttpUrl.Builder builder = RuneliteAPI.getApiBase().newBuilder() + HttpUrl.Builder builder = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("hiscore") .addPathSegment(endpoint.name().toLowerCase()) .addQueryParameter("username", username); @@ -54,10 +54,10 @@ public class HiscoreClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), HiscoreResult.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), HiscoreResult.class); } catch (JsonParseException ex) { @@ -72,7 +72,7 @@ public class HiscoreClient public SingleHiscoreSkillResult lookup(String username, HiscoreSkill skill, HiscoreEndpoint endpoint) throws IOException { - HttpUrl.Builder builder = RuneliteAPI.getApiBase().newBuilder() + HttpUrl.Builder builder = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("hiscore") .addPathSegment(endpoint.name()) .addPathSegment(skill.toString().toLowerCase()) @@ -86,10 +86,10 @@ public class HiscoreClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), SingleHiscoreSkillResult.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), SingleHiscoreSkillResult.class); } catch (JsonParseException ex) { diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java b/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java index 62cdb0404f..f8c8ab2b5a 100644 --- a/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java +++ b/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java @@ -28,7 +28,7 @@ import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; @@ -41,7 +41,7 @@ public class ItemClient public ItemPrice lookupItemPrice(int itemId) throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("item") .addPathSegment("" + itemId) .addPathSegment("price") @@ -53,7 +53,7 @@ public class ItemClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -62,7 +62,7 @@ public class ItemClient } InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), ItemPrice.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), ItemPrice.class); } catch (JsonParseException ex) { @@ -72,7 +72,7 @@ public class ItemClient public SearchResult search(String itemName) throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("item") .addPathSegment("search") .addQueryParameter("query", itemName) @@ -84,7 +84,7 @@ public class ItemClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -93,7 +93,7 @@ public class ItemClient } InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), SearchResult.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), SearchResult.class); } catch (JsonParseException ex) { diff --git a/http-api/src/main/java/net/runelite/http/api/updatecheck/UpdateCheckClient.java b/http-api/src/main/java/net/runelite/http/api/updatecheck/UpdateCheckClient.java index a233cf7900..157221a554 100644 --- a/http-api/src/main/java/net/runelite/http/api/updatecheck/UpdateCheckClient.java +++ b/http-api/src/main/java/net/runelite/http/api/updatecheck/UpdateCheckClient.java @@ -28,7 +28,7 @@ import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; @@ -42,7 +42,7 @@ public class UpdateCheckClient public boolean isOutdated() { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("update-check") .build(); @@ -52,12 +52,12 @@ public class UpdateCheckClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { ResponseBody body = response.body(); InputStream in = body.byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), boolean.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), boolean.class); } catch (JsonParseException | IOException ex) { diff --git a/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java b/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java index deacdf477a..27e8a950d8 100644 --- a/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java +++ b/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java @@ -26,7 +26,7 @@ package net.runelite.http.api.worlds; import com.google.gson.JsonParseException; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; @@ -43,7 +43,7 @@ public class WorldClient public WorldResult lookupWorlds() throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("worlds") .build(); @@ -53,7 +53,7 @@ public class WorldClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -62,7 +62,7 @@ public class WorldClient } InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), WorldResult.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), WorldResult.class); } catch (JsonParseException ex) { diff --git a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java index 76aed2e0a0..fb13e5a3be 100644 --- a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.List; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.MediaType; import okhttp3.Request; @@ -56,9 +56,9 @@ public class XteaClient xteaRequest.addKey(xteaKey); - String json = RuneliteAPI.GSON.toJson(xteaRequest); + String json = RuneLiteAPI.GSON.toJson(xteaRequest); - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("xtea") .build(); @@ -69,12 +69,12 @@ public class XteaClient .url(url) .build(); - return RuneliteAPI.CLIENT.newCall(request).execute(); + return RuneLiteAPI.CLIENT.newCall(request).execute(); } public List get() throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("xtea") .build(); @@ -82,11 +82,11 @@ public class XteaClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { InputStream in = response.body().byteStream(); // CHECKSTYLE:OFF - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() { }.getType()); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() { }.getType()); // CHECKSTYLE:ON } catch (JsonParseException ex) @@ -97,7 +97,7 @@ public class XteaClient public XteaKey get(int region) throws IOException { - HttpUrl url = RuneliteAPI.getApiBase().newBuilder() + HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("xtea") .addPathSegment(Integer.toString(region)) .build(); @@ -106,10 +106,10 @@ public class XteaClient .url(url) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), XteaKey.class); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), XteaKey.class); } catch (JsonParseException ex) { diff --git a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java index ecf0896137..3b12d5eb97 100644 --- a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java +++ b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java @@ -39,7 +39,7 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.account.OAuthResponse; import net.runelite.http.api.ws.messages.LoginResponse; import net.runelite.http.service.ws.SessionManager; @@ -88,7 +88,7 @@ public class AccountService private static final String RL_OAUTH_URL = "https://api.runelite.net/oauth/"; private static final String RL_REDIR = "http://runelite.net/logged-in"; - private final Gson gson = RuneliteAPI.GSON; + private final Gson gson = RuneLiteAPI.GSON; private final Sql2o sql2o; private final String oauthClientId; @@ -135,7 +135,7 @@ public class AccountService State state = new State(); state.setUuid(uuid); - state.setApiVersion(RuneliteAPI.getVersion()); + state.setApiVersion(RuneLiteAPI.getVersion()); OAuth20Service service = new ServiceBuilder() .apiKey(oauthClientId) diff --git a/http-service/src/main/java/net/runelite/http/service/account/AuthFilter.java b/http-service/src/main/java/net/runelite/http/service/account/AuthFilter.java index 2e4e464774..1f57127bf5 100644 --- a/http-service/src/main/java/net/runelite/http/service/account/AuthFilter.java +++ b/http-service/src/main/java/net/runelite/http/service/account/AuthFilter.java @@ -31,7 +31,7 @@ import java.time.Instant; import java.util.UUID; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -51,7 +51,7 @@ public class AuthFilter public SessionEntry handle(HttpServletRequest request, HttpServletResponse response) throws IOException { - String runeliteAuth = request.getHeader(RuneliteAPI.RUNELITE_AUTH); + String runeliteAuth = request.getHeader(RuneLiteAPI.RUNELITE_AUTH); if (runeliteAuth == null) { response.sendError(401, "Access denied"); diff --git a/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java b/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java index 6dd30700c3..8f75f95f64 100644 --- a/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java +++ b/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java @@ -37,7 +37,7 @@ import net.runelite.cache.client.CacheClient; import net.runelite.cache.client.IndexInfo; import net.runelite.cache.fs.Archive; import net.runelite.cache.fs.Store; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.service.cache.beans.CacheEntry; import net.runelite.http.service.cache.beans.IndexEntry; import net.runelite.protocol.api.login.HandshakeResponseType; @@ -76,7 +76,7 @@ public class CacheUpdater @RequestMapping("/update") public void check() throws IOException, InvalidEndpointException, InvalidPortException, InterruptedException { - int rsVersion = RuneliteAPI.getRsVersion(); + int rsVersion = RuneLiteAPI.getRsVersion(); try (Connection con = sql2o.beginTransaction()) { diff --git a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java index 20fe4546dc..eab9a84428 100644 --- a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java +++ b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java @@ -25,7 +25,7 @@ package net.runelite.http.service.hiscore; import java.io.IOException; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreResult; import net.runelite.http.api.hiscore.HiscoreSkill; @@ -75,7 +75,7 @@ public class HiscoreService String responseStr; - try (Response okresponse = RuneliteAPI.CLIENT.newCall(okrequest).execute()) + try (Response okresponse = RuneLiteAPI.CLIENT.newCall(okrequest).execute()) { if (!okresponse.isSuccessful()) { diff --git a/http-service/src/main/java/net/runelite/http/service/item/ItemService.java b/http-service/src/main/java/net/runelite/http/service/item/ItemService.java index 13edad19cd..52ca301735 100644 --- a/http-service/src/main/java/net/runelite/http/service/item/ItemService.java +++ b/http-service/src/main/java/net/runelite/http/service/item/ItemService.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.item.Item; import net.runelite.http.api.item.ItemPrice; import net.runelite.http.api.item.ItemType; @@ -93,7 +93,7 @@ public class ItemService private static final String CREATE_PRICES_IDX = "ALTER TABLE `prices`\n" + " ADD UNIQUE KEY `item` (`item`,`time`);"; - private static final String RUNELITE_CACHE = "Runelite-Cache"; + private static final String RUNELITE_CACHE = "RuneLite-Cache"; private final Sql2o sql2o; private final Cache cachedSearches = CacheBuilder.newBuilder() @@ -486,7 +486,7 @@ public class ItemService private T fetchJson(Request request, Class clazz) throws IOException { - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -494,7 +494,7 @@ public class ItemService } InputStream in = response.body().byteStream(); - return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), clazz); + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), clazz); } catch (JsonParseException ex) { @@ -510,7 +510,7 @@ public class ItemService .url(httpUrl) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute()) + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { if (!response.isSuccessful()) { diff --git a/http-service/src/main/java/net/runelite/http/service/updatecheck/UpdateCheckService.java b/http-service/src/main/java/net/runelite/http/service/updatecheck/UpdateCheckService.java index 5328edde18..fa9f25d8c1 100644 --- a/http-service/src/main/java/net/runelite/http/service/updatecheck/UpdateCheckService.java +++ b/http-service/src/main/java/net/runelite/http/service/updatecheck/UpdateCheckService.java @@ -35,7 +35,7 @@ import java.nio.ByteBuffer; import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.worlds.WorldResult; import net.runelite.http.service.worlds.WorldsService; import org.slf4j.Logger; @@ -96,7 +96,7 @@ public class UpdateCheckService { ByteBuffer buffer = ByteBuffer.allocate(5); buffer.put(HANDSHAKE_TYPE); - buffer.putInt(RuneliteAPI.getRsVersion()); + buffer.putInt(RuneLiteAPI.getRsVersion()); InputStream is = socket.getInputStream(); OutputStream os = socket.getOutputStream(); diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java b/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java index d44e6cf175..8dd9acd4b0 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/WorldsService.java @@ -29,7 +29,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldResult; import net.runelite.http.api.worlds.WorldType; @@ -56,7 +56,7 @@ public class WorldsService byte[] b; - try (Response okresponse = RuneliteAPI.CLIENT.newCall(okrequest).execute()) + try (Response okresponse = RuneLiteAPI.CLIENT.newCall(okrequest).execute()) { b = okresponse.body().bytes(); } diff --git a/http-service/src/main/webapp/WEB-INF/web.xml b/http-service/src/main/webapp/WEB-INF/web.xml index df6faa44b8..0b07dbb973 100644 --- a/http-service/src/main/webapp/WEB-INF/web.xml +++ b/http-service/src/main/webapp/WEB-INF/web.xml @@ -28,5 +28,5 @@ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - Runelite API + RuneLite API \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2afa34908e..524412fe13 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 1.2.11-SNAPSHOT pom - Runelite + RuneLite Open source RuneScape client and deobfuscator http://runelite.net @@ -90,14 +90,14 @@ runelite - Runelite + RuneLite http://repo.runelite.net runelite-plugins - Runelite Plugins + RuneLite Plugins http://repo.runelite.net diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 85057d009e..c7370961a8 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -34,7 +34,7 @@ net.runelite api - Runelite API + RuneLite API diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index d260b5395d..fdb5ed2ddc 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -34,7 +34,7 @@ net.runelite client - Runelite Client + RuneLite Client 1.7.12 diff --git a/runelite-client/src/main/java/net/runelite/client/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/ClientLoader.java index 82b4614332..8e2452551c 100644 --- a/runelite-client/src/main/java/net/runelite/client/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/ClientLoader.java @@ -44,12 +44,12 @@ public class ClientLoader { if (isOutdated) { - log.info("Runelite is outdated - fetching vanilla client"); + log.info("RuneLite is outdated - fetching vanilla client"); return Optional.of(loadVanilla()); } - log.debug("Runelite is up to date"); - return Optional.of(loadRunelite()); + log.debug("RuneLite is up to date"); + return Optional.of(loadRuneLite()); } catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException e) { @@ -65,7 +65,7 @@ public class ClientLoader } } - private Applet loadRunelite() throws ClassNotFoundException, IOException, InstantiationException, IllegalAccessException + private Applet loadRuneLite() throws ClassNotFoundException, IOException, InstantiationException, IllegalAccessException { ConfigLoader config = new ConfigLoader(); diff --git a/runelite-client/src/main/java/net/runelite/client/ConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/ConfigLoader.java index a7897760dc..e5581ad148 100644 --- a/runelite-client/src/main/java/net/runelite/client/ConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/ConfigLoader.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.HashMap; import java.util.Map; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; @@ -51,7 +51,7 @@ public class ConfigLoader .url(CONFIG_URL) .build(); - try (Response response = RuneliteAPI.CLIENT.newCall(request).execute(); + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute(); BufferedReader in = new BufferedReader(new InputStreamReader(response.body().byteStream()))) { String str; diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 8512466da8..f2821ba2d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -58,7 +58,7 @@ public class RuneLite private static OptionSet options; @Inject - private RuneliteProperties properties; + private RuneLiteProperties properties; @Inject private PluginManager pluginManager; @@ -98,13 +98,13 @@ public class RuneLite PROFILES_DIR.mkdirs(); - setInjector(Guice.createInjector(new RuneliteModule())); + setInjector(Guice.createInjector(new RuneLiteModule())); injector.getInstance(RuneLite.class).start(); } public void start() throws Exception { - // Load Runelite or Vanilla client + // Load RuneLite or Vanilla client final boolean hasRs = !getOptions().has("no-rs"); final Optional optionalClient = hasRs ? new ClientLoader().loadRs() diff --git a/runelite-client/src/main/java/net/runelite/client/RuneliteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java similarity index 91% rename from runelite-client/src/main/java/net/runelite/client/RuneliteModule.java rename to runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index e8c6ca5552..abd211e8d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneliteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -36,7 +36,6 @@ import net.runelite.api.Client; import net.runelite.client.account.SessionManager; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; -import net.runelite.client.config.RuneliteConfig; import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.PluginManager; @@ -44,9 +43,10 @@ import net.runelite.client.task.Scheduler; import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.util.QueryRunner; +import net.runelite.client.config.RuneLiteConfig; @Slf4j -public class RuneliteModule extends AbstractModule +public class RuneLiteModule extends AbstractModule { @Override protected void configure() @@ -59,7 +59,7 @@ public class RuneliteModule extends AbstractModule bind(InfoBoxManager.class); bind(Scheduler.class); bind(PluginManager.class); - bind(RuneliteProperties.class); + bind(RuneLiteProperties.class); bind(SessionManager.class); } @@ -83,16 +83,16 @@ public class RuneliteModule extends AbstractModule @Provides @Singleton - RuneliteConfig provideConfig(ConfigManager configManager) + RuneLiteConfig provideConfig(ConfigManager configManager) { - return configManager.getConfig(RuneliteConfig.class); + return configManager.getConfig(RuneLiteConfig.class); } @Provides @Singleton EventBus provideEventBus() { - return new EventBus(RuneliteModule::eventExceptionHandler); + return new EventBus(RuneLiteModule::eventExceptionHandler); } private static void eventExceptionHandler(Throwable exception, SubscriberExceptionContext context) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneliteProperties.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java similarity index 97% rename from runelite-client/src/main/java/net/runelite/client/RuneliteProperties.java rename to runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java index 9701c05459..557bc675b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneliteProperties.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java @@ -34,7 +34,7 @@ import javax.inject.Singleton; @Singleton @Slf4j -public class RuneliteProperties +public class RuneLiteProperties { private static final String RUNELITE_TITLE = "runelite.title"; private static final String RUNELITE_VERSION = "runelite.version"; @@ -42,7 +42,7 @@ public class RuneliteProperties private final Properties properties = new Properties(); @Inject - public RuneliteProperties() + public RuneLiteProperties() { InputStream in = getClass().getResourceAsStream("runelite.properties"); try diff --git a/runelite-client/src/main/java/net/runelite/client/account/WSClient.java b/runelite-client/src/main/java/net/runelite/client/account/WSClient.java index f5c457d455..005698d6e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/account/WSClient.java +++ b/runelite-client/src/main/java/net/runelite/client/account/WSClient.java @@ -32,7 +32,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import net.runelite.http.api.RuneliteAPI; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.ws.WebsocketGsonFactory; import net.runelite.http.api.ws.WebsocketMessage; import net.runelite.http.api.ws.messages.Handshake; @@ -72,7 +72,7 @@ public class WSClient extends WebSocketListener implements AutoCloseable public void connect() { Request request = new Request.Builder() - .url(RuneliteAPI.getWsEndpoint()) + .url(RuneLiteAPI.getWsEndpoint()) .build(); webSocket = client.newWebSocket(request, this); diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index 73b2a6ce4e..306187dfc3 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -46,9 +46,9 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.Varbits; -import net.runelite.client.config.RuneliteConfig; import net.runelite.client.events.ResizeableChanged; import net.runelite.client.events.VarbitChanged; +import net.runelite.client.config.RuneLiteConfig; @Slf4j @Singleton @@ -57,12 +57,12 @@ public class ChatMessageManager private final Map> colorCache = new HashMap<>(); private final Provider clientProvider; private final ScheduledExecutorService executor; - private final RuneliteConfig config; + private final RuneLiteConfig config; private int transparancyVarbit = -1; private final Queue queuedMessages = new ConcurrentLinkedQueue<>(); @Inject - public ChatMessageManager(Provider clientProvider, ScheduledExecutorService executor, RuneliteConfig config) + public ChatMessageManager(Provider clientProvider, ScheduledExecutorService executor, RuneLiteConfig config) { this.clientProvider = clientProvider; this.executor = executor; diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index 5ffb1dff89..ba084cbe63 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -222,7 +222,7 @@ public class ConfigManager try (FileOutputStream out = new FileOutputStream(propertiesFile)) { - properties.store(out, "Runelite configuration"); + properties.store(out, "RuneLite configuration"); } } diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneliteConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java similarity index 94% rename from runelite-client/src/main/java/net/runelite/client/config/RuneliteConfig.java rename to runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java index ce517231c8..5dc36f517d 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneliteConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java @@ -26,10 +26,10 @@ package net.runelite.client.config; @ConfigGroup( keyName = "runelite", - name = "Runelite", - description = "Configuration for Runelite client options" + name = "RuneLite", + description = "Configuration for RuneLite client options" ) -public interface RuneliteConfig extends Config +public interface RuneLiteConfig extends Config { @ConfigItem( keyName = "chatCommandsRecolorEnabled", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java index 75f3ed1d86..cea1491dc5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java @@ -45,7 +45,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.client.RuneLite; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigManager; -import net.runelite.client.config.RuneliteConfig; +import net.runelite.client.config.RuneLiteConfig; @Singleton @Slf4j @@ -53,7 +53,7 @@ public class PluginWatcher extends Thread { private static final File BASE = RuneLite.PLUGIN_DIR; - private final RuneliteConfig runeliteConfig; + private final RuneLiteConfig runeliteConfig; private final PluginManager pluginManager; private final WatchService watchService; private final WatchKey watchKey; @@ -62,7 +62,7 @@ public class PluginWatcher extends Thread private ConfigManager configManager; @Inject - public PluginWatcher(RuneliteConfig runeliteConfig, PluginManager pluginManager) throws IOException + public PluginWatcher(RuneLiteConfig runeliteConfig, PluginManager pluginManager) throws IOException { this.runeliteConfig = runeliteConfig; this.pluginManager = pluginManager; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index b3e911b107..ac6870f780 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -58,7 +58,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.client.RuneliteProperties; +import net.runelite.client.RuneLiteProperties; import org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel; import org.pushingpixels.substance.internal.ui.SubstanceRootPaneUI; @@ -74,7 +74,7 @@ public class ClientUI extends JFrame private TrayIcon trayIcon; private final Applet client; - private final RuneliteProperties properties; + private final RuneLiteProperties properties; private JPanel container; private JPanel navContainer; private PluginToolbar pluginToolbar; @@ -96,7 +96,7 @@ public class ClientUI extends JFrame ICON = icon; } - public static ClientUI create(RuneliteProperties properties, Applet client) + public static ClientUI create(RuneLiteProperties properties, Applet client) { // Force heavy-weight popups/tooltips. // Prevents them from being obscured by the game applet. @@ -131,7 +131,7 @@ public class ClientUI extends JFrame return new ClientUI(properties, client); } - private ClientUI(RuneliteProperties properties, Applet client) + private ClientUI(RuneLiteProperties properties, Applet client) { this.properties = properties; this.client = client; diff --git a/runelite-client/src/test/java/net/runelite/client/RuneliteModuleTest.java b/runelite-client/src/test/java/net/runelite/client/RuneLiteModuleTest.java similarity index 92% rename from runelite-client/src/test/java/net/runelite/client/RuneliteModuleTest.java rename to runelite-client/src/test/java/net/runelite/client/RuneLiteModuleTest.java index 21c4ce5fad..044209c5e4 100644 --- a/runelite-client/src/test/java/net/runelite/client/RuneliteModuleTest.java +++ b/runelite-client/src/test/java/net/runelite/client/RuneLiteModuleTest.java @@ -27,12 +27,12 @@ package net.runelite.client; import com.google.inject.Guice; import org.junit.Test; -public class RuneliteModuleTest +public class RuneLiteModuleTest { @Test public void testConfigure() { - Guice.createInjector(new RuneliteModule()); + Guice.createInjector(new RuneLiteModule()); } diff --git a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java index 95e2dd56fc..6b7f289bca 100644 --- a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java @@ -54,7 +54,7 @@ public class ConfigManagerTest @Mock @Bind - RuneliteConfig runeliteConfig; + RuneLiteConfig runeliteConfig; @Inject ConfigManager manager; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java index c8b2e15d10..a8b01b5572 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; import joptsimple.OptionSet; import net.runelite.client.RuneLite; -import net.runelite.client.RuneliteModule; +import net.runelite.client.RuneLiteModule; import net.runelite.client.ui.ClientUI; import org.junit.Before; import org.junit.Rule; @@ -61,7 +61,7 @@ public class PluginManagerTest { RuneLite.setOptions(mock(OptionSet.class)); - Injector injector = Guice.createInjector(new RuneliteModule(), + Injector injector = Guice.createInjector(new RuneLiteModule(), BoundFieldModule.of(this)); RuneLite.setInjector(injector); // test with no client bound @@ -82,7 +82,7 @@ public class PluginManagerTest { List modules = new ArrayList<>(); modules.add(new GraphvizModule()); - modules.add(new RuneliteModule()); + modules.add(new RuneLiteModule()); PluginManager pluginManager = new PluginManager(); pluginManager.loadCorePlugins(); diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index b0d8f45656..8aff305dad 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -34,7 +34,7 @@ net.runelite mixins - Runelite Mixins + RuneLite Mixins diff --git a/runelite-plugin-archetype/pom.xml b/runelite-plugin-archetype/pom.xml index 22cc0684b6..f57f8541f6 100644 --- a/runelite-plugin-archetype/pom.xml +++ b/runelite-plugin-archetype/pom.xml @@ -34,7 +34,7 @@ runelite-plugin-archetype maven-archetype - Runelite Plugin Archetype + RuneLite Plugin Archetype diff --git a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml index 7b5a41a31e..7994fd1f77 100644 --- a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml +++ b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml @@ -15,7 +15,7 @@ runelite - Runelite + RuneLite http://repo.runelite.net