From 806c68e966a5648c2cbc04d21a12daff1bb596cd Mon Sep 17 00:00:00 2001 From: Dom Eori <4j6dq2zi8@relay.firefox.com> Date: Fri, 11 Mar 2022 20:44:41 +0900 Subject: [PATCH] [aimedb] Correct aime command 0x000d Special thanks to Treeskin at Discord --- .../aqua/sega/aimedb/AimeDbRequestHandler.java | 8 ++++---- .../aqua/sega/aimedb/AimeDbServerInitializer.java | 8 ++++---- .../impl/{Unknown13Handler.java => TouchHandler.java} | 11 ++++++----- 3 files changed, 14 insertions(+), 13 deletions(-) rename src/main/java/icu/samnyan/aqua/sega/aimedb/handler/impl/{Unknown13Handler.java => TouchHandler.java} (85%) diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.java b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.java index 893f6dd7..89cb6ba4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.java @@ -32,10 +32,10 @@ public class AimeDbRequestHandler extends ChannelInboundHandlerAdapter { private final Lookup2Handler lookup2Handler; private final RegisterHandler registerHandler; private final Unknown19Handler unknown19Handler; - private final Unknown13Handler unknown13Handler; + private final TouchHandler touchHandler; @Autowired - public AimeDbRequestHandler(CampaignHandler campaignHandler, FeliCaLookupHandler feliCaLookupHandler, FeliCaLookup2Handler feliCaLookup2Handler, GoodbyeHandler goodbyeHandler, HelloHandler helloHandler, LogHandler logHandler, LookupHandler lookupHandler, Lookup2Handler lookup2Handler, RegisterHandler registerHandler, Unknown19Handler unknown19Handler, Unknown13Handler unknown13Handler) { + public AimeDbRequestHandler(CampaignHandler campaignHandler, FeliCaLookupHandler feliCaLookupHandler, FeliCaLookup2Handler feliCaLookup2Handler, GoodbyeHandler goodbyeHandler, HelloHandler helloHandler, LogHandler logHandler, LookupHandler lookupHandler, Lookup2Handler lookup2Handler, RegisterHandler registerHandler, Unknown19Handler unknown19Handler, TouchHandler touchHandler) { this.campaignHandler = campaignHandler; this.feliCaLookupHandler = feliCaLookupHandler; this.feliCaLookup2Handler = feliCaLookup2Handler; @@ -46,7 +46,7 @@ public class AimeDbRequestHandler extends ChannelInboundHandlerAdapter { this.lookup2Handler = lookup2Handler; this.registerHandler = registerHandler; this.unknown19Handler = unknown19Handler; - this.unknown13Handler = unknown13Handler; + this.touchHandler = touchHandler; } @@ -72,7 +72,7 @@ public class AimeDbRequestHandler extends ChannelInboundHandlerAdapter { campaignHandler.handle(ctx, data); break; case 0x000d: - unknown13Handler.handle(ctx, data); + touchHandler.handle(ctx, data); break; case 0x000f: lookup2Handler.handle(ctx, data); diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServerInitializer.java b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServerInitializer.java index c43bc17a..726f5255 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServerInitializer.java +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServerInitializer.java @@ -26,10 +26,10 @@ public class AimeDbServerInitializer extends ChannelInitializer { private final Lookup2Handler lookup2Handler; private final RegisterHandler registerHandler; private final Unknown19Handler unknown19Handler; - private final Unknown13Handler unknown13Handler; + private final TouchHandler touchHandler; @Autowired - public AimeDbServerInitializer(CampaignHandler campaignHandler, FeliCaLookupHandler feliCaLookupHandler, FeliCaLookup2Handler feliCaLookup2Handler, GoodbyeHandler goodbyeHandler, HelloHandler helloHandler, LogHandler logHandler, LookupHandler lookupHandler, Lookup2Handler lookup2Handler, RegisterHandler registerHandler, Unknown19Handler unknown19Handler, Unknown13Handler unknown13Handler) { + public AimeDbServerInitializer(CampaignHandler campaignHandler, FeliCaLookupHandler feliCaLookupHandler, FeliCaLookup2Handler feliCaLookup2Handler, GoodbyeHandler goodbyeHandler, HelloHandler helloHandler, LogHandler logHandler, LookupHandler lookupHandler, Lookup2Handler lookup2Handler, RegisterHandler registerHandler, Unknown19Handler unknown19Handler, TouchHandler touchHandler) { this.campaignHandler = campaignHandler; this.feliCaLookup2Handler = feliCaLookup2Handler; this.feliCaLookupHandler = feliCaLookupHandler; @@ -40,7 +40,7 @@ public class AimeDbServerInitializer extends ChannelInitializer { this.lookup2Handler = lookup2Handler; this.registerHandler = registerHandler; this.unknown19Handler = unknown19Handler; - this.unknown13Handler = unknown13Handler; + this.touchHandler = touchHandler; } @@ -49,7 +49,7 @@ public class AimeDbServerInitializer extends ChannelInitializer { ChannelPipeline pipeline = ch.pipeline(); pipeline.addLast("encoder", new AimeDbEncoder()); pipeline.addLast("decoder", new AimeDbDecoder()); - pipeline.addLast("handler", new AimeDbRequestHandler(campaignHandler, feliCaLookupHandler, feliCaLookup2Handler, goodbyeHandler, helloHandler, logHandler, lookupHandler, lookup2Handler, registerHandler, unknown19Handler, unknown13Handler)); + pipeline.addLast("handler", new AimeDbRequestHandler(campaignHandler, feliCaLookupHandler, feliCaLookup2Handler, goodbyeHandler, helloHandler, logHandler, lookupHandler, lookup2Handler, registerHandler, unknown19Handler, touchHandler)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/impl/Unknown13Handler.java b/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/impl/TouchHandler.java similarity index 85% rename from src/main/java/icu/samnyan/aqua/sega/aimedb/handler/impl/Unknown13Handler.java rename to src/main/java/icu/samnyan/aqua/sega/aimedb/handler/impl/TouchHandler.java index 78216fd5..9b8d4030 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/impl/Unknown13Handler.java +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/impl/TouchHandler.java @@ -19,26 +19,27 @@ import java.util.Map; * @author samnyan (privateamusement@protonmail.com) */ @Component -public class Unknown13Handler implements BaseHandler { +public class TouchHandler implements BaseHandler { - private static final Logger logger = LoggerFactory.getLogger(Unknown13Handler.class); + private static final Logger logger = LoggerFactory.getLogger(TouchHandler.class); private final LogMapper logMapper; @Autowired - public Unknown13Handler(LogMapper logMapper) { + public TouchHandler(LogMapper logMapper) { this.logMapper = logMapper; } @Override public void handle(ChannelHandlerContext ctx, ByteBuf msg) throws JsonProcessingException { Map requestMap = AimeDbUtil.getBaseInfo(msg); - requestMap.put("type", "unknown13"); + requestMap.put("type", "touch"); + requestMap.put("aimeId", msg.getUnsignedIntLE(0x0020)); logger.info("Request: " + logMapper.write(requestMap)); Map resultMap = new HashMap<>(); - resultMap.put("type", "unknown13"); + resultMap.put("type", "touch"); resultMap.put("status", 1); logger.info("Response: " + logMapper.write(resultMap));