Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-24 19:23:01 +08:00
Code Issues Projects Releases Wiki Activity

Implement hiding in-game icons

Browse Source 
this will also enable exception showing if 'DEBUG' is enabled
This commit is contained in:
KingRainbow44 2023-05-02 21:35:17 -04:00
parent c464396d10
commit 93a3276f75
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
View File

@ -2,6 +2,8 @@ package emu.grasscutter.server.http.dispatch;
import static emu.grasscutter.config.Configuration.*; import static emu.grasscutter.config.Configuration.*;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import emu.grasscutter.GameConstants; import emu.grasscutter.GameConstants;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
@ -17,6 +19,7 @@ import emu.grasscutter.server.event.dispatch.QueryCurrentRegionEvent;
import emu.grasscutter.server.http.Router; import emu.grasscutter.server.http.Router;
import emu.grasscutter.server.http.objects.QueryCurRegionRspJson; import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
import emu.grasscutter.utils.Crypto; import emu.grasscutter.utils.Crypto;
import emu.grasscutter.utils.JsonUtils;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
import io.javalin.Javalin; import io.javalin.Javalin;
import io.javalin.http.Context; import io.javalin.http.Context;
@ -30,7 +33,7 @@ import org.slf4j.Logger;
public final class RegionHandler implements Router { public final class RegionHandler implements Router {
private static final Map<String, RegionData> regions = new ConcurrentHashMap<>(); private static final Map<String, RegionData> regions = new ConcurrentHashMap<>();
private static String regionListResponse; private static String regionListResponse;
private static String regionListResponsecn; private static String regionListResponseCN;
public RegionHandler() { public RegionHandler() {
try { // Read & initialize region data. try { // Read & initialize region data.
@ -42,7 +45,7 @@ public final class RegionHandler implements Router {
/** Configures region data according to configuration. */ /** Configures region data according to configuration. */
private void initialize() { private void initialize() {
String dispatchDomain = var dispatchDomain =
"http" "http"
+ (HTTP_ENCRYPTION.useInRouting ? "s" : "") + (HTTP_ENCRYPTION.useInRouting ? "s" : "")
+ "://" + "://"
@ -51,8 +54,8 @@ public final class RegionHandler implements Router {
+ lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort); + lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort);
// Create regions. // Create regions.
List<RegionSimpleInfo> servers = new ArrayList<>(); var servers = new ArrayList<RegionSimpleInfo>();
List<String> usedNames = new ArrayList<>(); // List to check for potential naming conflicts. var usedNames = new ArrayList<String>(); // List to check for potential naming conflicts.
var configuredRegions = new ArrayList<>(List.of(DISPATCH_INFO.regions)); var configuredRegions = new ArrayList<>(List.of(DISPATCH_INFO.regions));
if (SERVER.runMode != ServerRunMode.HYBRID && configuredRegions.size() == 0) { if (SERVER.runMode != ServerRunMode.HYBRID && configuredRegions.size() == 0) {
@ -101,18 +104,32 @@ public final class RegionHandler implements Router {
updatedQuery, Utils.base64Encode(updatedQuery.toByteString().toByteArray()))); updatedQuery, Utils.base64Encode(updatedQuery.toByteString().toByteArray())));
}); });
// Determine config settings.
var hiddenIcons = new JsonArray();
hiddenIcons.add(40);
var showExceptions = GameConstants.DEBUG;
// Create a config object. // Create a config object.
byte[] customConfig = var customConfig = new JsonObject();
"{\"sdkenv\":\"2\",\"checkdevice\":\"false\",\"loadPatch\":\"false\",\"showexception\":\"false\",\"regionConfig\":\"pm|fk|add\",\"downloadMode\":\"0\"}" customConfig.addProperty("sdkenv", "2");
.getBytes(); customConfig.addProperty("checkdevice", "false");
Crypto.xor(customConfig, Crypto.DISPATCH_KEY); // XOR the config with the key. customConfig.addProperty("loadPatch", "false");
customConfig.addProperty("showexception",
String.valueOf(showExceptions));
customConfig.addProperty("regionConfig", "pm|fk|add");
customConfig.addProperty("downloadMode", "0");
customConfig.add("coverSwitch", hiddenIcons);
// XOR the config with the key.
var encodedConfig = JsonUtils.encode(customConfig).getBytes();
Crypto.xor(encodedConfig, Crypto.DISPATCH_KEY);
// Create an updated region list. // Create an updated region list.
QueryRegionListHttpRsp updatedRegionList = var updatedRegionList =
QueryRegionListHttpRsp.newBuilder() QueryRegionListHttpRsp.newBuilder()
.addAllRegionList(servers) .addAllRegionList(servers)
.setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED)) .setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
.setClientCustomConfigEncrypted(ByteString.copyFrom(customConfig)) .setClientCustomConfigEncrypted(ByteString.copyFrom(encodedConfig))
.setEnableLoginPc(true) .setEnableLoginPc(true)
.build(); .build();
@ -120,23 +137,23 @@ public final class RegionHandler implements Router {
regionListResponse = Utils.base64Encode(updatedRegionList.toByteString().toByteArray()); regionListResponse = Utils.base64Encode(updatedRegionList.toByteString().toByteArray());
// CN // CN
// Create a config object. // Modify the existing config option.
byte[] customConfigcn = customConfig.addProperty("sdkenv", "0");
"{\"sdkenv\":\"0\",\"checkdevice\":\"true\",\"loadPatch\":\"false\",\"showexception\":\"false\",\"regionConfig\":\"pm|fk|add\",\"downloadMode\":\"0\"}" // XOR the config with the key.
.getBytes(); encodedConfig = JsonUtils.encode(customConfig).getBytes();
Crypto.xor(customConfigcn, Crypto.DISPATCH_KEY); // XOR the config with the key. Crypto.xor(encodedConfig, Crypto.DISPATCH_KEY);
// Create an updated region list. // Create an updated region list.
QueryRegionListHttpRsp updatedRegionListcn = var updatedRegionListCN =
QueryRegionListHttpRsp.newBuilder() QueryRegionListHttpRsp.newBuilder()
.addAllRegionList(servers) .addAllRegionList(servers)
.setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED)) .setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
.setClientCustomConfigEncrypted(ByteString.copyFrom(customConfigcn)) .setClientCustomConfigEncrypted(ByteString.copyFrom(encodedConfig))
.setEnableLoginPc(true) .setEnableLoginPc(true)
.build(); .build();
// Set the region list response. // Set the region list response.
regionListResponsecn = Utils.base64Encode(updatedRegionListcn.toByteString().toByteArray()); regionListResponseCN = Utils.base64Encode(updatedRegionListCN.toByteString().toByteArray());
} }
@Override @Override
@ -164,7 +181,7 @@ public final class RegionHandler implements Router {
|| "CNRELWin".equals(versionCode) || "CNRELWin".equals(versionCode)
|| "CNRELAndroid".equals(versionCode)) { || "CNRELAndroid".equals(versionCode)) {
// Use the CN region list. // Use the CN region list.
QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponsecn); QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponseCN);
event.call(); event.call();
// Respond with the event result. // Respond with the event result.