From 74140b39f2ed3bd3fd5c537c7c762cd5b16e16fd Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Wed, 22 Nov 2023 03:39:10 -0800 Subject: [PATCH] Fix rogue protos and implement rogue finish screen --- ...ss.java => LeaveRogueScRspOuterClass.java} | 308 ++-- .../RogueAchivedMiracleInfoOuterClass.java | 274 +--- .../proto/RogueAeonInfoOuterClass.java | 300 ++-- .../proto/RogueFinishInfoOuterClass.java | 718 ++++++++- .../proto/RogueInfoDataOuterClass.java | 34 +- .../lunarcore/proto/RogueInfoOuterClass.java | 1324 ++++++++--------- .../proto/RogueMiracleInfoOuterClass.java | 211 ++- .../RogueMiracleSelectInfoOuterClass.java | 237 +-- .../proto/RogueRecordAvatarOuterClass.java | 453 ++++++ .../proto/RogueRecordInfoOuterClass.java | 532 +++++++ .../proto/RollRogueBuffScRspOuterClass.java | 90 +- .../lunarcore/proto/SceneInfoOuterClass.java | 297 +++- .../proto/SelectRogueBuffScRspOuterClass.java | 236 +-- ...lectRogueDialogueEventCsReqOuterClass.java | 106 +- ...lectRogueDialogueEventScRspOuterClass.java | 55 +- .../SelectRogueMiracleScRspOuterClass.java | 109 +- .../lunarcore/game/rogue/RogueInstance.java | 46 +- .../lunarcore/game/rogue/RogueManager.java | 29 +- .../packet/recv/HandlerLeaveRogueCsReq.java | 2 +- .../packet/send/PacketLeaveRogueScRsp.java | 20 + .../packet/send/PacketRollRogueBuffScRsp.java | 2 +- .../send/PacketSyncRogueFinishScNotify.java | 21 + 22 files changed, 3408 insertions(+), 1996 deletions(-) rename src/generated/main/emu/lunarcore/proto/{QuitRogueScRspOuterClass.java => LeaveRogueScRspOuterClass.java} (53%) create mode 100644 src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java create mode 100644 src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java create mode 100644 src/main/java/emu/lunarcore/server/packet/send/PacketLeaveRogueScRsp.java create mode 100644 src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueFinishScNotify.java diff --git a/src/generated/main/emu/lunarcore/proto/QuitRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java similarity index 53% rename from src/generated/main/emu/lunarcore/proto/QuitRogueScRspOuterClass.java rename to src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java index 7ad5335..53c27e4 100644 --- a/src/generated/main/emu/lunarcore/proto/QuitRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java @@ -11,40 +11,45 @@ import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -public final class QuitRogueScRspOuterClass { +public final class LeaveRogueScRspOuterClass { /** - * Protobuf type {@code QuitRogueScRsp} + * Protobuf type {@code LeaveRogueScRsp} */ - public static final class QuitRogueScRsp extends ProtoMessage implements Cloneable { + public static final class LeaveRogueScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .RogueInfo rogue_info = 6; + * optional .SceneInfo scene = 3; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + + /** + * optional .RogueInfo rogue_info = 5; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); /** - * optional .RogueFinishInfo finish_info = 7; + * optional .LineupInfo lineup = 13; */ - private final RogueFinishInfoOuterClass.RogueFinishInfo finishInfo = RogueFinishInfoOuterClass.RogueFinishInfo.newInstance(); + private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); - private QuitRogueScRsp() { + private LeaveRogueScRsp() { } /** - * @return a new empty instance of {@code QuitRogueScRsp} + * @return a new empty instance of {@code LeaveRogueScRsp} */ - public static QuitRogueScRsp newInstance() { - return new QuitRogueScRsp(); + public static LeaveRogueScRsp newInstance() { + return new LeaveRogueScRsp(); } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,17 +57,17 @@ public final class QuitRogueScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return this */ - public QuitRogueScRsp clearRetcode() { + public LeaveRogueScRsp clearRetcode() { bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -70,36 +75,93 @@ public final class QuitRogueScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ - public QuitRogueScRsp setRetcode(final int value) { + public LeaveRogueScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .RogueInfo rogue_info = 6; - * @return whether the rogueInfo field is set + * optional .SceneInfo scene = 3; + * @return whether the scene field is set */ - public boolean hasRogueInfo() { + public boolean hasScene() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueInfo rogue_info = 6; + * optional .SceneInfo scene = 3; * @return this */ - public QuitRogueScRsp clearRogueInfo() { + public LeaveRogueScRsp clearScene() { bitField0_ &= ~0x00000002; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 3; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 3; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000002; + return scene; + } + + /** + * optional .SceneInfo scene = 3; + * @param value the scene to set + * @return this + */ + public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { + bitField0_ |= 0x00000002; + scene.copyFrom(value); + return this; + } + + /** + * optional .RogueInfo rogue_info = 5; + * @return whether the rogueInfo field is set + */ + public boolean hasRogueInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RogueInfo rogue_info = 5; + * @return this + */ + public LeaveRogueScRsp clearRogueInfo() { + bitField0_ &= ~0x00000004; rogueInfo.clear(); return this; } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -113,7 +175,7 @@ public final class QuitRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,55 +184,55 @@ public final class QuitRogueScRspOuterClass { * @return internal storage object for modifications */ public RogueInfoOuterClass.RogueInfo getMutableRogueInfo() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return rogueInfo; } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 5; * @param value the rogueInfo to set * @return this */ - public QuitRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { - bitField0_ |= 0x00000002; + public LeaveRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { + bitField0_ |= 0x00000004; rogueInfo.copyFrom(value); return this; } /** - * optional .RogueFinishInfo finish_info = 7; - * @return whether the finishInfo field is set + * optional .LineupInfo lineup = 13; + * @return whether the lineup field is set */ - public boolean hasFinishInfo() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasLineup() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .LineupInfo lineup = 13; * @return this */ - public QuitRogueScRsp clearFinishInfo() { - bitField0_ &= ~0x00000004; - finishInfo.clear(); + public LeaveRogueScRsp clearLineup() { + bitField0_ &= ~0x00000008; + lineup.clear(); return this; } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .LineupInfo lineup = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableFinishInfo()} if you want to modify it. + * Use {@link #getMutableLineup()} if you want to modify it. * * @return internal storage object for reading */ - public RogueFinishInfoOuterClass.RogueFinishInfo getFinishInfo() { - return finishInfo; + public LineupInfoOuterClass.LineupInfo getLineup() { + return lineup; } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .LineupInfo lineup = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -178,36 +240,37 @@ public final class QuitRogueScRspOuterClass { * * @return internal storage object for modifications */ - public RogueFinishInfoOuterClass.RogueFinishInfo getMutableFinishInfo() { - bitField0_ |= 0x00000004; - return finishInfo; + public LineupInfoOuterClass.LineupInfo getMutableLineup() { + bitField0_ |= 0x00000008; + return lineup; } /** - * optional .RogueFinishInfo finish_info = 7; - * @param value the finishInfo to set + * optional .LineupInfo lineup = 13; + * @param value the lineup to set * @return this */ - public QuitRogueScRsp setFinishInfo(final RogueFinishInfoOuterClass.RogueFinishInfo value) { - bitField0_ |= 0x00000004; - finishInfo.copyFrom(value); + public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000008; + lineup.copyFrom(value); return this; } @Override - public QuitRogueScRsp copyFrom(final QuitRogueScRsp other) { + public LeaveRogueScRsp copyFrom(final LeaveRogueScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; + scene.copyFrom(other.scene); rogueInfo.copyFrom(other.rogueInfo); - finishInfo.copyFrom(other.finishInfo); + lineup.copyFrom(other.lineup); } return this; } @Override - public QuitRogueScRsp mergeFrom(final QuitRogueScRsp other) { + public LeaveRogueScRsp mergeFrom(final LeaveRogueScRsp other) { if (other.isEmpty()) { return this; } @@ -215,37 +278,42 @@ public final class QuitRogueScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasScene()) { + getMutableScene().mergeFrom(other.scene); + } if (other.hasRogueInfo()) { getMutableRogueInfo().mergeFrom(other.rogueInfo); } - if (other.hasFinishInfo()) { - getMutableFinishInfo().mergeFrom(other.finishInfo); + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); } return this; } @Override - public QuitRogueScRsp clear() { + public LeaveRogueScRsp clear() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; retcode = 0; + scene.clear(); rogueInfo.clear(); - finishInfo.clear(); + lineup.clear(); return this; } @Override - public QuitRogueScRsp clearQuick() { + public LeaveRogueScRsp clearQuick() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; + scene.clearQuick(); rogueInfo.clearQuick(); - finishInfo.clearQuick(); + lineup.clearQuick(); return this; } @@ -254,29 +322,34 @@ public final class QuitRogueScRspOuterClass { if (o == this) { return true; } - if (!(o instanceof QuitRogueScRsp)) { + if (!(o instanceof LeaveRogueScRsp)) { return false; } - QuitRogueScRsp other = (QuitRogueScRsp) o; + LeaveRogueScRsp other = (LeaveRogueScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) + && (!hasScene() || scene.equals(other.scene)) && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)) - && (!hasFinishInfo() || finishInfo.equals(other.finishInfo)); + && (!hasLineup() || lineup.equals(other.lineup)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(rogueInfo); + output.writeRawByte((byte) 26); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(finishInfo); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(rogueInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(lineup); } } @@ -287,44 +360,56 @@ public final class QuitRogueScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(finishInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } return size; } @Override @SuppressWarnings("fallthrough") - public QuitRogueScRsp mergeFrom(final ProtoSource input) throws IOException { + public LeaveRogueScRsp mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 26) { break; } } - case 50: { - // rogueInfo - input.readMessage(rogueInfo); + case 26: { + // scene + input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { - // finishInfo - input.readMessage(finishInfo); + case 42: { + // rogueInfo + input.readMessage(rogueInfo); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // lineup + input.readMessage(lineup); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 0) { break; } @@ -350,16 +435,19 @@ public final class QuitRogueScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueInfo, rogueInfo); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.finishInfo, finishInfo); + output.writeMessage(FieldNames.rogueInfo, rogueInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.lineup, lineup); } output.endObject(); } @Override - public QuitRogueScRsp mergeFrom(final JsonSource input) throws IOException { + public LeaveRogueScRsp mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } @@ -376,11 +464,10 @@ public final class QuitRogueScRspOuterClass { } break; } - case 655808936: - case -1124583437: { - if (input.isAtField(FieldNames.rogueInfo)) { + case 109254796: { + if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueInfo); + input.readMessage(scene); bitField0_ |= 0x00000002; } } else { @@ -388,11 +475,11 @@ public final class QuitRogueScRspOuterClass { } break; } - case 1151198177: - case 1347581146: { - if (input.isAtField(FieldNames.finishInfo)) { + case 655808936: + case -1124583437: { + if (input.isAtField(FieldNames.rogueInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(finishInfo); + input.readMessage(rogueInfo); bitField0_ |= 0x00000004; } } else { @@ -400,6 +487,17 @@ public final class QuitRogueScRspOuterClass { } break; } + case -1102671473: { + if (input.isAtField(FieldNames.lineup)) { + if (!input.trySkipNullValue()) { + input.readMessage(lineup); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -411,8 +509,8 @@ public final class QuitRogueScRspOuterClass { } @Override - public QuitRogueScRsp clone() { - return new QuitRogueScRsp().copyFrom(this); + public LeaveRogueScRsp clone() { + return new LeaveRogueScRsp().copyFrom(this); } @Override @@ -420,32 +518,32 @@ public final class QuitRogueScRspOuterClass { return ((bitField0_) == 0); } - public static QuitRogueScRsp parseFrom(final byte[] data) throws + public static LeaveRogueScRsp parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new QuitRogueScRsp(), data).checkInitialized(); + return ProtoMessage.mergeFrom(new LeaveRogueScRsp(), data).checkInitialized(); } - public static QuitRogueScRsp parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new QuitRogueScRsp(), input).checkInitialized(); + public static LeaveRogueScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new LeaveRogueScRsp(), input).checkInitialized(); } - public static QuitRogueScRsp parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new QuitRogueScRsp(), input).checkInitialized(); + public static LeaveRogueScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new LeaveRogueScRsp(), input).checkInitialized(); } /** - * @return factory for creating QuitRogueScRsp messages + * @return factory for creating LeaveRogueScRsp messages */ - public static MessageFactory getFactory() { - return QuitRogueScRspFactory.INSTANCE; + public static MessageFactory getFactory() { + return LeaveRogueScRspFactory.INSTANCE; } - private enum QuitRogueScRspFactory implements MessageFactory { + private enum LeaveRogueScRspFactory implements MessageFactory { INSTANCE; @Override - public QuitRogueScRsp create() { - return QuitRogueScRsp.newInstance(); + public LeaveRogueScRsp create() { + return LeaveRogueScRsp.newInstance(); } } @@ -455,9 +553,11 @@ public final class QuitRogueScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName scene = FieldName.forField("scene"); + static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); - static final FieldName finishInfo = FieldName.forField("finishInfo", "finish_info"); + static final FieldName lineup = FieldName.forField("lineup"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueAchivedMiracleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAchivedMiracleInfoOuterClass.java index c202108..8ab0317 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAchivedMiracleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAchivedMiracleInfoOuterClass.java @@ -20,22 +20,7 @@ public final class RogueAchivedMiracleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 ELJOPPNAKDB = 5; - */ - private int eLJOPPNAKDB; - - /** - * optional uint32 JPHPAELAOJI = 11; - */ - private int jPHPAELAOJI; - - /** - * optional bool PBKHAECJLNG = 9; - */ - private boolean pBKHAECJLNG; - - /** - * repeated .RogueMiracle rogue_miracle_list = 7; + * repeated .RogueMiracle rogue_miracle_list = 13; */ private final RepeatedMessage rogueMiracleList = RepeatedMessage.newEmptyInstance(RogueMiracleOuterClass.RogueMiracle.getFactory()); @@ -50,136 +35,25 @@ public final class RogueAchivedMiracleInfoOuterClass { } /** - * optional uint32 ELJOPPNAKDB = 5; - * @return whether the eLJOPPNAKDB field is set + * repeated .RogueMiracle rogue_miracle_list = 13; + * @return whether the rogueMiracleList field is set */ - public boolean hasELJOPPNAKDB() { + public boolean hasRogueMiracleList() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 ELJOPPNAKDB = 5; - * @return this - */ - public RogueAchivedMiracleInfo clearELJOPPNAKDB() { - bitField0_ &= ~0x00000001; - eLJOPPNAKDB = 0; - return this; - } - - /** - * optional uint32 ELJOPPNAKDB = 5; - * @return the eLJOPPNAKDB - */ - public int getELJOPPNAKDB() { - return eLJOPPNAKDB; - } - - /** - * optional uint32 ELJOPPNAKDB = 5; - * @param value the eLJOPPNAKDB to set - * @return this - */ - public RogueAchivedMiracleInfo setELJOPPNAKDB(final int value) { - bitField0_ |= 0x00000001; - eLJOPPNAKDB = value; - return this; - } - - /** - * optional uint32 JPHPAELAOJI = 11; - * @return whether the jPHPAELAOJI field is set - */ - public boolean hasJPHPAELAOJI() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 JPHPAELAOJI = 11; - * @return this - */ - public RogueAchivedMiracleInfo clearJPHPAELAOJI() { - bitField0_ &= ~0x00000002; - jPHPAELAOJI = 0; - return this; - } - - /** - * optional uint32 JPHPAELAOJI = 11; - * @return the jPHPAELAOJI - */ - public int getJPHPAELAOJI() { - return jPHPAELAOJI; - } - - /** - * optional uint32 JPHPAELAOJI = 11; - * @param value the jPHPAELAOJI to set - * @return this - */ - public RogueAchivedMiracleInfo setJPHPAELAOJI(final int value) { - bitField0_ |= 0x00000002; - jPHPAELAOJI = value; - return this; - } - - /** - * optional bool PBKHAECJLNG = 9; - * @return whether the pBKHAECJLNG field is set - */ - public boolean hasPBKHAECJLNG() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional bool PBKHAECJLNG = 9; - * @return this - */ - public RogueAchivedMiracleInfo clearPBKHAECJLNG() { - bitField0_ &= ~0x00000004; - pBKHAECJLNG = false; - return this; - } - - /** - * optional bool PBKHAECJLNG = 9; - * @return the pBKHAECJLNG - */ - public boolean getPBKHAECJLNG() { - return pBKHAECJLNG; - } - - /** - * optional bool PBKHAECJLNG = 9; - * @param value the pBKHAECJLNG to set - * @return this - */ - public RogueAchivedMiracleInfo setPBKHAECJLNG(final boolean value) { - bitField0_ |= 0x00000004; - pBKHAECJLNG = value; - return this; - } - - /** - * repeated .RogueMiracle rogue_miracle_list = 7; - * @return whether the rogueMiracleList field is set - */ - public boolean hasRogueMiracleList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .RogueMiracle rogue_miracle_list = 7; + * repeated .RogueMiracle rogue_miracle_list = 13; * @return this */ public RogueAchivedMiracleInfo clearRogueMiracleList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; rogueMiracleList.clear(); return this; } /** - * repeated .RogueMiracle rogue_miracle_list = 7; + * repeated .RogueMiracle rogue_miracle_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -193,7 +67,7 @@ public final class RogueAchivedMiracleInfoOuterClass { } /** - * repeated .RogueMiracle rogue_miracle_list = 7; + * repeated .RogueMiracle rogue_miracle_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -202,30 +76,30 @@ public final class RogueAchivedMiracleInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRogueMiracleList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; return rogueMiracleList; } /** - * repeated .RogueMiracle rogue_miracle_list = 7; + * repeated .RogueMiracle rogue_miracle_list = 13; * @param value the rogueMiracleList to add * @return this */ public RogueAchivedMiracleInfo addRogueMiracleList( final RogueMiracleOuterClass.RogueMiracle value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; rogueMiracleList.add(value); return this; } /** - * repeated .RogueMiracle rogue_miracle_list = 7; + * repeated .RogueMiracle rogue_miracle_list = 13; * @param values the rogueMiracleList to add * @return this */ public RogueAchivedMiracleInfo addAllRogueMiracleList( final RogueMiracleOuterClass.RogueMiracle... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; rogueMiracleList.addAll(values); return this; } @@ -235,9 +109,6 @@ public final class RogueAchivedMiracleInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eLJOPPNAKDB = other.eLJOPPNAKDB; - jPHPAELAOJI = other.jPHPAELAOJI; - pBKHAECJLNG = other.pBKHAECJLNG; rogueMiracleList.copyFrom(other.rogueMiracleList); } return this; @@ -249,15 +120,6 @@ public final class RogueAchivedMiracleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasELJOPPNAKDB()) { - setELJOPPNAKDB(other.eLJOPPNAKDB); - } - if (other.hasJPHPAELAOJI()) { - setJPHPAELAOJI(other.jPHPAELAOJI); - } - if (other.hasPBKHAECJLNG()) { - setPBKHAECJLNG(other.pBKHAECJLNG); - } if (other.hasRogueMiracleList()) { getMutableRogueMiracleList().addAll(other.rogueMiracleList); } @@ -271,9 +133,6 @@ public final class RogueAchivedMiracleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - eLJOPPNAKDB = 0; - jPHPAELAOJI = 0; - pBKHAECJLNG = false; rogueMiracleList.clear(); return this; } @@ -299,29 +158,14 @@ public final class RogueAchivedMiracleInfoOuterClass { } RogueAchivedMiracleInfo other = (RogueAchivedMiracleInfo) o; return bitField0_ == other.bitField0_ - && (!hasELJOPPNAKDB() || eLJOPPNAKDB == other.eLJOPPNAKDB) - && (!hasJPHPAELAOJI() || jPHPAELAOJI == other.jPHPAELAOJI) - && (!hasPBKHAECJLNG() || pBKHAECJLNG == other.pBKHAECJLNG) && (!hasRogueMiracleList() || rogueMiracleList.equals(other.rogueMiracleList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(eLJOPPNAKDB); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(jPHPAELAOJI); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeBoolNoTag(pBKHAECJLNG); - } - if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < rogueMiracleList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 106); output.writeMessageNoTag(rogueMiracleList.get(i)); } } @@ -331,15 +175,6 @@ public final class RogueAchivedMiracleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eLJOPPNAKDB); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jPHPAELAOJI); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000008) != 0) { size += (1 * rogueMiracleList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueMiracleList); } return size; @@ -352,37 +187,10 @@ public final class RogueAchivedMiracleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // eLJOPPNAKDB - eLJOPPNAKDB = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // jPHPAELAOJI - jPHPAELAOJI = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // pBKHAECJLNG - pBKHAECJLNG = input.readBool(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { + case 106: { // rogueMiracleList tag = input.readRepeatedMessage(rogueMiracleList, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; if (tag != 0) { break; } @@ -405,15 +213,6 @@ public final class RogueAchivedMiracleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.eLJOPPNAKDB, eLJOPPNAKDB); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.jPHPAELAOJI, jPHPAELAOJI); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.pBKHAECJLNG, pBKHAECJLNG); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.rogueMiracleList, rogueMiracleList); } output.endObject(); @@ -426,45 +225,12 @@ public final class RogueAchivedMiracleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1500069942: { - if (input.isAtField(FieldNames.eLJOPPNAKDB)) { - if (!input.trySkipNullValue()) { - eLJOPPNAKDB = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1932356103: { - if (input.isAtField(FieldNames.jPHPAELAOJI)) { - if (!input.trySkipNullValue()) { - jPHPAELAOJI = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 298748395: { - if (input.isAtField(FieldNames.pBKHAECJLNG)) { - if (!input.trySkipNullValue()) { - pBKHAECJLNG = input.readBool(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -452426123: case 1925521905: { if (input.isAtField(FieldNames.rogueMiracleList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(rogueMiracleList); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -524,12 +290,6 @@ public final class RogueAchivedMiracleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eLJOPPNAKDB = FieldName.forField("ELJOPPNAKDB"); - - static final FieldName jPHPAELAOJI = FieldName.forField("JPHPAELAOJI"); - - static final FieldName pBKHAECJLNG = FieldName.forField("PBKHAECJLNG"); - static final FieldName rogueMiracleList = FieldName.forField("rogueMiracleList", "rogue_miracle_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java index afd6ec6..e506fb3 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java @@ -20,27 +20,22 @@ public final class RogueAeonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unlock_aeon_enhance_num = 1; + * optional uint32 unlock_aeon_num = 4; + */ + private int unlockAeonNum; + + /** + * optional uint32 unlock_aeon_enhance_num = 5; */ private int unlockAeonEnhanceNum; /** - * optional uint32 unlocked_aeon_num = 4; - */ - private int unlockedAeonNum; - - /** - * optional uint32 selected_aeon_id = 8; + * optional uint32 selected_aeon_id = 12; */ private int selectedAeonId; /** - * optional bool AFPFIHKLELP = 9; - */ - private boolean aFPFIHKLELP; - - /** - * repeated uint32 aeon_id_list = 5; + * repeated uint32 aeon_id_list = 8; */ private final RepeatedInt aeonIdList = RepeatedInt.newEmptyInstance(); @@ -55,25 +50,62 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 1; - * @return whether the unlockAeonEnhanceNum field is set + * optional uint32 unlock_aeon_num = 4; + * @return whether the unlockAeonNum field is set */ - public boolean hasUnlockAeonEnhanceNum() { + public boolean hasUnlockAeonNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unlock_aeon_enhance_num = 1; + * optional uint32 unlock_aeon_num = 4; + * @return this + */ + public RogueAeonInfo clearUnlockAeonNum() { + bitField0_ &= ~0x00000001; + unlockAeonNum = 0; + return this; + } + + /** + * optional uint32 unlock_aeon_num = 4; + * @return the unlockAeonNum + */ + public int getUnlockAeonNum() { + return unlockAeonNum; + } + + /** + * optional uint32 unlock_aeon_num = 4; + * @param value the unlockAeonNum to set + * @return this + */ + public RogueAeonInfo setUnlockAeonNum(final int value) { + bitField0_ |= 0x00000001; + unlockAeonNum = value; + return this; + } + + /** + * optional uint32 unlock_aeon_enhance_num = 5; + * @return whether the unlockAeonEnhanceNum field is set + */ + public boolean hasUnlockAeonEnhanceNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 unlock_aeon_enhance_num = 5; * @return this */ public RogueAeonInfo clearUnlockAeonEnhanceNum() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; unlockAeonEnhanceNum = 0; return this; } /** - * optional uint32 unlock_aeon_enhance_num = 1; + * optional uint32 unlock_aeon_enhance_num = 5; * @return the unlockAeonEnhanceNum */ public int getUnlockAeonEnhanceNum() { @@ -81,55 +113,18 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 1; + * optional uint32 unlock_aeon_enhance_num = 5; * @param value the unlockAeonEnhanceNum to set * @return this */ public RogueAeonInfo setUnlockAeonEnhanceNum(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; unlockAeonEnhanceNum = value; return this; } /** - * optional uint32 unlocked_aeon_num = 4; - * @return whether the unlockedAeonNum field is set - */ - public boolean hasUnlockedAeonNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unlocked_aeon_num = 4; - * @return this - */ - public RogueAeonInfo clearUnlockedAeonNum() { - bitField0_ &= ~0x00000002; - unlockedAeonNum = 0; - return this; - } - - /** - * optional uint32 unlocked_aeon_num = 4; - * @return the unlockedAeonNum - */ - public int getUnlockedAeonNum() { - return unlockedAeonNum; - } - - /** - * optional uint32 unlocked_aeon_num = 4; - * @param value the unlockedAeonNum to set - * @return this - */ - public RogueAeonInfo setUnlockedAeonNum(final int value) { - bitField0_ |= 0x00000002; - unlockedAeonNum = value; - return this; - } - - /** - * optional uint32 selected_aeon_id = 8; + * optional uint32 selected_aeon_id = 12; * @return whether the selectedAeonId field is set */ public boolean hasSelectedAeonId() { @@ -137,7 +132,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 selected_aeon_id = 8; + * optional uint32 selected_aeon_id = 12; * @return this */ public RogueAeonInfo clearSelectedAeonId() { @@ -147,7 +142,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 selected_aeon_id = 8; + * optional uint32 selected_aeon_id = 12; * @return the selectedAeonId */ public int getSelectedAeonId() { @@ -155,7 +150,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 selected_aeon_id = 8; + * optional uint32 selected_aeon_id = 12; * @param value the selectedAeonId to set * @return this */ @@ -166,62 +161,25 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool AFPFIHKLELP = 9; - * @return whether the aFPFIHKLELP field is set + * repeated uint32 aeon_id_list = 8; + * @return whether the aeonIdList field is set */ - public boolean hasAFPFIHKLELP() { + public boolean hasAeonIdList() { return (bitField0_ & 0x00000008) != 0; } /** - * optional bool AFPFIHKLELP = 9; - * @return this - */ - public RogueAeonInfo clearAFPFIHKLELP() { - bitField0_ &= ~0x00000008; - aFPFIHKLELP = false; - return this; - } - - /** - * optional bool AFPFIHKLELP = 9; - * @return the aFPFIHKLELP - */ - public boolean getAFPFIHKLELP() { - return aFPFIHKLELP; - } - - /** - * optional bool AFPFIHKLELP = 9; - * @param value the aFPFIHKLELP to set - * @return this - */ - public RogueAeonInfo setAFPFIHKLELP(final boolean value) { - bitField0_ |= 0x00000008; - aFPFIHKLELP = value; - return this; - } - - /** - * repeated uint32 aeon_id_list = 5; - * @return whether the aeonIdList field is set - */ - public boolean hasAeonIdList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 aeon_id_list = 5; + * repeated uint32 aeon_id_list = 8; * @return this */ public RogueAeonInfo clearAeonIdList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; aeonIdList.clear(); return this; } /** - * repeated uint32 aeon_id_list = 5; + * repeated uint32 aeon_id_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -235,7 +193,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 5; + * repeated uint32 aeon_id_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -244,28 +202,28 @@ public final class RogueAeonInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableAeonIdList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return aeonIdList; } /** - * repeated uint32 aeon_id_list = 5; + * repeated uint32 aeon_id_list = 8; * @param value the aeonIdList to add * @return this */ public RogueAeonInfo addAeonIdList(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; aeonIdList.add(value); return this; } /** - * repeated uint32 aeon_id_list = 5; + * repeated uint32 aeon_id_list = 8; * @param values the aeonIdList to add * @return this */ public RogueAeonInfo addAllAeonIdList(final int... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; aeonIdList.addAll(values); return this; } @@ -275,10 +233,9 @@ public final class RogueAeonInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + unlockAeonNum = other.unlockAeonNum; unlockAeonEnhanceNum = other.unlockAeonEnhanceNum; - unlockedAeonNum = other.unlockedAeonNum; selectedAeonId = other.selectedAeonId; - aFPFIHKLELP = other.aFPFIHKLELP; aeonIdList.copyFrom(other.aeonIdList); } return this; @@ -290,18 +247,15 @@ public final class RogueAeonInfoOuterClass { return this; } cachedSize = -1; + if (other.hasUnlockAeonNum()) { + setUnlockAeonNum(other.unlockAeonNum); + } if (other.hasUnlockAeonEnhanceNum()) { setUnlockAeonEnhanceNum(other.unlockAeonEnhanceNum); } - if (other.hasUnlockedAeonNum()) { - setUnlockedAeonNum(other.unlockedAeonNum); - } if (other.hasSelectedAeonId()) { setSelectedAeonId(other.selectedAeonId); } - if (other.hasAFPFIHKLELP()) { - setAFPFIHKLELP(other.aFPFIHKLELP); - } if (other.hasAeonIdList()) { getMutableAeonIdList().addAll(other.aeonIdList); } @@ -315,10 +269,9 @@ public final class RogueAeonInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + unlockAeonNum = 0; unlockAeonEnhanceNum = 0; - unlockedAeonNum = 0; selectedAeonId = 0; - aFPFIHKLELP = false; aeonIdList.clear(); return this; } @@ -344,34 +297,29 @@ public final class RogueAeonInfoOuterClass { } RogueAeonInfo other = (RogueAeonInfo) o; return bitField0_ == other.bitField0_ + && (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum) && (!hasUnlockAeonEnhanceNum() || unlockAeonEnhanceNum == other.unlockAeonEnhanceNum) - && (!hasUnlockedAeonNum() || unlockedAeonNum == other.unlockedAeonNum) && (!hasSelectedAeonId() || selectedAeonId == other.selectedAeonId) - && (!hasAFPFIHKLELP() || aFPFIHKLELP == other.aFPFIHKLELP) && (!hasAeonIdList() || aeonIdList.equals(other.aeonIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(unlockAeonEnhanceNum); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(unlockAeonNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(unlockedAeonNum); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(selectedAeonId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeBoolNoTag(aFPFIHKLELP); - } - if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < aeonIdList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(aeonIdList.array()[i]); } } @@ -381,18 +329,15 @@ public final class RogueAeonInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockedAeonNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(selectedAeonId); } if ((bitField0_ & 0x00000008) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000010) != 0) { size += (1 * aeonIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(aeonIdList); } return size; @@ -405,46 +350,37 @@ public final class RogueAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // unlockAeonEnhanceNum - unlockAeonEnhanceNum = input.readUInt32(); + case 32: { + // unlockAeonNum + unlockAeonNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { - // unlockedAeonNum - unlockedAeonNum = input.readUInt32(); + case 40: { + // unlockAeonEnhanceNum + unlockAeonEnhanceNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 96) { break; } } - case 64: { + case 96: { // selectedAeonId selectedAeonId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 66) { break; } } - case 72: { - // aFPFIHKLELP - aFPFIHKLELP = input.readBool(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { + case 66: { // aeonIdList [packed=true] input.readPackedUInt32(aeonIdList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { break; @@ -460,10 +396,10 @@ public final class RogueAeonInfoOuterClass { tag = input.readTag(); break; } - case 40: { + case 64: { // aeonIdList [packed=false] tag = input.readRepeatedUInt32(aeonIdList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; break; } } @@ -474,18 +410,15 @@ public final class RogueAeonInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); + output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.unlockedAeonNum, unlockedAeonNum); + output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.selectedAeonId, selectedAeonId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.aFPFIHKLELP, aFPFIHKLELP); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.aeonIdList, aeonIdList); } output.endObject(); @@ -498,11 +431,11 @@ public final class RogueAeonInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1040991167: - case 7773396: { - if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { + case -281209953: + case -952729371: { + if (input.isAtField(FieldNames.unlockAeonNum)) { if (!input.trySkipNullValue()) { - unlockAeonEnhanceNum = input.readUInt32(); + unlockAeonNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -510,11 +443,11 @@ public final class RogueAeonInfoOuterClass { } break; } - case -149403872: - case 1158862886: { - if (input.isAtField(FieldNames.unlockedAeonNum)) { + case 1040991167: + case 7773396: { + if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { if (!input.trySkipNullValue()) { - unlockedAeonNum = input.readUInt32(); + unlockAeonEnhanceNum = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -534,23 +467,12 @@ public final class RogueAeonInfoOuterClass { } break; } - case -337406834: { - if (input.isAtField(FieldNames.aFPFIHKLELP)) { - if (!input.trySkipNullValue()) { - aFPFIHKLELP = input.readBool(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 1452976956: case 953805318: { if (input.isAtField(FieldNames.aeonIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(aeonIdList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -609,14 +531,12 @@ public final class RogueAeonInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num"); + static final FieldName unlockAeonEnhanceNum = FieldName.forField("unlockAeonEnhanceNum", "unlock_aeon_enhance_num"); - static final FieldName unlockedAeonNum = FieldName.forField("unlockedAeonNum", "unlocked_aeon_num"); - static final FieldName selectedAeonId = FieldName.forField("selectedAeonId", "selected_aeon_id"); - static final FieldName aFPFIHKLELP = FieldName.forField("AFPFIHKLELP"); - static final FieldName aeonIdList = FieldName.forField("aeonIdList", "aeon_id_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java index 9d7c73b..a12d271 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java @@ -18,6 +18,36 @@ public final class RogueFinishInfoOuterClass { public static final class RogueFinishInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 pass_room_count = 4; + */ + private int passRoomCount; + + /** + * optional uint32 talent_coin = 8; + */ + private int talentCoin; + + /** + * optional uint32 total_score = 10; + */ + private int totalScore; + + /** + * optional uint32 room_score = 11; + */ + private int roomScore; + + /** + * optional uint32 area_first_pass_score = 14; + */ + private int areaFirstPassScore; + + /** + * optional uint32 reach_room_count = 1056; + */ + private int reachRoomCount; + /** * optional uint32 area_id = 1731; */ @@ -28,6 +58,16 @@ public final class RogueFinishInfoOuterClass { */ private boolean isWin; + /** + * optional .ItemList finish_reward_list = 1; + */ + private final ItemListOuterClass.ItemList finishRewardList = ItemListOuterClass.ItemList.newInstance(); + + /** + * optional .RogueRecordInfo record_info = 7; + */ + private final RogueRecordInfoOuterClass.RogueRecordInfo recordInfo = RogueRecordInfoOuterClass.RogueRecordInfo.newInstance(); + private RogueFinishInfo() { } @@ -38,12 +78,234 @@ public final class RogueFinishInfoOuterClass { return new RogueFinishInfo(); } + /** + * optional uint32 pass_room_count = 4; + * @return whether the passRoomCount field is set + */ + public boolean hasPassRoomCount() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 pass_room_count = 4; + * @return this + */ + public RogueFinishInfo clearPassRoomCount() { + bitField0_ &= ~0x00000001; + passRoomCount = 0; + return this; + } + + /** + * optional uint32 pass_room_count = 4; + * @return the passRoomCount + */ + public int getPassRoomCount() { + return passRoomCount; + } + + /** + * optional uint32 pass_room_count = 4; + * @param value the passRoomCount to set + * @return this + */ + public RogueFinishInfo setPassRoomCount(final int value) { + bitField0_ |= 0x00000001; + passRoomCount = value; + return this; + } + + /** + * optional uint32 talent_coin = 8; + * @return whether the talentCoin field is set + */ + public boolean hasTalentCoin() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 talent_coin = 8; + * @return this + */ + public RogueFinishInfo clearTalentCoin() { + bitField0_ &= ~0x00000002; + talentCoin = 0; + return this; + } + + /** + * optional uint32 talent_coin = 8; + * @return the talentCoin + */ + public int getTalentCoin() { + return talentCoin; + } + + /** + * optional uint32 talent_coin = 8; + * @param value the talentCoin to set + * @return this + */ + public RogueFinishInfo setTalentCoin(final int value) { + bitField0_ |= 0x00000002; + talentCoin = value; + return this; + } + + /** + * optional uint32 total_score = 10; + * @return whether the totalScore field is set + */ + public boolean hasTotalScore() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 total_score = 10; + * @return this + */ + public RogueFinishInfo clearTotalScore() { + bitField0_ &= ~0x00000004; + totalScore = 0; + return this; + } + + /** + * optional uint32 total_score = 10; + * @return the totalScore + */ + public int getTotalScore() { + return totalScore; + } + + /** + * optional uint32 total_score = 10; + * @param value the totalScore to set + * @return this + */ + public RogueFinishInfo setTotalScore(final int value) { + bitField0_ |= 0x00000004; + totalScore = value; + return this; + } + + /** + * optional uint32 room_score = 11; + * @return whether the roomScore field is set + */ + public boolean hasRoomScore() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 room_score = 11; + * @return this + */ + public RogueFinishInfo clearRoomScore() { + bitField0_ &= ~0x00000008; + roomScore = 0; + return this; + } + + /** + * optional uint32 room_score = 11; + * @return the roomScore + */ + public int getRoomScore() { + return roomScore; + } + + /** + * optional uint32 room_score = 11; + * @param value the roomScore to set + * @return this + */ + public RogueFinishInfo setRoomScore(final int value) { + bitField0_ |= 0x00000008; + roomScore = value; + return this; + } + + /** + * optional uint32 area_first_pass_score = 14; + * @return whether the areaFirstPassScore field is set + */ + public boolean hasAreaFirstPassScore() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 area_first_pass_score = 14; + * @return this + */ + public RogueFinishInfo clearAreaFirstPassScore() { + bitField0_ &= ~0x00000010; + areaFirstPassScore = 0; + return this; + } + + /** + * optional uint32 area_first_pass_score = 14; + * @return the areaFirstPassScore + */ + public int getAreaFirstPassScore() { + return areaFirstPassScore; + } + + /** + * optional uint32 area_first_pass_score = 14; + * @param value the areaFirstPassScore to set + * @return this + */ + public RogueFinishInfo setAreaFirstPassScore(final int value) { + bitField0_ |= 0x00000010; + areaFirstPassScore = value; + return this; + } + + /** + * optional uint32 reach_room_count = 1056; + * @return whether the reachRoomCount field is set + */ + public boolean hasReachRoomCount() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 reach_room_count = 1056; + * @return this + */ + public RogueFinishInfo clearReachRoomCount() { + bitField0_ &= ~0x00000020; + reachRoomCount = 0; + return this; + } + + /** + * optional uint32 reach_room_count = 1056; + * @return the reachRoomCount + */ + public int getReachRoomCount() { + return reachRoomCount; + } + + /** + * optional uint32 reach_room_count = 1056; + * @param value the reachRoomCount to set + * @return this + */ + public RogueFinishInfo setReachRoomCount(final int value) { + bitField0_ |= 0x00000020; + reachRoomCount = value; + return this; + } + /** * optional uint32 area_id = 1731; * @return whether the areaId field is set */ public boolean hasAreaId() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000040) != 0; } /** @@ -51,7 +313,7 @@ public final class RogueFinishInfoOuterClass { * @return this */ public RogueFinishInfo clearAreaId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000040; areaId = 0; return this; } @@ -70,7 +332,7 @@ public final class RogueFinishInfoOuterClass { * @return this */ public RogueFinishInfo setAreaId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000040; areaId = value; return this; } @@ -80,7 +342,7 @@ public final class RogueFinishInfoOuterClass { * @return whether the isWin field is set */ public boolean hasIsWin() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000080) != 0; } /** @@ -88,7 +350,7 @@ public final class RogueFinishInfoOuterClass { * @return this */ public RogueFinishInfo clearIsWin() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000080; isWin = false; return this; } @@ -107,18 +369,140 @@ public final class RogueFinishInfoOuterClass { * @return this */ public RogueFinishInfo setIsWin(final boolean value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000080; isWin = value; return this; } + /** + * optional .ItemList finish_reward_list = 1; + * @return whether the finishRewardList field is set + */ + public boolean hasFinishRewardList() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional .ItemList finish_reward_list = 1; + * @return this + */ + public RogueFinishInfo clearFinishRewardList() { + bitField0_ &= ~0x00000100; + finishRewardList.clear(); + return this; + } + + /** + * optional .ItemList finish_reward_list = 1; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableFinishRewardList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getFinishRewardList() { + return finishRewardList; + } + + /** + * optional .ItemList finish_reward_list = 1; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ItemListOuterClass.ItemList getMutableFinishRewardList() { + bitField0_ |= 0x00000100; + return finishRewardList; + } + + /** + * optional .ItemList finish_reward_list = 1; + * @param value the finishRewardList to set + * @return this + */ + public RogueFinishInfo setFinishRewardList(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000100; + finishRewardList.copyFrom(value); + return this; + } + + /** + * optional .RogueRecordInfo record_info = 7; + * @return whether the recordInfo field is set + */ + public boolean hasRecordInfo() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional .RogueRecordInfo record_info = 7; + * @return this + */ + public RogueFinishInfo clearRecordInfo() { + bitField0_ &= ~0x00000200; + recordInfo.clear(); + return this; + } + + /** + * optional .RogueRecordInfo record_info = 7; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRecordInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueRecordInfoOuterClass.RogueRecordInfo getRecordInfo() { + return recordInfo; + } + + /** + * optional .RogueRecordInfo record_info = 7; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueRecordInfoOuterClass.RogueRecordInfo getMutableRecordInfo() { + bitField0_ |= 0x00000200; + return recordInfo; + } + + /** + * optional .RogueRecordInfo record_info = 7; + * @param value the recordInfo to set + * @return this + */ + public RogueFinishInfo setRecordInfo(final RogueRecordInfoOuterClass.RogueRecordInfo value) { + bitField0_ |= 0x00000200; + recordInfo.copyFrom(value); + return this; + } + @Override public RogueFinishInfo copyFrom(final RogueFinishInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + passRoomCount = other.passRoomCount; + talentCoin = other.talentCoin; + totalScore = other.totalScore; + roomScore = other.roomScore; + areaFirstPassScore = other.areaFirstPassScore; + reachRoomCount = other.reachRoomCount; areaId = other.areaId; isWin = other.isWin; + finishRewardList.copyFrom(other.finishRewardList); + recordInfo.copyFrom(other.recordInfo); } return this; } @@ -129,12 +513,36 @@ public final class RogueFinishInfoOuterClass { return this; } cachedSize = -1; + if (other.hasPassRoomCount()) { + setPassRoomCount(other.passRoomCount); + } + if (other.hasTalentCoin()) { + setTalentCoin(other.talentCoin); + } + if (other.hasTotalScore()) { + setTotalScore(other.totalScore); + } + if (other.hasRoomScore()) { + setRoomScore(other.roomScore); + } + if (other.hasAreaFirstPassScore()) { + setAreaFirstPassScore(other.areaFirstPassScore); + } + if (other.hasReachRoomCount()) { + setReachRoomCount(other.reachRoomCount); + } if (other.hasAreaId()) { setAreaId(other.areaId); } if (other.hasIsWin()) { setIsWin(other.isWin); } + if (other.hasFinishRewardList()) { + getMutableFinishRewardList().mergeFrom(other.finishRewardList); + } + if (other.hasRecordInfo()) { + getMutableRecordInfo().mergeFrom(other.recordInfo); + } return this; } @@ -145,8 +553,16 @@ public final class RogueFinishInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + passRoomCount = 0; + talentCoin = 0; + totalScore = 0; + roomScore = 0; + areaFirstPassScore = 0; + reachRoomCount = 0; areaId = 0; isWin = false; + finishRewardList.clear(); + recordInfo.clear(); return this; } @@ -157,6 +573,8 @@ public final class RogueFinishInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + finishRewardList.clearQuick(); + recordInfo.clearQuick(); return this; } @@ -170,31 +588,95 @@ public final class RogueFinishInfoOuterClass { } RogueFinishInfo other = (RogueFinishInfo) o; return bitField0_ == other.bitField0_ + && (!hasPassRoomCount() || passRoomCount == other.passRoomCount) + && (!hasTalentCoin() || talentCoin == other.talentCoin) + && (!hasTotalScore() || totalScore == other.totalScore) + && (!hasRoomScore() || roomScore == other.roomScore) + && (!hasAreaFirstPassScore() || areaFirstPassScore == other.areaFirstPassScore) + && (!hasReachRoomCount() || reachRoomCount == other.reachRoomCount) && (!hasAreaId() || areaId == other.areaId) - && (!hasIsWin() || isWin == other.isWin); + && (!hasIsWin() || isWin == other.isWin) + && (!hasFinishRewardList() || finishRewardList.equals(other.finishRewardList)) + && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(passRoomCount); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(talentCoin); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(totalScore); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(roomScore); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(areaFirstPassScore); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawLittleEndian16((short) 17024); + output.writeUInt32NoTag(reachRoomCount); + } + if ((bitField0_ & 0x00000040) != 0) { output.writeRawLittleEndian16((short) 27800); output.writeUInt32NoTag(areaId); } - if ((bitField0_ & 0x00000002) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 120); output.writeBoolNoTag(isWin); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(finishRewardList); + } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(recordInfo); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeUInt32SizeNoTag(areaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(passRoomCount); } if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(talentCoin); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(totalScore); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(roomScore); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(areaFirstPassScore); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 2 + ProtoSink.computeUInt32SizeNoTag(reachRoomCount); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 2 + ProtoSink.computeUInt32SizeNoTag(areaId); + } + if ((bitField0_ & 0x00000080) != 0) { size += 2; } + if ((bitField0_ & 0x00000100) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(finishRewardList); + } + if ((bitField0_ & 0x00000200) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo); + } return size; } @@ -205,10 +687,64 @@ public final class RogueFinishInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 32: { + // passRoomCount + passRoomCount = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // talentCoin + talentCoin = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // totalScore + totalScore = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // roomScore + roomScore = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // areaFirstPassScore + areaFirstPassScore = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 8448) { + break; + } + } + case 8448: { + // reachRoomCount + reachRoomCount = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 13848) { + break; + } + } case 13848: { // areaId areaId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 120) { break; @@ -217,7 +753,25 @@ public final class RogueFinishInfoOuterClass { case 120: { // isWin isWin = input.readBool(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // finishRewardList + input.readMessage(finishRewardList); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // recordInfo + input.readMessage(recordInfo); + bitField0_ |= 0x00000200; tag = input.readTag(); if (tag != 0) { break; @@ -241,11 +795,35 @@ public final class RogueFinishInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); + output.writeUInt32(FieldNames.passRoomCount, passRoomCount); } if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.talentCoin, talentCoin); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.totalScore, totalScore); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.roomScore, roomScore); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.areaFirstPassScore, areaFirstPassScore); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.reachRoomCount, reachRoomCount); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.areaId, areaId); + } + if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isWin, isWin); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeMessage(FieldNames.finishRewardList, finishRewardList); + } + if ((bitField0_ & 0x00000200) != 0) { + output.writeMessage(FieldNames.recordInfo, recordInfo); + } output.endObject(); } @@ -256,12 +834,84 @@ public final class RogueFinishInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 430108643: + case 173887897: { + if (input.isAtField(FieldNames.passRoomCount)) { + if (!input.trySkipNullValue()) { + passRoomCount = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1396800925: + case 376662532: { + if (input.isAtField(FieldNames.talentCoin)) { + if (!input.trySkipNullValue()) { + talentCoin = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -716972626: + case -393348649: { + if (input.isAtField(FieldNames.totalScore)) { + if (!input.trySkipNullValue()) { + totalScore = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1078976905: + case 1269420590: { + if (input.isAtField(FieldNames.roomScore)) { + if (!input.trySkipNullValue()) { + roomScore = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1195131422: + case -789838011: { + if (input.isAtField(FieldNames.areaFirstPassScore)) { + if (!input.trySkipNullValue()) { + areaFirstPassScore = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1588434751: + case 1678904055: { + if (input.isAtField(FieldNames.reachRoomCount)) { + if (!input.trySkipNullValue()) { + reachRoomCount = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } case -1409553784: case -746472947: { if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { areaId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -273,7 +923,31 @@ public final class RogueFinishInfoOuterClass { if (input.isAtField(FieldNames.isWin)) { if (!input.trySkipNullValue()) { isWin = input.readBool(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1769558368: + case -1681136126: { + if (input.isAtField(FieldNames.finishRewardList)) { + if (!input.trySkipNullValue()) { + input.readMessage(finishRewardList); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } + case 734573727: + case 1317125084: { + if (input.isAtField(FieldNames.recordInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(recordInfo); + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -333,9 +1007,25 @@ public final class RogueFinishInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName passRoomCount = FieldName.forField("passRoomCount", "pass_room_count"); + + static final FieldName talentCoin = FieldName.forField("talentCoin", "talent_coin"); + + static final FieldName totalScore = FieldName.forField("totalScore", "total_score"); + + static final FieldName roomScore = FieldName.forField("roomScore", "room_score"); + + static final FieldName areaFirstPassScore = FieldName.forField("areaFirstPassScore", "area_first_pass_score"); + + static final FieldName reachRoomCount = FieldName.forField("reachRoomCount", "reach_room_count"); + static final FieldName areaId = FieldName.forField("areaId", "area_id"); static final FieldName isWin = FieldName.forField("isWin", "is_win"); + + static final FieldName finishRewardList = FieldName.forField("finishRewardList", "finish_reward_list"); + + static final FieldName recordInfo = FieldName.forField("recordInfo", "record_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java index 61250f4..10043ea 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java @@ -19,12 +19,12 @@ public final class RogueInfoDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueSeasonInfo rogue_season_info = 3; + * optional .RogueSeasonInfo rogue_season_info = 6; */ private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); /** - * optional .RogueScoreRewardInfo rogue_score_info = 6; + * optional .RogueScoreRewardInfo rogue_score_info = 15; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); @@ -39,7 +39,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueSeasonInfo rogue_season_info = 3; + * optional .RogueSeasonInfo rogue_season_info = 6; * @return whether the rogueSeasonInfo field is set */ public boolean hasRogueSeasonInfo() { @@ -47,7 +47,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueSeasonInfo rogue_season_info = 3; + * optional .RogueSeasonInfo rogue_season_info = 6; * @return this */ public RogueInfoData clearRogueSeasonInfo() { @@ -57,7 +57,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueSeasonInfo rogue_season_info = 3; + * optional .RogueSeasonInfo rogue_season_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -71,7 +71,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueSeasonInfo rogue_season_info = 3; + * optional .RogueSeasonInfo rogue_season_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -85,7 +85,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueSeasonInfo rogue_season_info = 3; + * optional .RogueSeasonInfo rogue_season_info = 6; * @param value the rogueSeasonInfo to set * @return this */ @@ -96,7 +96,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 6; + * optional .RogueScoreRewardInfo rogue_score_info = 15; * @return whether the rogueScoreInfo field is set */ public boolean hasRogueScoreInfo() { @@ -104,7 +104,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 6; + * optional .RogueScoreRewardInfo rogue_score_info = 15; * @return this */ public RogueInfoData clearRogueScoreInfo() { @@ -114,7 +114,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 6; + * optional .RogueScoreRewardInfo rogue_score_info = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -128,7 +128,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 6; + * optional .RogueScoreRewardInfo rogue_score_info = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -142,7 +142,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 6; + * optional .RogueScoreRewardInfo rogue_score_info = 15; * @param value the rogueScoreInfo to set * @return this */ @@ -220,11 +220,11 @@ public final class RogueInfoDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); output.writeMessageNoTag(rogueSeasonInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 122); output.writeMessageNoTag(rogueScoreInfo); } } @@ -248,16 +248,16 @@ public final class RogueInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 50: { // rogueSeasonInfo input.readMessage(rogueSeasonInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 122) { break; } } - case 50: { + case 122: { // rogueScoreInfo input.readMessage(rogueScoreInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java index 93dcf92..de390fa 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java @@ -21,77 +21,67 @@ public final class RogueInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 2; - */ - private long endTime; - - /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 6; */ private long beginTime; /** - * optional uint32 KMAGFHIIALA = 1; + * optional int64 end_time = 8; */ - private int kMAGFHIIALA; + private long endTime; /** - * optional uint32 season_id = 7; + * optional uint32 season_id = 1; */ private int seasonId; /** - * optional uint32 talent_points = 486; + * optional uint32 rogue_coin = 7; */ - private int talentPoints; + private int rogueCoin; /** - * optional uint32 HDBPIDMBJOH = 944; - */ - private int hDBPIDMBJOH; - - /** - * optional .RogueStatus status = 11; + * optional .RogueStatus status = 4; */ private int status; /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 5; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 2; */ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItemInfo = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); /** - * optional .RogueCurrentInfo rogue_progress = 83; - */ - private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueProgress = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance(); - - /** - * optional .RogueInfoData rogue_data = 256; - */ - private final RogueInfoDataOuterClass.RogueInfoData rogueData = RogueInfoDataOuterClass.RogueInfoData.newInstance(); - - /** - * optional .RogueAeonInfo rogue_aeon_info = 772; - */ - private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); - - /** - * optional .RogueMapInfo room_map = 862; - */ - private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance(); - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 1300; + * optional .RogueScoreRewardInfo rogue_score_info = 1307; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); /** - * repeated uint32 base_avatar_id_list = 12; + * optional .RogueCurrentInfo rogue_progress = 1483; + */ + private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueProgress = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance(); + + /** + * optional .RogueMapInfo room_map = 1536; + */ + private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance(); + + /** + * optional .RogueInfoData rogue_data = 2013; + */ + private final RogueInfoDataOuterClass.RogueInfoData rogueData = RogueInfoDataOuterClass.RogueInfoData.newInstance(); + + /** + * optional .RogueAeonInfo rogue_aeon_info = 2019; + */ + private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); + + /** + * repeated uint32 base_avatar_id_list = 14; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueArea rogue_area_list = 239; + * repeated .RogueArea rogue_area_list = 2009; */ private final RepeatedMessage rogueAreaList = RepeatedMessage.newEmptyInstance(RogueAreaOuterClass.RogueArea.getFactory()); @@ -106,62 +96,25 @@ public final class RogueInfoOuterClass { } /** - * optional int64 end_time = 2; - * @return whether the endTime field is set + * optional int64 begin_time = 6; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 end_time = 2; - * @return this - */ - public RogueInfo clearEndTime() { - bitField0_ &= ~0x00000001; - endTime = 0L; - return this; - } - - /** - * optional int64 end_time = 2; - * @return the endTime - */ - public long getEndTime() { - return endTime; - } - - /** - * optional int64 end_time = 2; - * @param value the endTime to set - * @return this - */ - public RogueInfo setEndTime(final long value) { - bitField0_ |= 0x00000001; - endTime = value; - return this; - } - - /** - * optional int64 begin_time = 14; - * @return whether the beginTime field is set - */ - public boolean hasBeginTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 6; * @return this */ public RogueInfo clearBeginTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; beginTime = 0L; return this; } /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 6; * @return the beginTime */ public long getBeginTime() { @@ -169,73 +122,73 @@ public final class RogueInfoOuterClass { } /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 6; * @param value the beginTime to set * @return this */ public RogueInfo setBeginTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; beginTime = value; return this; } /** - * optional uint32 KMAGFHIIALA = 1; - * @return whether the kMAGFHIIALA field is set + * optional int64 end_time = 8; + * @return whether the endTime field is set */ - public boolean hasKMAGFHIIALA() { + public boolean hasEndTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 end_time = 8; + * @return this + */ + public RogueInfo clearEndTime() { + bitField0_ &= ~0x00000002; + endTime = 0L; + return this; + } + + /** + * optional int64 end_time = 8; + * @return the endTime + */ + public long getEndTime() { + return endTime; + } + + /** + * optional int64 end_time = 8; + * @param value the endTime to set + * @return this + */ + public RogueInfo setEndTime(final long value) { + bitField0_ |= 0x00000002; + endTime = value; + return this; + } + + /** + * optional uint32 season_id = 1; + * @return whether the seasonId field is set + */ + public boolean hasSeasonId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 KMAGFHIIALA = 1; - * @return this - */ - public RogueInfo clearKMAGFHIIALA() { - bitField0_ &= ~0x00000004; - kMAGFHIIALA = 0; - return this; - } - - /** - * optional uint32 KMAGFHIIALA = 1; - * @return the kMAGFHIIALA - */ - public int getKMAGFHIIALA() { - return kMAGFHIIALA; - } - - /** - * optional uint32 KMAGFHIIALA = 1; - * @param value the kMAGFHIIALA to set - * @return this - */ - public RogueInfo setKMAGFHIIALA(final int value) { - bitField0_ |= 0x00000004; - kMAGFHIIALA = value; - return this; - } - - /** - * optional uint32 season_id = 7; - * @return whether the seasonId field is set - */ - public boolean hasSeasonId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 season_id = 7; + * optional uint32 season_id = 1; * @return this */ public RogueInfo clearSeasonId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; seasonId = 0; return this; } /** - * optional uint32 season_id = 7; + * optional uint32 season_id = 1; * @return the seasonId */ public int getSeasonId() { @@ -243,110 +196,73 @@ public final class RogueInfoOuterClass { } /** - * optional uint32 season_id = 7; + * optional uint32 season_id = 1; * @param value the seasonId to set * @return this */ public RogueInfo setSeasonId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; seasonId = value; return this; } /** - * optional uint32 talent_points = 486; - * @return whether the talentPoints field is set + * optional uint32 rogue_coin = 7; + * @return whether the rogueCoin field is set */ - public boolean hasTalentPoints() { + public boolean hasRogueCoin() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 rogue_coin = 7; + * @return this + */ + public RogueInfo clearRogueCoin() { + bitField0_ &= ~0x00000008; + rogueCoin = 0; + return this; + } + + /** + * optional uint32 rogue_coin = 7; + * @return the rogueCoin + */ + public int getRogueCoin() { + return rogueCoin; + } + + /** + * optional uint32 rogue_coin = 7; + * @param value the rogueCoin to set + * @return this + */ + public RogueInfo setRogueCoin(final int value) { + bitField0_ |= 0x00000008; + rogueCoin = value; + return this; + } + + /** + * optional .RogueStatus status = 4; + * @return whether the status field is set + */ + public boolean hasStatus() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 talent_points = 486; - * @return this - */ - public RogueInfo clearTalentPoints() { - bitField0_ &= ~0x00000010; - talentPoints = 0; - return this; - } - - /** - * optional uint32 talent_points = 486; - * @return the talentPoints - */ - public int getTalentPoints() { - return talentPoints; - } - - /** - * optional uint32 talent_points = 486; - * @param value the talentPoints to set - * @return this - */ - public RogueInfo setTalentPoints(final int value) { - bitField0_ |= 0x00000010; - talentPoints = value; - return this; - } - - /** - * optional uint32 HDBPIDMBJOH = 944; - * @return whether the hDBPIDMBJOH field is set - */ - public boolean hasHDBPIDMBJOH() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 HDBPIDMBJOH = 944; - * @return this - */ - public RogueInfo clearHDBPIDMBJOH() { - bitField0_ &= ~0x00000020; - hDBPIDMBJOH = 0; - return this; - } - - /** - * optional uint32 HDBPIDMBJOH = 944; - * @return the hDBPIDMBJOH - */ - public int getHDBPIDMBJOH() { - return hDBPIDMBJOH; - } - - /** - * optional uint32 HDBPIDMBJOH = 944; - * @param value the hDBPIDMBJOH to set - * @return this - */ - public RogueInfo setHDBPIDMBJOH(final int value) { - bitField0_ |= 0x00000020; - hDBPIDMBJOH = value; - return this; - } - - /** - * optional .RogueStatus status = 11; - * @return whether the status field is set - */ - public boolean hasStatus() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional .RogueStatus status = 11; + * optional .RogueStatus status = 4; * @return this */ public RogueInfo clearStatus() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000010; status = 0; return this; } /** - * optional .RogueStatus status = 11; + * optional .RogueStatus status = 4; * @return the status */ public RogueStatusOuterClass.RogueStatus getStatus() { @@ -373,42 +289,42 @@ public final class RogueInfoOuterClass { * @return this */ public RogueInfo setStatusValue(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; status = value; return this; } /** - * optional .RogueStatus status = 11; + * optional .RogueStatus status = 4; * @param value the status to set * @return this */ public RogueInfo setStatus(final RogueStatusOuterClass.RogueStatus value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; status = value.getNumber(); return this; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 5; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 2; * @return whether the rogueVirtualItemInfo field is set */ public boolean hasRogueVirtualItemInfo() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 5; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 2; * @return this */ public RogueInfo clearRogueVirtualItemInfo() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; rogueVirtualItemInfo.clear(); return this; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 5; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -422,7 +338,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 5; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -431,270 +347,42 @@ public final class RogueInfoOuterClass { * @return internal storage object for modifications */ public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getMutableRogueVirtualItemInfo() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; return rogueVirtualItemInfo; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 5; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 2; * @param value the rogueVirtualItemInfo to set * @return this */ public RogueInfo setRogueVirtualItemInfo( final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; rogueVirtualItemInfo.copyFrom(value); return this; } /** - * optional .RogueCurrentInfo rogue_progress = 83; - * @return whether the rogueProgress field is set - */ - public boolean hasRogueProgress() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional .RogueCurrentInfo rogue_progress = 83; - * @return this - */ - public RogueInfo clearRogueProgress() { - bitField0_ &= ~0x00000100; - rogueProgress.clear(); - return this; - } - - /** - * optional .RogueCurrentInfo rogue_progress = 83; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueProgress()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueCurrentInfoOuterClass.RogueCurrentInfo getRogueProgress() { - return rogueProgress; - } - - /** - * optional .RogueCurrentInfo rogue_progress = 83; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueCurrentInfoOuterClass.RogueCurrentInfo getMutableRogueProgress() { - bitField0_ |= 0x00000100; - return rogueProgress; - } - - /** - * optional .RogueCurrentInfo rogue_progress = 83; - * @param value the rogueProgress to set - * @return this - */ - public RogueInfo setRogueProgress(final RogueCurrentInfoOuterClass.RogueCurrentInfo value) { - bitField0_ |= 0x00000100; - rogueProgress.copyFrom(value); - return this; - } - - /** - * optional .RogueInfoData rogue_data = 256; - * @return whether the rogueData field is set - */ - public boolean hasRogueData() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * optional .RogueInfoData rogue_data = 256; - * @return this - */ - public RogueInfo clearRogueData() { - bitField0_ &= ~0x00000200; - rogueData.clear(); - return this; - } - - /** - * optional .RogueInfoData rogue_data = 256; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueData()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueInfoDataOuterClass.RogueInfoData getRogueData() { - return rogueData; - } - - /** - * optional .RogueInfoData rogue_data = 256; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueInfoDataOuterClass.RogueInfoData getMutableRogueData() { - bitField0_ |= 0x00000200; - return rogueData; - } - - /** - * optional .RogueInfoData rogue_data = 256; - * @param value the rogueData to set - * @return this - */ - public RogueInfo setRogueData(final RogueInfoDataOuterClass.RogueInfoData value) { - bitField0_ |= 0x00000200; - rogueData.copyFrom(value); - return this; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 772; - * @return whether the rogueAeonInfo field is set - */ - public boolean hasRogueAeonInfo() { - return (bitField0_ & 0x00000400) != 0; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 772; - * @return this - */ - public RogueInfo clearRogueAeonInfo() { - bitField0_ &= ~0x00000400; - rogueAeonInfo.clear(); - return this; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 772; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueAeonInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAeonInfoOuterClass.RogueAeonInfo getRogueAeonInfo() { - return rogueAeonInfo; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 772; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { - bitField0_ |= 0x00000400; - return rogueAeonInfo; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 772; - * @param value the rogueAeonInfo to set - * @return this - */ - public RogueInfo setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { - bitField0_ |= 0x00000400; - rogueAeonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueMapInfo room_map = 862; - * @return whether the roomMap field is set - */ - public boolean hasRoomMap() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * optional .RogueMapInfo room_map = 862; - * @return this - */ - public RogueInfo clearRoomMap() { - bitField0_ &= ~0x00000800; - roomMap.clear(); - return this; - } - - /** - * optional .RogueMapInfo room_map = 862; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRoomMap()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMapInfoOuterClass.RogueMapInfo getRoomMap() { - return roomMap; - } - - /** - * optional .RogueMapInfo room_map = 862; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() { - bitField0_ |= 0x00000800; - return roomMap; - } - - /** - * optional .RogueMapInfo room_map = 862; - * @param value the roomMap to set - * @return this - */ - public RogueInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) { - bitField0_ |= 0x00000800; - roomMap.copyFrom(value); - return this; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 1300; + * optional .RogueScoreRewardInfo rogue_score_info = 1307; * @return whether the rogueScoreInfo field is set */ public boolean hasRogueScoreInfo() { - return (bitField0_ & 0x00001000) != 0; + return (bitField0_ & 0x00000040) != 0; } /** - * optional .RogueScoreRewardInfo rogue_score_info = 1300; + * optional .RogueScoreRewardInfo rogue_score_info = 1307; * @return this */ public RogueInfo clearRogueScoreInfo() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000040; rogueScoreInfo.clear(); return this; } /** - * optional .RogueScoreRewardInfo rogue_score_info = 1300; + * optional .RogueScoreRewardInfo rogue_score_info = 1307; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -708,7 +396,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 1300; + * optional .RogueScoreRewardInfo rogue_score_info = 1307; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -717,42 +405,270 @@ public final class RogueInfoOuterClass { * @return internal storage object for modifications */ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000040; return rogueScoreInfo; } /** - * optional .RogueScoreRewardInfo rogue_score_info = 1300; + * optional .RogueScoreRewardInfo rogue_score_info = 1307; * @param value the rogueScoreInfo to set * @return this */ public RogueInfo setRogueScoreInfo( final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000040; rogueScoreInfo.copyFrom(value); return this; } /** - * repeated uint32 base_avatar_id_list = 12; - * @return whether the baseAvatarIdList field is set + * optional .RogueCurrentInfo rogue_progress = 1483; + * @return whether the rogueProgress field is set */ - public boolean hasBaseAvatarIdList() { - return (bitField0_ & 0x00002000) != 0; + public boolean hasRogueProgress() { + return (bitField0_ & 0x00000080) != 0; } /** - * repeated uint32 base_avatar_id_list = 12; + * optional .RogueCurrentInfo rogue_progress = 1483; + * @return this + */ + public RogueInfo clearRogueProgress() { + bitField0_ &= ~0x00000080; + rogueProgress.clear(); + return this; + } + + /** + * optional .RogueCurrentInfo rogue_progress = 1483; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueProgress()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueCurrentInfoOuterClass.RogueCurrentInfo getRogueProgress() { + return rogueProgress; + } + + /** + * optional .RogueCurrentInfo rogue_progress = 1483; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueCurrentInfoOuterClass.RogueCurrentInfo getMutableRogueProgress() { + bitField0_ |= 0x00000080; + return rogueProgress; + } + + /** + * optional .RogueCurrentInfo rogue_progress = 1483; + * @param value the rogueProgress to set + * @return this + */ + public RogueInfo setRogueProgress(final RogueCurrentInfoOuterClass.RogueCurrentInfo value) { + bitField0_ |= 0x00000080; + rogueProgress.copyFrom(value); + return this; + } + + /** + * optional .RogueMapInfo room_map = 1536; + * @return whether the roomMap field is set + */ + public boolean hasRoomMap() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional .RogueMapInfo room_map = 1536; + * @return this + */ + public RogueInfo clearRoomMap() { + bitField0_ &= ~0x00000100; + roomMap.clear(); + return this; + } + + /** + * optional .RogueMapInfo room_map = 1536; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRoomMap()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueMapInfoOuterClass.RogueMapInfo getRoomMap() { + return roomMap; + } + + /** + * optional .RogueMapInfo room_map = 1536; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() { + bitField0_ |= 0x00000100; + return roomMap; + } + + /** + * optional .RogueMapInfo room_map = 1536; + * @param value the roomMap to set + * @return this + */ + public RogueInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) { + bitField0_ |= 0x00000100; + roomMap.copyFrom(value); + return this; + } + + /** + * optional .RogueInfoData rogue_data = 2013; + * @return whether the rogueData field is set + */ + public boolean hasRogueData() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional .RogueInfoData rogue_data = 2013; + * @return this + */ + public RogueInfo clearRogueData() { + bitField0_ &= ~0x00000200; + rogueData.clear(); + return this; + } + + /** + * optional .RogueInfoData rogue_data = 2013; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueInfoDataOuterClass.RogueInfoData getRogueData() { + return rogueData; + } + + /** + * optional .RogueInfoData rogue_data = 2013; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueInfoDataOuterClass.RogueInfoData getMutableRogueData() { + bitField0_ |= 0x00000200; + return rogueData; + } + + /** + * optional .RogueInfoData rogue_data = 2013; + * @param value the rogueData to set + * @return this + */ + public RogueInfo setRogueData(final RogueInfoDataOuterClass.RogueInfoData value) { + bitField0_ |= 0x00000200; + rogueData.copyFrom(value); + return this; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 2019; + * @return whether the rogueAeonInfo field is set + */ + public boolean hasRogueAeonInfo() { + return (bitField0_ & 0x00000400) != 0; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 2019; + * @return this + */ + public RogueInfo clearRogueAeonInfo() { + bitField0_ &= ~0x00000400; + rogueAeonInfo.clear(); + return this; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 2019; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueAeonInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAeonInfoOuterClass.RogueAeonInfo getRogueAeonInfo() { + return rogueAeonInfo; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 2019; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { + bitField0_ |= 0x00000400; + return rogueAeonInfo; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 2019; + * @param value the rogueAeonInfo to set + * @return this + */ + public RogueInfo setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { + bitField0_ |= 0x00000400; + rogueAeonInfo.copyFrom(value); + return this; + } + + /** + * repeated uint32 base_avatar_id_list = 14; + * @return whether the baseAvatarIdList field is set + */ + public boolean hasBaseAvatarIdList() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * repeated uint32 base_avatar_id_list = 14; * @return this */ public RogueInfo clearBaseAvatarIdList() { - bitField0_ &= ~0x00002000; + bitField0_ &= ~0x00000800; baseAvatarIdList.clear(); return this; } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -766,7 +682,7 @@ public final class RogueInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -775,52 +691,52 @@ public final class RogueInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableBaseAvatarIdList() { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000800; return baseAvatarIdList; } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 14; * @param value the baseAvatarIdList to add * @return this */ public RogueInfo addBaseAvatarIdList(final int value) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000800; baseAvatarIdList.add(value); return this; } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 14; * @param values the baseAvatarIdList to add * @return this */ public RogueInfo addAllBaseAvatarIdList(final int... values) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000800; baseAvatarIdList.addAll(values); return this; } /** - * repeated .RogueArea rogue_area_list = 239; + * repeated .RogueArea rogue_area_list = 2009; * @return whether the rogueAreaList field is set */ public boolean hasRogueAreaList() { - return (bitField0_ & 0x00004000) != 0; + return (bitField0_ & 0x00001000) != 0; } /** - * repeated .RogueArea rogue_area_list = 239; + * repeated .RogueArea rogue_area_list = 2009; * @return this */ public RogueInfo clearRogueAreaList() { - bitField0_ &= ~0x00004000; + bitField0_ &= ~0x00001000; rogueAreaList.clear(); return this; } /** - * repeated .RogueArea rogue_area_list = 239; + * repeated .RogueArea rogue_area_list = 2009; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -834,7 +750,7 @@ public final class RogueInfoOuterClass { } /** - * repeated .RogueArea rogue_area_list = 239; + * repeated .RogueArea rogue_area_list = 2009; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -843,28 +759,28 @@ public final class RogueInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRogueAreaList() { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00001000; return rogueAreaList; } /** - * repeated .RogueArea rogue_area_list = 239; + * repeated .RogueArea rogue_area_list = 2009; * @param value the rogueAreaList to add * @return this */ public RogueInfo addRogueAreaList(final RogueAreaOuterClass.RogueArea value) { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00001000; rogueAreaList.add(value); return this; } /** - * repeated .RogueArea rogue_area_list = 239; + * repeated .RogueArea rogue_area_list = 2009; * @param values the rogueAreaList to add * @return this */ public RogueInfo addAllRogueAreaList(final RogueAreaOuterClass.RogueArea... values) { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00001000; rogueAreaList.addAll(values); return this; } @@ -874,19 +790,17 @@ public final class RogueInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; - kMAGFHIIALA = other.kMAGFHIIALA; + endTime = other.endTime; seasonId = other.seasonId; - talentPoints = other.talentPoints; - hDBPIDMBJOH = other.hDBPIDMBJOH; + rogueCoin = other.rogueCoin; status = other.status; rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo); + rogueScoreInfo.copyFrom(other.rogueScoreInfo); rogueProgress.copyFrom(other.rogueProgress); + roomMap.copyFrom(other.roomMap); rogueData.copyFrom(other.rogueData); rogueAeonInfo.copyFrom(other.rogueAeonInfo); - roomMap.copyFrom(other.roomMap); - rogueScoreInfo.copyFrom(other.rogueScoreInfo); baseAvatarIdList.copyFrom(other.baseAvatarIdList); rogueAreaList.copyFrom(other.rogueAreaList); } @@ -899,23 +813,17 @@ public final class RogueInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } - if (other.hasKMAGFHIIALA()) { - setKMAGFHIIALA(other.kMAGFHIIALA); + if (other.hasEndTime()) { + setEndTime(other.endTime); } if (other.hasSeasonId()) { setSeasonId(other.seasonId); } - if (other.hasTalentPoints()) { - setTalentPoints(other.talentPoints); - } - if (other.hasHDBPIDMBJOH()) { - setHDBPIDMBJOH(other.hDBPIDMBJOH); + if (other.hasRogueCoin()) { + setRogueCoin(other.rogueCoin); } if (other.hasStatus()) { setStatusValue(other.status); @@ -923,21 +831,21 @@ public final class RogueInfoOuterClass { if (other.hasRogueVirtualItemInfo()) { getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo); } + if (other.hasRogueScoreInfo()) { + getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo); + } if (other.hasRogueProgress()) { getMutableRogueProgress().mergeFrom(other.rogueProgress); } + if (other.hasRoomMap()) { + getMutableRoomMap().mergeFrom(other.roomMap); + } if (other.hasRogueData()) { getMutableRogueData().mergeFrom(other.rogueData); } if (other.hasRogueAeonInfo()) { getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); } - if (other.hasRoomMap()) { - getMutableRoomMap().mergeFrom(other.roomMap); - } - if (other.hasRogueScoreInfo()) { - getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo); - } if (other.hasBaseAvatarIdList()) { getMutableBaseAvatarIdList().addAll(other.baseAvatarIdList); } @@ -954,19 +862,17 @@ public final class RogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; - kMAGFHIIALA = 0; + endTime = 0L; seasonId = 0; - talentPoints = 0; - hDBPIDMBJOH = 0; + rogueCoin = 0; status = 0; rogueVirtualItemInfo.clear(); + rogueScoreInfo.clear(); rogueProgress.clear(); + roomMap.clear(); rogueData.clear(); rogueAeonInfo.clear(); - roomMap.clear(); - rogueScoreInfo.clear(); baseAvatarIdList.clear(); rogueAreaList.clear(); return this; @@ -980,11 +886,11 @@ public final class RogueInfoOuterClass { cachedSize = -1; bitField0_ = 0; rogueVirtualItemInfo.clearQuick(); + rogueScoreInfo.clearQuick(); rogueProgress.clearQuick(); + roomMap.clearQuick(); rogueData.clearQuick(); rogueAeonInfo.clearQuick(); - roomMap.clearQuick(); - rogueScoreInfo.clearQuick(); baseAvatarIdList.clear(); rogueAreaList.clearQuick(); return this; @@ -1000,19 +906,17 @@ public final class RogueInfoOuterClass { } RogueInfo other = (RogueInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) - && (!hasKMAGFHIIALA() || kMAGFHIIALA == other.kMAGFHIIALA) + && (!hasEndTime() || endTime == other.endTime) && (!hasSeasonId() || seasonId == other.seasonId) - && (!hasTalentPoints() || talentPoints == other.talentPoints) - && (!hasHDBPIDMBJOH() || hDBPIDMBJOH == other.hDBPIDMBJOH) + && (!hasRogueCoin() || rogueCoin == other.rogueCoin) && (!hasStatus() || status == other.status) && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo)) + && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)) && (!hasRogueProgress() || rogueProgress.equals(other.rogueProgress)) + && (!hasRoomMap() || roomMap.equals(other.roomMap)) && (!hasRogueData() || rogueData.equals(other.rogueData)) && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) - && (!hasRoomMap() || roomMap.equals(other.roomMap)) - && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)) && (!hasBaseAvatarIdList() || baseAvatarIdList.equals(other.baseAvatarIdList)) && (!hasRogueAreaList() || rogueAreaList.equals(other.rogueAreaList)); } @@ -1020,66 +924,58 @@ public final class RogueInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeInt64NoTag(endTime); + output.writeRawByte((byte) 48); + output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeInt64NoTag(beginTime); + output.writeRawByte((byte) 64); + output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(kMAGFHIIALA); + output.writeUInt32NoTag(seasonId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(seasonId); + output.writeUInt32NoTag(rogueCoin); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 7856); - output.writeUInt32NoTag(talentPoints); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 15232); - output.writeUInt32NoTag(hDBPIDMBJOH); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeEnumNoTag(status); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 42); + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 18); output.writeMessageNoTag(rogueVirtualItemInfo); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawLittleEndian16((short) 1434); + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawLittleEndian16((short) 20954); + output.writeMessageNoTag(rogueScoreInfo); + } + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawLittleEndian16((short) 23770); output.writeMessageNoTag(rogueProgress); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawLittleEndian16((short) 24706); + output.writeMessageNoTag(roomMap); + } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawLittleEndian16((short) 4226); + output.writeRawLittleEndian16((short) 32234); output.writeMessageNoTag(rogueData); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawLittleEndian16((short) 12450); + output.writeRawLittleEndian16((short) 32410); output.writeMessageNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawLittleEndian16((short) 13810); - output.writeMessageNoTag(roomMap); - } - if ((bitField0_ & 0x00001000) != 0) { - output.writeRawLittleEndian16((short) 20898); - output.writeMessageNoTag(rogueScoreInfo); - } - if ((bitField0_ & 0x00002000) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00001000) != 0) { for (int i = 0; i < rogueAreaList.length(); i++) { - output.writeRawLittleEndian16((short) 3834); + output.writeRawLittleEndian16((short) 32202); output.writeMessageNoTag(rogueAreaList.get(i)); } } @@ -1089,32 +985,32 @@ public final class RogueInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kMAGFHIIALA); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(seasonId); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueCoin); + } if ((bitField0_ & 0x00000010) != 0) { - size += 2 + ProtoSink.computeUInt32SizeNoTag(talentPoints); - } - if ((bitField0_ & 0x00000020) != 0) { - size += 2 + ProtoSink.computeUInt32SizeNoTag(hDBPIDMBJOH); - } - if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(status); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { + size += 2 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); + } + if ((bitField0_ & 0x00000080) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(rogueProgress); } + if ((bitField0_ & 0x00000100) != 0) { + size += 2 + ProtoSink.computeMessageSizeNoTag(roomMap); + } if ((bitField0_ & 0x00000200) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(rogueData); } @@ -1122,15 +1018,9 @@ public final class RogueInfoOuterClass { size += 2 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000800) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(roomMap); - } - if ((bitField0_ & 0x00001000) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); - } - if ((bitField0_ & 0x00002000) != 0) { size += (1 * baseAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(baseAvatarIdList); } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00001000) != 0) { size += (2 * rogueAreaList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAreaList); } return size; @@ -1143,18 +1033,18 @@ public final class RogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // endTime - endTime = input.readInt64(); + case 48: { + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { - // beginTime - beginTime = input.readInt64(); + case 64: { + // endTime + endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 8) { @@ -1162,8 +1052,8 @@ public final class RogueInfoOuterClass { } } case 8: { - // kMAGFHIIALA - kMAGFHIIALA = input.readUInt32(); + // seasonId + seasonId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 56) { @@ -1171,111 +1061,93 @@ public final class RogueInfoOuterClass { } } case 56: { - // seasonId - seasonId = input.readUInt32(); + // rogueCoin + rogueCoin = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 3888) { + if (tag != 32) { break; } } - case 3888: { - // talentPoints - talentPoints = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 7552) { - break; - } - } - case 7552: { - // hDBPIDMBJOH - hDBPIDMBJOH = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 32: { // status final int value = input.readInt32(); if (RogueStatusOuterClass.RogueStatus.forNumber(value) != null) { status = value; - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 42) { + if (tag != 18) { break; } } - case 42: { + case 18: { // rogueVirtualItemInfo input.readMessage(rogueVirtualItemInfo); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 666) { + if (tag != 10458) { break; } } - case 666: { + case 10458: { + // rogueScoreInfo + input.readMessage(rogueScoreInfo); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 11866) { + break; + } + } + case 11866: { // rogueProgress input.readMessage(rogueProgress); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 2050) { + if (tag != 12290) { break; } } - case 2050: { + case 12290: { + // roomMap + input.readMessage(roomMap); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 16106) { + break; + } + } + case 16106: { // rogueData input.readMessage(rogueData); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 6178) { + if (tag != 16154) { break; } } - case 6178: { + case 16154: { // rogueAeonInfo input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000400; tag = input.readTag(); - if (tag != 6898) { + if (tag != 114) { break; } } - case 6898: { - // roomMap - input.readMessage(roomMap); - bitField0_ |= 0x00000800; - tag = input.readTag(); - if (tag != 10402) { - break; - } - } - case 10402: { - // rogueScoreInfo - input.readMessage(rogueScoreInfo); - bitField0_ |= 0x00001000; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { + case 114: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 1914) { + if (tag != 16074) { break; } } - case 1914: { + case 16074: { // rogueAreaList tag = input.readRepeatedMessage(rogueAreaList, tag); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00001000; if (tag != 0) { break; } @@ -1290,10 +1162,10 @@ public final class RogueInfoOuterClass { tag = input.readTag(); break; } - case 96: { + case 112: { // baseAvatarIdList [packed=false] tag = input.readRepeatedUInt32(baseAvatarIdList, tag); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000800; break; } } @@ -1304,32 +1176,32 @@ public final class RogueInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeInt64(FieldNames.beginTime, beginTime); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.kMAGFHIIALA, kMAGFHIIALA); + if ((bitField0_ & 0x00000002) != 0) { + output.writeInt64(FieldNames.endTime, endTime); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.seasonId, seasonId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.rogueCoin, rogueCoin); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.talentPoints, talentPoints); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.hDBPIDMBJOH, hDBPIDMBJOH); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeEnum(FieldNames.status, status, RogueStatusOuterClass.RogueStatus.converter()); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { + output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); + } + if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.rogueProgress, rogueProgress); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeMessage(FieldNames.roomMap, roomMap); + } if ((bitField0_ & 0x00000200) != 0) { output.writeMessage(FieldNames.rogueData, rogueData); } @@ -1337,15 +1209,9 @@ public final class RogueInfoOuterClass { output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); } if ((bitField0_ & 0x00000800) != 0) { - output.writeMessage(FieldNames.roomMap, roomMap); - } - if ((bitField0_ & 0x00001000) != 0) { - output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); - } - if ((bitField0_ & 0x00002000) != 0) { output.writeRepeatedUInt32(FieldNames.baseAvatarIdList, baseAvatarIdList); } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00001000) != 0) { output.writeRepeatedMessage(FieldNames.rogueAreaList, rogueAreaList); } output.endObject(); @@ -1358,11 +1224,11 @@ public final class RogueInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1607243192: - case 1725551537: { - if (input.isAtField(FieldNames.endTime)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + beginTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -1370,11 +1236,11 @@ public final class RogueInfoOuterClass { } break; } - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case -1607243192: + case 1725551537: { + if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + endTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -1382,22 +1248,23 @@ public final class RogueInfoOuterClass { } break; } - case -2082273588: { - if (input.isAtField(FieldNames.kMAGFHIIALA)) { - if (!input.trySkipNullValue()) { - kMAGFHIIALA = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 889931614: case 1818097655: { if (input.isAtField(FieldNames.seasonId)) { if (!input.trySkipNullValue()) { seasonId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 655631243: + case -1124761130: { + if (input.isAtField(FieldNames.rogueCoin)) { + if (!input.trySkipNullValue()) { + rogueCoin = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1405,36 +1272,13 @@ public final class RogueInfoOuterClass { } break; } - case -1626892049: - case 1567623062: { - if (input.isAtField(FieldNames.talentPoints)) { - if (!input.trySkipNullValue()) { - talentPoints = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 31692841: { - if (input.isAtField(FieldNames.hDBPIDMBJOH)) { - if (!input.trySkipNullValue()) { - hDBPIDMBJOH = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } case -892481550: { if (input.isAtField(FieldNames.status)) { if (!input.trySkipNullValue()) { final RogueStatusOuterClass.RogueStatus value = input.readEnum(RogueStatusOuterClass.RogueStatus.converter()); if (value != null) { status = value.getNumber(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; } else { input.skipUnknownEnumValue(); } @@ -1449,7 +1293,19 @@ public final class RogueInfoOuterClass { if (input.isAtField(FieldNames.rogueVirtualItemInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueVirtualItemInfo); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2078217638: + case -208816704: { + if (input.isAtField(FieldNames.rogueScoreInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueScoreInfo); + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1461,6 +1317,18 @@ public final class RogueInfoOuterClass { if (input.isAtField(FieldNames.rogueProgress)) { if (!input.trySkipNullValue()) { input.readMessage(rogueProgress); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1379875457: + case -172986376: { + if (input.isAtField(FieldNames.roomMap)) { + if (!input.trySkipNullValue()) { + input.readMessage(roomMap); bitField0_ |= 0x00000100; } } else { @@ -1492,36 +1360,12 @@ public final class RogueInfoOuterClass { } break; } - case 1379875457: - case -172986376: { - if (input.isAtField(FieldNames.roomMap)) { - if (!input.trySkipNullValue()) { - input.readMessage(roomMap); - bitField0_ |= 0x00000800; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2078217638: - case -208816704: { - if (input.isAtField(FieldNames.rogueScoreInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueScoreInfo); - bitField0_ |= 0x00001000; - } - } else { - input.skipUnknownField(); - } - break; - } case -1212654461: case 914628490: { if (input.isAtField(FieldNames.baseAvatarIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(baseAvatarIdList); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1533,7 +1377,7 @@ public final class RogueInfoOuterClass { if (input.isAtField(FieldNames.rogueAreaList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(rogueAreaList); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00001000; } } else { input.skipUnknownField(); @@ -1592,32 +1436,28 @@ public final class RogueInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); - static final FieldName kMAGFHIIALA = FieldName.forField("KMAGFHIIALA"); + static final FieldName endTime = FieldName.forField("endTime", "end_time"); static final FieldName seasonId = FieldName.forField("seasonId", "season_id"); - static final FieldName talentPoints = FieldName.forField("talentPoints", "talent_points"); - - static final FieldName hDBPIDMBJOH = FieldName.forField("HDBPIDMBJOH"); + static final FieldName rogueCoin = FieldName.forField("rogueCoin", "rogue_coin"); static final FieldName status = FieldName.forField("status"); static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info"); + static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info"); + static final FieldName rogueProgress = FieldName.forField("rogueProgress", "rogue_progress"); + static final FieldName roomMap = FieldName.forField("roomMap", "room_map"); + static final FieldName rogueData = FieldName.forField("rogueData", "rogue_data"); static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); - static final FieldName roomMap = FieldName.forField("roomMap", "room_map"); - - static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info"); - static final FieldName baseAvatarIdList = FieldName.forField("baseAvatarIdList", "base_avatar_id_list"); static final FieldName rogueAreaList = FieldName.forField("rogueAreaList", "rogue_area_list"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java index 281fbdd..bdc37b6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java @@ -19,14 +19,14 @@ public final class RogueMiracleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueMiracleSelectInfo miracle_select_info = 6; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 2; */ - private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance(); + private final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo rogueMiracleInfo = RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo.newInstance(); /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 10; + * optional .RogueMiracleSelectInfo miracle_select_info = 3; */ - private final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo achivedMiracleInfo = RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo.newInstance(); + private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance(); private RogueMiracleInfo() { } @@ -39,25 +39,83 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 6; - * @return whether the miracleSelectInfo field is set + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 2; + * @return whether the rogueMiracleInfo field is set */ - public boolean hasMiracleSelectInfo() { + public boolean hasRogueMiracleInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 6; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 2; + * @return this + */ + public RogueMiracleInfo clearRogueMiracleInfo() { + bitField0_ &= ~0x00000001; + rogueMiracleInfo.clear(); + return this; + } + + /** + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 2; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueMiracleInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getRogueMiracleInfo() { + return rogueMiracleInfo; + } + + /** + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 2; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getMutableRogueMiracleInfo() { + bitField0_ |= 0x00000001; + return rogueMiracleInfo; + } + + /** + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 2; + * @param value the rogueMiracleInfo to set + * @return this + */ + public RogueMiracleInfo setRogueMiracleInfo( + final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo value) { + bitField0_ |= 0x00000001; + rogueMiracleInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueMiracleSelectInfo miracle_select_info = 3; + * @return whether the miracleSelectInfo field is set + */ + public boolean hasMiracleSelectInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueMiracleSelectInfo miracle_select_info = 3; * @return this */ public RogueMiracleInfo clearMiracleSelectInfo() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; miracleSelectInfo.clear(); return this; } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 6; + * optional .RogueMiracleSelectInfo miracle_select_info = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -71,7 +129,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 6; + * optional .RogueMiracleSelectInfo miracle_select_info = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,88 +138,29 @@ public final class RogueMiracleInfoOuterClass { * @return internal storage object for modifications */ public RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo getMutableMiracleSelectInfo() { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return miracleSelectInfo; } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 6; + * optional .RogueMiracleSelectInfo miracle_select_info = 3; * @param value the miracleSelectInfo to set * @return this */ public RogueMiracleInfo setMiracleSelectInfo( final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; miracleSelectInfo.copyFrom(value); return this; } - /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 10; - * @return whether the achivedMiracleInfo field is set - */ - public boolean hasAchivedMiracleInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 10; - * @return this - */ - public RogueMiracleInfo clearAchivedMiracleInfo() { - bitField0_ &= ~0x00000002; - achivedMiracleInfo.clear(); - return this; - } - - /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 10; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableAchivedMiracleInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getAchivedMiracleInfo() { - return achivedMiracleInfo; - } - - /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 10; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getMutableAchivedMiracleInfo( - ) { - bitField0_ |= 0x00000002; - return achivedMiracleInfo; - } - - /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 10; - * @param value the achivedMiracleInfo to set - * @return this - */ - public RogueMiracleInfo setAchivedMiracleInfo( - final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo value) { - bitField0_ |= 0x00000002; - achivedMiracleInfo.copyFrom(value); - return this; - } - @Override public RogueMiracleInfo copyFrom(final RogueMiracleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); miracleSelectInfo.copyFrom(other.miracleSelectInfo); - achivedMiracleInfo.copyFrom(other.achivedMiracleInfo); } return this; } @@ -172,12 +171,12 @@ public final class RogueMiracleInfoOuterClass { return this; } cachedSize = -1; + if (other.hasRogueMiracleInfo()) { + getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); + } if (other.hasMiracleSelectInfo()) { getMutableMiracleSelectInfo().mergeFrom(other.miracleSelectInfo); } - if (other.hasAchivedMiracleInfo()) { - getMutableAchivedMiracleInfo().mergeFrom(other.achivedMiracleInfo); - } return this; } @@ -188,8 +187,8 @@ public final class RogueMiracleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + rogueMiracleInfo.clear(); miracleSelectInfo.clear(); - achivedMiracleInfo.clear(); return this; } @@ -200,8 +199,8 @@ public final class RogueMiracleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + rogueMiracleInfo.clearQuick(); miracleSelectInfo.clearQuick(); - achivedMiracleInfo.clearQuick(); return this; } @@ -215,19 +214,19 @@ public final class RogueMiracleInfoOuterClass { } RogueMiracleInfo other = (RogueMiracleInfo) o; return bitField0_ == other.bitField0_ - && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)) - && (!hasAchivedMiracleInfo() || achivedMiracleInfo.equals(other.achivedMiracleInfo)); + && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) + && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(miracleSelectInfo); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(rogueMiracleInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(achivedMiracleInfo); + output.writeRawByte((byte) 26); + output.writeMessageNoTag(miracleSelectInfo); } } @@ -235,10 +234,10 @@ public final class RogueMiracleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(achivedMiracleInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); } return size; } @@ -250,18 +249,18 @@ public final class RogueMiracleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { - // miracleSelectInfo - input.readMessage(miracleSelectInfo); + case 18: { + // rogueMiracleInfo + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 26) { break; } } - case 82: { - // achivedMiracleInfo - input.readMessage(achivedMiracleInfo); + case 26: { + // miracleSelectInfo + input.readMessage(miracleSelectInfo); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -286,10 +285,10 @@ public final class RogueMiracleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); + output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.achivedMiracleInfo, achivedMiracleInfo); + output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); } output.endObject(); } @@ -301,11 +300,11 @@ public final class RogueMiracleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1009314021: - case -1608054973: { - if (input.isAtField(FieldNames.miracleSelectInfo)) { + case -452511099: + case 1925436929: { + if (input.isAtField(FieldNames.rogueMiracleInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(miracleSelectInfo); + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000001; } } else { @@ -313,11 +312,11 @@ public final class RogueMiracleInfoOuterClass { } break; } - case -213623475: - case -431790391: { - if (input.isAtField(FieldNames.achivedMiracleInfo)) { + case -1009314021: + case -1608054973: { + if (input.isAtField(FieldNames.miracleSelectInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(achivedMiracleInfo); + input.readMessage(miracleSelectInfo); bitField0_ |= 0x00000002; } } else { @@ -378,9 +377,9 @@ public final class RogueMiracleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName miracleSelectInfo = FieldName.forField("miracleSelectInfo", "miracle_select_info"); + static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); - static final FieldName achivedMiracleInfo = FieldName.forField("achivedMiracleInfo", "achived_miracle_info"); + static final FieldName miracleSelectInfo = FieldName.forField("miracleSelectInfo", "miracle_select_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java index dc7507c..e2256c2 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java @@ -20,25 +20,20 @@ public final class RogueMiracleSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool show_handbook_hint = 15; + * optional bool show_handbook_hint = 7; */ private boolean showHandbookHint; /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 7; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 13; */ - private final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo achivedMiracleInfo = RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo.newInstance(); + private final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo rogueMiracleInfo = RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo.newInstance(); /** - * repeated uint32 miracle_id_list = 8; + * repeated uint32 miracle_id_list = 12; */ private final RepeatedInt miracleIdList = RepeatedInt.newEmptyInstance(); - /** - * repeated uint32 FBCFOBKNEJB = 12; - */ - private final RepeatedInt fBCFOBKNEJB = RepeatedInt.newEmptyInstance(); - private RogueMiracleSelectInfo() { } @@ -50,7 +45,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional bool show_handbook_hint = 15; + * optional bool show_handbook_hint = 7; * @return whether the showHandbookHint field is set */ public boolean hasShowHandbookHint() { @@ -58,7 +53,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional bool show_handbook_hint = 15; + * optional bool show_handbook_hint = 7; * @return this */ public RogueMiracleSelectInfo clearShowHandbookHint() { @@ -68,7 +63,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional bool show_handbook_hint = 15; + * optional bool show_handbook_hint = 7; * @return the showHandbookHint */ public boolean getShowHandbookHint() { @@ -76,7 +71,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional bool show_handbook_hint = 15; + * optional bool show_handbook_hint = 7; * @param value the showHandbookHint to set * @return this */ @@ -87,39 +82,39 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 7; - * @return whether the achivedMiracleInfo field is set + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 13; + * @return whether the rogueMiracleInfo field is set */ - public boolean hasAchivedMiracleInfo() { + public boolean hasRogueMiracleInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 7; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 13; * @return this */ - public RogueMiracleSelectInfo clearAchivedMiracleInfo() { + public RogueMiracleSelectInfo clearRogueMiracleInfo() { bitField0_ &= ~0x00000002; - achivedMiracleInfo.clear(); + rogueMiracleInfo.clear(); return this; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 7; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableAchivedMiracleInfo()} if you want to modify it. + * Use {@link #getMutableRogueMiracleInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getAchivedMiracleInfo() { - return achivedMiracleInfo; + public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getRogueMiracleInfo() { + return rogueMiracleInfo; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 7; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -127,26 +122,25 @@ public final class RogueMiracleSelectInfoOuterClass { * * @return internal storage object for modifications */ - public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getMutableAchivedMiracleInfo( - ) { + public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getMutableRogueMiracleInfo() { bitField0_ |= 0x00000002; - return achivedMiracleInfo; + return rogueMiracleInfo; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 7; - * @param value the achivedMiracleInfo to set + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 13; + * @param value the rogueMiracleInfo to set * @return this */ - public RogueMiracleSelectInfo setAchivedMiracleInfo( + public RogueMiracleSelectInfo setRogueMiracleInfo( final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo value) { bitField0_ |= 0x00000002; - achivedMiracleInfo.copyFrom(value); + rogueMiracleInfo.copyFrom(value); return this; } /** - * repeated uint32 miracle_id_list = 8; + * repeated uint32 miracle_id_list = 12; * @return whether the miracleIdList field is set */ public boolean hasMiracleIdList() { @@ -154,7 +148,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_id_list = 8; + * repeated uint32 miracle_id_list = 12; * @return this */ public RogueMiracleSelectInfo clearMiracleIdList() { @@ -164,7 +158,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_id_list = 8; + * repeated uint32 miracle_id_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -178,7 +172,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_id_list = 8; + * repeated uint32 miracle_id_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -192,7 +186,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_id_list = 8; + * repeated uint32 miracle_id_list = 12; * @param value the miracleIdList to add * @return this */ @@ -203,7 +197,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_id_list = 8; + * repeated uint32 miracle_id_list = 12; * @param values the miracleIdList to add * @return this */ @@ -213,83 +207,14 @@ public final class RogueMiracleSelectInfoOuterClass { return this; } - /** - * repeated uint32 FBCFOBKNEJB = 12; - * @return whether the fBCFOBKNEJB field is set - */ - public boolean hasFBCFOBKNEJB() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 FBCFOBKNEJB = 12; - * @return this - */ - public RogueMiracleSelectInfo clearFBCFOBKNEJB() { - bitField0_ &= ~0x00000008; - fBCFOBKNEJB.clear(); - return this; - } - - /** - * repeated uint32 FBCFOBKNEJB = 12; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableFBCFOBKNEJB()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getFBCFOBKNEJB() { - return fBCFOBKNEJB; - } - - /** - * repeated uint32 FBCFOBKNEJB = 12; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableFBCFOBKNEJB() { - bitField0_ |= 0x00000008; - return fBCFOBKNEJB; - } - - /** - * repeated uint32 FBCFOBKNEJB = 12; - * @param value the fBCFOBKNEJB to add - * @return this - */ - public RogueMiracleSelectInfo addFBCFOBKNEJB(final int value) { - bitField0_ |= 0x00000008; - fBCFOBKNEJB.add(value); - return this; - } - - /** - * repeated uint32 FBCFOBKNEJB = 12; - * @param values the fBCFOBKNEJB to add - * @return this - */ - public RogueMiracleSelectInfo addAllFBCFOBKNEJB(final int... values) { - bitField0_ |= 0x00000008; - fBCFOBKNEJB.addAll(values); - return this; - } - @Override public RogueMiracleSelectInfo copyFrom(final RogueMiracleSelectInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; showHandbookHint = other.showHandbookHint; - achivedMiracleInfo.copyFrom(other.achivedMiracleInfo); + rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); miracleIdList.copyFrom(other.miracleIdList); - fBCFOBKNEJB.copyFrom(other.fBCFOBKNEJB); } return this; } @@ -303,15 +228,12 @@ public final class RogueMiracleSelectInfoOuterClass { if (other.hasShowHandbookHint()) { setShowHandbookHint(other.showHandbookHint); } - if (other.hasAchivedMiracleInfo()) { - getMutableAchivedMiracleInfo().mergeFrom(other.achivedMiracleInfo); + if (other.hasRogueMiracleInfo()) { + getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); } if (other.hasMiracleIdList()) { getMutableMiracleIdList().addAll(other.miracleIdList); } - if (other.hasFBCFOBKNEJB()) { - getMutableFBCFOBKNEJB().addAll(other.fBCFOBKNEJB); - } return this; } @@ -323,9 +245,8 @@ public final class RogueMiracleSelectInfoOuterClass { cachedSize = -1; bitField0_ = 0; showHandbookHint = false; - achivedMiracleInfo.clear(); + rogueMiracleInfo.clear(); miracleIdList.clear(); - fBCFOBKNEJB.clear(); return this; } @@ -336,9 +257,8 @@ public final class RogueMiracleSelectInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - achivedMiracleInfo.clearQuick(); + rogueMiracleInfo.clearQuick(); miracleIdList.clear(); - fBCFOBKNEJB.clear(); return this; } @@ -353,31 +273,24 @@ public final class RogueMiracleSelectInfoOuterClass { RogueMiracleSelectInfo other = (RogueMiracleSelectInfo) o; return bitField0_ == other.bitField0_ && (!hasShowHandbookHint() || showHandbookHint == other.showHandbookHint) - && (!hasAchivedMiracleInfo() || achivedMiracleInfo.equals(other.achivedMiracleInfo)) - && (!hasMiracleIdList() || miracleIdList.equals(other.miracleIdList)) - && (!hasFBCFOBKNEJB() || fBCFOBKNEJB.equals(other.fBCFOBKNEJB)); + && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) + && (!hasMiracleIdList() || miracleIdList.equals(other.miracleIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeBoolNoTag(showHandbookHint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(achivedMiracleInfo); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(rogueMiracleInfo); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < miracleIdList.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(miracleIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < fBCFOBKNEJB.length(); i++) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(fBCFOBKNEJB.array()[i]); + output.writeUInt32NoTag(miracleIdList.array()[i]); } } } @@ -389,14 +302,11 @@ public final class RogueMiracleSelectInfoOuterClass { size += 2; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(achivedMiracleInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * miracleIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(miracleIdList); } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * fBCFOBKNEJB.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(fBCFOBKNEJB); - } return size; } @@ -407,37 +317,28 @@ public final class RogueMiracleSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 56: { // showHandbookHint showHandbookHint = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { - // achivedMiracleInfo - input.readMessage(achivedMiracleInfo); + case 106: { + // rogueMiracleInfo + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // miracleIdList [packed=true] - input.readPackedUInt32(miracleIdList, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 98) { break; } } case 98: { - // fBCFOBKNEJB [packed=true] - input.readPackedUInt32(fBCFOBKNEJB, tag); - bitField0_ |= 0x00000008; + // miracleIdList [packed=true] + input.readPackedUInt32(miracleIdList, tag); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -453,18 +354,12 @@ public final class RogueMiracleSelectInfoOuterClass { tag = input.readTag(); break; } - case 64: { + case 96: { // miracleIdList [packed=false] tag = input.readRepeatedUInt32(miracleIdList, tag); bitField0_ |= 0x00000004; break; } - case 96: { - // fBCFOBKNEJB [packed=false] - tag = input.readRepeatedUInt32(fBCFOBKNEJB, tag); - bitField0_ |= 0x00000008; - break; - } } } } @@ -476,14 +371,11 @@ public final class RogueMiracleSelectInfoOuterClass { output.writeBool(FieldNames.showHandbookHint, showHandbookHint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.achivedMiracleInfo, achivedMiracleInfo); + output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.miracleIdList, miracleIdList); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.fBCFOBKNEJB, fBCFOBKNEJB); - } output.endObject(); } @@ -506,11 +398,11 @@ public final class RogueMiracleSelectInfoOuterClass { } break; } - case -213623475: - case -431790391: { - if (input.isAtField(FieldNames.achivedMiracleInfo)) { + case -452511099: + case 1925436929: { + if (input.isAtField(FieldNames.rogueMiracleInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(achivedMiracleInfo); + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000002; } } else { @@ -530,17 +422,6 @@ public final class RogueMiracleSelectInfoOuterClass { } break; } - case -1360731384: { - if (input.isAtField(FieldNames.fBCFOBKNEJB)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(fBCFOBKNEJB); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -596,11 +477,9 @@ public final class RogueMiracleSelectInfoOuterClass { static class FieldNames { static final FieldName showHandbookHint = FieldName.forField("showHandbookHint", "show_handbook_hint"); - static final FieldName achivedMiracleInfo = FieldName.forField("achivedMiracleInfo", "achived_miracle_info"); + static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); static final FieldName miracleIdList = FieldName.forField("miracleIdList", "miracle_id_list"); - - static final FieldName fBCFOBKNEJB = FieldName.forField("FBCFOBKNEJB"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java new file mode 100644 index 0000000..95a372d --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java @@ -0,0 +1,453 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; + +public final class RogueRecordAvatarOuterClass { + /** + * Protobuf type {@code RogueRecordAvatar} + */ + public static final class RogueRecordAvatar extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 slot = 8; + */ + private int slot; + + /** + * optional uint32 id = 13; + */ + private int id; + + /** + * optional .AvatarType avatar_type = 6; + */ + private int avatarType; + + private RogueRecordAvatar() { + } + + /** + * @return a new empty instance of {@code RogueRecordAvatar} + */ + public static RogueRecordAvatar newInstance() { + return new RogueRecordAvatar(); + } + + /** + * optional uint32 slot = 8; + * @return whether the slot field is set + */ + public boolean hasSlot() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 slot = 8; + * @return this + */ + public RogueRecordAvatar clearSlot() { + bitField0_ &= ~0x00000001; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 8; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 8; + * @param value the slot to set + * @return this + */ + public RogueRecordAvatar setSlot(final int value) { + bitField0_ |= 0x00000001; + slot = value; + return this; + } + + /** + * optional uint32 id = 13; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 id = 13; + * @return this + */ + public RogueRecordAvatar clearId() { + bitField0_ &= ~0x00000002; + id = 0; + return this; + } + + /** + * optional uint32 id = 13; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 13; + * @param value the id to set + * @return this + */ + public RogueRecordAvatar setId(final int value) { + bitField0_ |= 0x00000002; + id = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 6; + * @return whether the avatarType field is set + */ + public boolean hasAvatarType() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .AvatarType avatar_type = 6; + * @return this + */ + public RogueRecordAvatar clearAvatarType() { + bitField0_ &= ~0x00000004; + avatarType = 0; + return this; + } + + /** + * optional .AvatarType avatar_type = 6; + * @return the avatarType + */ + public AvatarTypeOuterClass.AvatarType getAvatarType() { + return AvatarTypeOuterClass.AvatarType.forNumber(avatarType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link RogueRecordAvatar#getAvatarType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getAvatarTypeValue() { + return avatarType; + } + + /** + * Sets the value of the internal enum store. This does not + * do any validity checks, so be sure to use appropriate value + * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value + * can cause {@link RogueRecordAvatar#getAvatarType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public RogueRecordAvatar setAvatarTypeValue(final int value) { + bitField0_ |= 0x00000004; + avatarType = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 6; + * @param value the avatarType to set + * @return this + */ + public RogueRecordAvatar setAvatarType(final AvatarTypeOuterClass.AvatarType value) { + bitField0_ |= 0x00000004; + avatarType = value.getNumber(); + return this; + } + + @Override + public RogueRecordAvatar copyFrom(final RogueRecordAvatar other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + slot = other.slot; + id = other.id; + avatarType = other.avatarType; + } + return this; + } + + @Override + public RogueRecordAvatar mergeFrom(final RogueRecordAvatar other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasSlot()) { + setSlot(other.slot); + } + if (other.hasId()) { + setId(other.id); + } + if (other.hasAvatarType()) { + setAvatarTypeValue(other.avatarType); + } + return this; + } + + @Override + public RogueRecordAvatar clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + slot = 0; + id = 0; + avatarType = 0; + return this; + } + + @Override + public RogueRecordAvatar clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RogueRecordAvatar)) { + return false; + } + RogueRecordAvatar other = (RogueRecordAvatar) o; + return bitField0_ == other.bitField0_ + && (!hasSlot() || slot == other.slot) + && (!hasId() || id == other.id) + && (!hasAvatarType() || avatarType == other.avatarType); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(slot); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(id); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 48); + output.writeEnumNoTag(avatarType); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RogueRecordAvatar mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 64: { + // slot + slot = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // avatarType + final int value = input.readInt32(); + if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { + avatarType = value; + bitField0_ |= 0x00000004; + } + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.slot, slot); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.id, id); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); + } + output.endObject(); + } + + @Override + public RogueRecordAvatar mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { + if (!input.trySkipNullValue()) { + slot = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3355: { + if (input.isAtField(FieldNames.id)) { + if (!input.trySkipNullValue()) { + id = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -403148749: + case 397309536: { + if (input.isAtField(FieldNames.avatarType)) { + if (!input.trySkipNullValue()) { + final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); + if (value != null) { + avatarType = value.getNumber(); + bitField0_ |= 0x00000004; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RogueRecordAvatar clone() { + return new RogueRecordAvatar().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RogueRecordAvatar parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RogueRecordAvatar(), data).checkInitialized(); + } + + public static RogueRecordAvatar parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RogueRecordAvatar(), input).checkInitialized(); + } + + public static RogueRecordAvatar parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RogueRecordAvatar(), input).checkInitialized(); + } + + /** + * @return factory for creating RogueRecordAvatar messages + */ + public static MessageFactory getFactory() { + return RogueRecordAvatarFactory.INSTANCE; + } + + private enum RogueRecordAvatarFactory implements MessageFactory { + INSTANCE; + + @Override + public RogueRecordAvatar create() { + return RogueRecordAvatar.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName slot = FieldName.forField("slot"); + + static final FieldName id = FieldName.forField("id"); + + static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java new file mode 100644 index 0000000..80aeb53 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java @@ -0,0 +1,532 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.RepeatedInt; +import us.hebi.quickbuf.RepeatedMessage; + +public final class RogueRecordInfoOuterClass { + /** + * Protobuf type {@code RogueRecordInfo} + */ + public static final class RogueRecordInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * repeated uint32 rogue_miracle_list = 8; + */ + private final RepeatedInt rogueMiracleList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .RogueBuff buff_list = 6; + */ + private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueBuffOuterClass.RogueBuff.getFactory()); + + /** + * repeated .RogueRecordAvatar avatar_list = 7; + */ + private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(RogueRecordAvatarOuterClass.RogueRecordAvatar.getFactory()); + + private RogueRecordInfo() { + } + + /** + * @return a new empty instance of {@code RogueRecordInfo} + */ + public static RogueRecordInfo newInstance() { + return new RogueRecordInfo(); + } + + /** + * repeated uint32 rogue_miracle_list = 8; + * @return whether the rogueMiracleList field is set + */ + public boolean hasRogueMiracleList() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * repeated uint32 rogue_miracle_list = 8; + * @return this + */ + public RogueRecordInfo clearRogueMiracleList() { + bitField0_ &= ~0x00000001; + rogueMiracleList.clear(); + return this; + } + + /** + * repeated uint32 rogue_miracle_list = 8; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueMiracleList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getRogueMiracleList() { + return rogueMiracleList; + } + + /** + * repeated uint32 rogue_miracle_list = 8; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableRogueMiracleList() { + bitField0_ |= 0x00000001; + return rogueMiracleList; + } + + /** + * repeated uint32 rogue_miracle_list = 8; + * @param value the rogueMiracleList to add + * @return this + */ + public RogueRecordInfo addRogueMiracleList(final int value) { + bitField0_ |= 0x00000001; + rogueMiracleList.add(value); + return this; + } + + /** + * repeated uint32 rogue_miracle_list = 8; + * @param values the rogueMiracleList to add + * @return this + */ + public RogueRecordInfo addAllRogueMiracleList(final int... values) { + bitField0_ |= 0x00000001; + rogueMiracleList.addAll(values); + return this; + } + + /** + * repeated .RogueBuff buff_list = 6; + * @return whether the buffList field is set + */ + public boolean hasBuffList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * repeated .RogueBuff buff_list = 6; + * @return this + */ + public RogueRecordInfo clearBuffList() { + bitField0_ &= ~0x00000002; + buffList.clear(); + return this; + } + + /** + * repeated .RogueBuff buff_list = 6; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableBuffList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBuffList() { + return buffList; + } + + /** + * repeated .RogueBuff buff_list = 6; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableBuffList() { + bitField0_ |= 0x00000002; + return buffList; + } + + /** + * repeated .RogueBuff buff_list = 6; + * @param value the buffList to add + * @return this + */ + public RogueRecordInfo addBuffList(final RogueBuffOuterClass.RogueBuff value) { + bitField0_ |= 0x00000002; + buffList.add(value); + return this; + } + + /** + * repeated .RogueBuff buff_list = 6; + * @param values the buffList to add + * @return this + */ + public RogueRecordInfo addAllBuffList(final RogueBuffOuterClass.RogueBuff... values) { + bitField0_ |= 0x00000002; + buffList.addAll(values); + return this; + } + + /** + * repeated .RogueRecordAvatar avatar_list = 7; + * @return whether the avatarList field is set + */ + public boolean hasAvatarList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .RogueRecordAvatar avatar_list = 7; + * @return this + */ + public RogueRecordInfo clearAvatarList() { + bitField0_ &= ~0x00000004; + avatarList.clear(); + return this; + } + + /** + * repeated .RogueRecordAvatar avatar_list = 7; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableAvatarList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getAvatarList() { + return avatarList; + } + + /** + * repeated .RogueRecordAvatar avatar_list = 7; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableAvatarList() { + bitField0_ |= 0x00000004; + return avatarList; + } + + /** + * repeated .RogueRecordAvatar avatar_list = 7; + * @param value the avatarList to add + * @return this + */ + public RogueRecordInfo addAvatarList( + final RogueRecordAvatarOuterClass.RogueRecordAvatar value) { + bitField0_ |= 0x00000004; + avatarList.add(value); + return this; + } + + /** + * repeated .RogueRecordAvatar avatar_list = 7; + * @param values the avatarList to add + * @return this + */ + public RogueRecordInfo addAllAvatarList( + final RogueRecordAvatarOuterClass.RogueRecordAvatar... values) { + bitField0_ |= 0x00000004; + avatarList.addAll(values); + return this; + } + + @Override + public RogueRecordInfo copyFrom(final RogueRecordInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + rogueMiracleList.copyFrom(other.rogueMiracleList); + buffList.copyFrom(other.buffList); + avatarList.copyFrom(other.avatarList); + } + return this; + } + + @Override + public RogueRecordInfo mergeFrom(final RogueRecordInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRogueMiracleList()) { + getMutableRogueMiracleList().addAll(other.rogueMiracleList); + } + if (other.hasBuffList()) { + getMutableBuffList().addAll(other.buffList); + } + if (other.hasAvatarList()) { + getMutableAvatarList().addAll(other.avatarList); + } + return this; + } + + @Override + public RogueRecordInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + rogueMiracleList.clear(); + buffList.clear(); + avatarList.clear(); + return this; + } + + @Override + public RogueRecordInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + rogueMiracleList.clear(); + buffList.clearQuick(); + avatarList.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RogueRecordInfo)) { + return false; + } + RogueRecordInfo other = (RogueRecordInfo) o; + return bitField0_ == other.bitField0_ + && (!hasRogueMiracleList() || rogueMiracleList.equals(other.rogueMiracleList)) + && (!hasBuffList() || buffList.equals(other.buffList)) + && (!hasAvatarList() || avatarList.equals(other.avatarList)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + for (int i = 0; i < rogueMiracleList.length(); i++) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(rogueMiracleList.array()[i]); + } + } + if ((bitField0_ & 0x00000002) != 0) { + for (int i = 0; i < buffList.length(); i++) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(buffList.get(i)); + } + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < avatarList.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(avatarList.get(i)); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += (1 * rogueMiracleList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(rogueMiracleList); + } + if ((bitField0_ & 0x00000002) != 0) { + size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * avatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(avatarList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RogueRecordInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 66: { + // rogueMiracleList [packed=true] + input.readPackedUInt32(rogueMiracleList, tag); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // buffList + tag = input.readRepeatedMessage(buffList, tag); + bitField0_ |= 0x00000002; + if (tag != 58) { + break; + } + } + case 58: { + // avatarList + tag = input.readRepeatedMessage(avatarList, tag); + bitField0_ |= 0x00000004; + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 64: { + // rogueMiracleList [packed=false] + tag = input.readRepeatedUInt32(rogueMiracleList, tag); + bitField0_ |= 0x00000001; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeRepeatedUInt32(FieldNames.rogueMiracleList, rogueMiracleList); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRepeatedMessage(FieldNames.buffList, buffList); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedMessage(FieldNames.avatarList, avatarList); + } + output.endObject(); + } + + @Override + public RogueRecordInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -452426123: + case 1925521905: { + if (input.isAtField(FieldNames.rogueMiracleList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(rogueMiracleList); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1522789487: + case 55792906: { + if (input.isAtField(FieldNames.buffList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(buffList); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -403402345: + case 397055940: { + if (input.isAtField(FieldNames.avatarList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(avatarList); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RogueRecordInfo clone() { + return new RogueRecordInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RogueRecordInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RogueRecordInfo(), data).checkInitialized(); + } + + public static RogueRecordInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RogueRecordInfo(), input).checkInitialized(); + } + + public static RogueRecordInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RogueRecordInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating RogueRecordInfo messages + */ + public static MessageFactory getFactory() { + return RogueRecordInfoFactory.INSTANCE; + } + + private enum RogueRecordInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public RogueRecordInfo create() { + return RogueRecordInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName rogueMiracleList = FieldName.forField("rogueMiracleList", "rogue_miracle_list"); + + static final FieldName buffList = FieldName.forField("buffList", "buff_list"); + + static final FieldName avatarList = FieldName.forField("avatarList", "avatar_list"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RollRogueBuffScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RollRogueBuffScRspOuterClass.java index fbf5ea9..c0f54d5 100644 --- a/src/generated/main/emu/lunarcore/proto/RollRogueBuffScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RollRogueBuffScRspOuterClass.java @@ -19,14 +19,14 @@ public final class RollRogueBuffScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .RogueBuffSelectInfo rogue_buff_select_info = 10; + * optional .RogueBuffSelectInfo buff_select_info = 5; */ - private final RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo rogueBuffSelectInfo = RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo.newInstance(); + private final RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo buffSelectInfo = RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo.newInstance(); private RollRogueBuffScRsp() { } @@ -39,7 +39,7 @@ public final class RollRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class RollRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; * @return this */ public RollRogueBuffScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class RollRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class RollRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -76,39 +76,39 @@ public final class RollRogueBuffScRspOuterClass { } /** - * optional .RogueBuffSelectInfo rogue_buff_select_info = 10; - * @return whether the rogueBuffSelectInfo field is set + * optional .RogueBuffSelectInfo buff_select_info = 5; + * @return whether the buffSelectInfo field is set */ - public boolean hasRogueBuffSelectInfo() { + public boolean hasBuffSelectInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueBuffSelectInfo rogue_buff_select_info = 10; + * optional .RogueBuffSelectInfo buff_select_info = 5; * @return this */ - public RollRogueBuffScRsp clearRogueBuffSelectInfo() { + public RollRogueBuffScRsp clearBuffSelectInfo() { bitField0_ &= ~0x00000002; - rogueBuffSelectInfo.clear(); + buffSelectInfo.clear(); return this; } /** - * optional .RogueBuffSelectInfo rogue_buff_select_info = 10; + * optional .RogueBuffSelectInfo buff_select_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableRogueBuffSelectInfo()} if you want to modify it. + * Use {@link #getMutableBuffSelectInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo getRogueBuffSelectInfo() { - return rogueBuffSelectInfo; + public RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo getBuffSelectInfo() { + return buffSelectInfo; } /** - * optional .RogueBuffSelectInfo rogue_buff_select_info = 10; + * optional .RogueBuffSelectInfo buff_select_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -116,20 +116,20 @@ public final class RollRogueBuffScRspOuterClass { * * @return internal storage object for modifications */ - public RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo getMutableRogueBuffSelectInfo() { + public RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo getMutableBuffSelectInfo() { bitField0_ |= 0x00000002; - return rogueBuffSelectInfo; + return buffSelectInfo; } /** - * optional .RogueBuffSelectInfo rogue_buff_select_info = 10; - * @param value the rogueBuffSelectInfo to set + * optional .RogueBuffSelectInfo buff_select_info = 5; + * @param value the buffSelectInfo to set * @return this */ - public RollRogueBuffScRsp setRogueBuffSelectInfo( + public RollRogueBuffScRsp setBuffSelectInfo( final RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo value) { bitField0_ |= 0x00000002; - rogueBuffSelectInfo.copyFrom(value); + buffSelectInfo.copyFrom(value); return this; } @@ -139,7 +139,7 @@ public final class RollRogueBuffScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - rogueBuffSelectInfo.copyFrom(other.rogueBuffSelectInfo); + buffSelectInfo.copyFrom(other.buffSelectInfo); } return this; } @@ -153,8 +153,8 @@ public final class RollRogueBuffScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasRogueBuffSelectInfo()) { - getMutableRogueBuffSelectInfo().mergeFrom(other.rogueBuffSelectInfo); + if (other.hasBuffSelectInfo()) { + getMutableBuffSelectInfo().mergeFrom(other.buffSelectInfo); } return this; } @@ -167,7 +167,7 @@ public final class RollRogueBuffScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - rogueBuffSelectInfo.clear(); + buffSelectInfo.clear(); return this; } @@ -178,7 +178,7 @@ public final class RollRogueBuffScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueBuffSelectInfo.clearQuick(); + buffSelectInfo.clearQuick(); return this; } @@ -193,18 +193,18 @@ public final class RollRogueBuffScRspOuterClass { RollRogueBuffScRsp other = (RollRogueBuffScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasRogueBuffSelectInfo() || rogueBuffSelectInfo.equals(other.rogueBuffSelectInfo)); + && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(rogueBuffSelectInfo); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(buffSelectInfo); } } @@ -215,7 +215,7 @@ public final class RollRogueBuffScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelectInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); } return size; } @@ -227,18 +227,18 @@ public final class RollRogueBuffScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 42) { break; } } - case 82: { - // rogueBuffSelectInfo - input.readMessage(rogueBuffSelectInfo); + case 42: { + // buffSelectInfo + input.readMessage(buffSelectInfo); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -266,7 +266,7 @@ public final class RollRogueBuffScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueBuffSelectInfo, rogueBuffSelectInfo); + output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); } output.endObject(); } @@ -289,11 +289,11 @@ public final class RollRogueBuffScRspOuterClass { } break; } - case -2050730761: - case 1692632042: { - if (input.isAtField(FieldNames.rogueBuffSelectInfo)) { + case -255242115: + case 1500540965: { + if (input.isAtField(FieldNames.buffSelectInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueBuffSelectInfo); + input.readMessage(buffSelectInfo); bitField0_ |= 0x00000002; } } else { @@ -356,7 +356,7 @@ public final class RollRogueBuffScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName rogueBuffSelectInfo = FieldName.forField("rogueBuffSelectInfo", "rogue_buff_select_info"); + static final FieldName buffSelectInfo = FieldName.forField("buffSelectInfo", "buff_select_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java index 288261c..82e9aa2 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -10,6 +10,7 @@ import us.hebi.quickbuf.MessageFactory; import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.RepeatedInt; import us.hebi.quickbuf.RepeatedMessage; public final class SceneInfoOuterClass { @@ -54,6 +55,16 @@ public final class SceneInfoOuterClass { */ private int entryId; + /** + * repeated uint32 lighten_section_list = 4; + */ + private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); + + /** + * repeated uint32 group_id_list = 15; + */ + private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance(); + /** * repeated .SceneEntityInfo entity_list = 9; */ @@ -338,12 +349,148 @@ public final class SceneInfoOuterClass { return this; } + /** + * repeated uint32 lighten_section_list = 4; + * @return whether the lightenSectionList field is set + */ + public boolean hasLightenSectionList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated uint32 lighten_section_list = 4; + * @return this + */ + public SceneInfo clearLightenSectionList() { + bitField0_ &= ~0x00000080; + lightenSectionList.clear(); + return this; + } + + /** + * repeated uint32 lighten_section_list = 4; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableLightenSectionList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLightenSectionList() { + return lightenSectionList; + } + + /** + * repeated uint32 lighten_section_list = 4; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableLightenSectionList() { + bitField0_ |= 0x00000080; + return lightenSectionList; + } + + /** + * repeated uint32 lighten_section_list = 4; + * @param value the lightenSectionList to add + * @return this + */ + public SceneInfo addLightenSectionList(final int value) { + bitField0_ |= 0x00000080; + lightenSectionList.add(value); + return this; + } + + /** + * repeated uint32 lighten_section_list = 4; + * @param values the lightenSectionList to add + * @return this + */ + public SceneInfo addAllLightenSectionList(final int... values) { + bitField0_ |= 0x00000080; + lightenSectionList.addAll(values); + return this; + } + + /** + * repeated uint32 group_id_list = 15; + * @return whether the groupIdList field is set + */ + public boolean hasGroupIdList() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * repeated uint32 group_id_list = 15; + * @return this + */ + public SceneInfo clearGroupIdList() { + bitField0_ &= ~0x00000100; + groupIdList.clear(); + return this; + } + + /** + * repeated uint32 group_id_list = 15; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableGroupIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getGroupIdList() { + return groupIdList; + } + + /** + * repeated uint32 group_id_list = 15; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableGroupIdList() { + bitField0_ |= 0x00000100; + return groupIdList; + } + + /** + * repeated uint32 group_id_list = 15; + * @param value the groupIdList to add + * @return this + */ + public SceneInfo addGroupIdList(final int value) { + bitField0_ |= 0x00000100; + groupIdList.add(value); + return this; + } + + /** + * repeated uint32 group_id_list = 15; + * @param values the groupIdList to add + * @return this + */ + public SceneInfo addAllGroupIdList(final int... values) { + bitField0_ |= 0x00000100; + groupIdList.addAll(values); + return this; + } + /** * repeated .SceneEntityInfo entity_list = 9; * @return whether the entityList field is set */ public boolean hasEntityList() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000200) != 0; } /** @@ -351,7 +498,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearEntityList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000200; entityList.clear(); return this; } @@ -380,7 +527,7 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEntityList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000200; return entityList; } @@ -390,7 +537,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000200; entityList.add(value); return this; } @@ -401,7 +548,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addAllEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000200; entityList.addAll(values); return this; } @@ -411,7 +558,7 @@ public final class SceneInfoOuterClass { * @return whether the entityGroupList field is set */ public boolean hasEntityGroupList() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000400) != 0; } /** @@ -419,7 +566,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearEntityGroupList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000400; entityGroupList.clear(); return this; } @@ -450,7 +597,7 @@ public final class SceneInfoOuterClass { */ public RepeatedMessage getMutableEntityGroupList( ) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000400; return entityGroupList; } @@ -461,7 +608,7 @@ public final class SceneInfoOuterClass { */ public SceneInfo addEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000400; entityGroupList.add(value); return this; } @@ -473,7 +620,7 @@ public final class SceneInfoOuterClass { */ public SceneInfo addAllEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000400; entityGroupList.addAll(values); return this; } @@ -483,7 +630,7 @@ public final class SceneInfoOuterClass { * @return whether the groupStateList field is set */ public boolean hasGroupStateList() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000800) != 0; } /** @@ -491,7 +638,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearGroupStateList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000800; groupStateList.clear(); return this; } @@ -520,7 +667,7 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableGroupStateList() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000800; return groupStateList; } @@ -530,7 +677,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000800; groupStateList.add(value); return this; } @@ -542,7 +689,7 @@ public final class SceneInfoOuterClass { */ public SceneInfo addAllGroupStateList( final SceneGroupStateOuterClass.SceneGroupState... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000800; groupStateList.addAll(values); return this; } @@ -559,6 +706,8 @@ public final class SceneInfoOuterClass { gameModeType = other.gameModeType; planeId = other.planeId; entryId = other.entryId; + lightenSectionList.copyFrom(other.lightenSectionList); + groupIdList.copyFrom(other.groupIdList); entityList.copyFrom(other.entityList); entityGroupList.copyFrom(other.entityGroupList); groupStateList.copyFrom(other.groupStateList); @@ -593,6 +742,12 @@ public final class SceneInfoOuterClass { if (other.hasEntryId()) { setEntryId(other.entryId); } + if (other.hasLightenSectionList()) { + getMutableLightenSectionList().addAll(other.lightenSectionList); + } + if (other.hasGroupIdList()) { + getMutableGroupIdList().addAll(other.groupIdList); + } if (other.hasEntityList()) { getMutableEntityList().addAll(other.entityList); } @@ -619,6 +774,8 @@ public final class SceneInfoOuterClass { gameModeType = 0; planeId = 0; entryId = 0; + lightenSectionList.clear(); + groupIdList.clear(); entityList.clear(); entityGroupList.clear(); groupStateList.clear(); @@ -632,6 +789,8 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + lightenSectionList.clear(); + groupIdList.clear(); entityList.clearQuick(); entityGroupList.clearQuick(); groupStateList.clearQuick(); @@ -655,6 +814,8 @@ public final class SceneInfoOuterClass { && (!hasGameModeType() || gameModeType == other.gameModeType) && (!hasPlaneId() || planeId == other.planeId) && (!hasEntryId() || entryId == other.entryId) + && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) && (!hasEntityList() || entityList.equals(other.entityList)) && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)) && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)); @@ -691,18 +852,30 @@ public final class SceneInfoOuterClass { output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000080) != 0) { + for (int i = 0; i < lightenSectionList.length(); i++) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(lightenSectionList.array()[i]); + } + } + if ((bitField0_ & 0x00000100) != 0) { + for (int i = 0; i < groupIdList.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(groupIdList.array()[i]); + } + } + if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < entityList.length(); i++) { output.writeRawByte((byte) 74); output.writeMessageNoTag(entityList.get(i)); } } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < entityGroupList.length(); i++) { output.writeRawLittleEndian16((short) 7594); output.writeMessageNoTag(entityGroupList.get(i)); } } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < groupStateList.length(); i++) { output.writeRawLittleEndian16((short) 11962); output.writeMessageNoTag(groupStateList.get(i)); @@ -735,12 +908,18 @@ public final class SceneInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000100) != 0) { - size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); + size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); } if ((bitField0_ & 0x00000200) != 0) { + size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); + } + if ((bitField0_ & 0x00000400) != 0) { + size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); + } + if ((bitField0_ & 0x00000800) != 0) { size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); } return size; @@ -812,6 +991,24 @@ public final class SceneInfoOuterClass { entryId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // lightenSectionList [packed=true] + input.readPackedUInt32(lightenSectionList, tag); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // groupIdList [packed=true] + input.readPackedUInt32(groupIdList, tag); + bitField0_ |= 0x00000100; + tag = input.readTag(); if (tag != 74) { break; } @@ -819,7 +1016,7 @@ public final class SceneInfoOuterClass { case 74: { // entityList tag = input.readRepeatedMessage(entityList, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000200; if (tag != 3754) { break; } @@ -827,7 +1024,7 @@ public final class SceneInfoOuterClass { case 3754: { // entityGroupList tag = input.readRepeatedMessage(entityGroupList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000400; if (tag != 5946) { break; } @@ -835,7 +1032,7 @@ public final class SceneInfoOuterClass { case 5946: { // groupStateList tag = input.readRepeatedMessage(groupStateList, tag); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000800; if (tag != 0) { break; } @@ -850,6 +1047,18 @@ public final class SceneInfoOuterClass { tag = input.readTag(); break; } + case 32: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); + bitField0_ |= 0x00000080; + break; + } + case 120: { + // groupIdList [packed=false] + tag = input.readRepeatedUInt32(groupIdList, tag); + bitField0_ |= 0x00000100; + break; + } } } } @@ -879,12 +1088,18 @@ public final class SceneInfoOuterClass { output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.entityList, entityList); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); + output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); } if ((bitField0_ & 0x00000200) != 0) { + output.writeRepeatedMessage(FieldNames.entityList, entityList); + } + if ((bitField0_ & 0x00000400) != 0) { + output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); + } + if ((bitField0_ & 0x00000800) != 0) { output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); } output.endObject(); @@ -981,12 +1196,36 @@ public final class SceneInfoOuterClass { } break; } + case -1942343836: + case 1328850360: { + if (input.isAtField(FieldNames.lightenSectionList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(lightenSectionList); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 457110456: + case 1703805826: { + if (input.isAtField(FieldNames.groupIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(groupIdList); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } case -1483251935: case 1281457018: { if (input.isAtField(FieldNames.entityList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityList); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -998,7 +1237,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.entityGroupList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityGroupList); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000400; } } else { input.skipUnknownField(); @@ -1010,7 +1249,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.groupStateList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(groupStateList); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1083,6 +1322,10 @@ public final class SceneInfoOuterClass { static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); + + static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list"); + static final FieldName entityList = FieldName.forField("entityList", "entity_list"); static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueBuffScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueBuffScRspOuterClass.java index 036226d..599edde 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueBuffScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueBuffScRspOuterClass.java @@ -19,22 +19,22 @@ public final class SelectRogueBuffScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 maze_buff_level = 6; - */ - private int mazeBuffLevel; - - /** - * optional uint32 maze_buff_id = 12; + * optional uint32 maze_buff_id = 4; */ private int mazeBuffId; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .RogueBuffSelectInfo buff_select_info = 2; + * optional uint32 maze_buff_level = 14; + */ + private int mazeBuffLevel; + + /** + * optional .RogueBuffSelectInfo buff_select_info = 6; */ private final RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo buffSelectInfo = RogueBuffSelectInfoOuterClass.RogueBuffSelectInfo.newInstance(); @@ -49,62 +49,25 @@ public final class SelectRogueBuffScRspOuterClass { } /** - * optional uint32 maze_buff_level = 6; - * @return whether the mazeBuffLevel field is set + * optional uint32 maze_buff_id = 4; + * @return whether the mazeBuffId field is set */ - public boolean hasMazeBuffLevel() { + public boolean hasMazeBuffId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 maze_buff_level = 6; - * @return this - */ - public SelectRogueBuffScRsp clearMazeBuffLevel() { - bitField0_ &= ~0x00000001; - mazeBuffLevel = 0; - return this; - } - - /** - * optional uint32 maze_buff_level = 6; - * @return the mazeBuffLevel - */ - public int getMazeBuffLevel() { - return mazeBuffLevel; - } - - /** - * optional uint32 maze_buff_level = 6; - * @param value the mazeBuffLevel to set - * @return this - */ - public SelectRogueBuffScRsp setMazeBuffLevel(final int value) { - bitField0_ |= 0x00000001; - mazeBuffLevel = value; - return this; - } - - /** - * optional uint32 maze_buff_id = 12; - * @return whether the mazeBuffId field is set - */ - public boolean hasMazeBuffId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 maze_buff_id = 12; + * optional uint32 maze_buff_id = 4; * @return this */ public SelectRogueBuffScRsp clearMazeBuffId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; mazeBuffId = 0; return this; } /** - * optional uint32 maze_buff_id = 12; + * optional uint32 maze_buff_id = 4; * @return the mazeBuffId */ public int getMazeBuffId() { @@ -112,36 +75,36 @@ public final class SelectRogueBuffScRspOuterClass { } /** - * optional uint32 maze_buff_id = 12; + * optional uint32 maze_buff_id = 4; * @param value the mazeBuffId to set * @return this */ public SelectRogueBuffScRsp setMazeBuffId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; mazeBuffId = value; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return this */ public SelectRogueBuffScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -149,18 +112,55 @@ public final class SelectRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ public SelectRogueBuffScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional .RogueBuffSelectInfo buff_select_info = 2; + * optional uint32 maze_buff_level = 14; + * @return whether the mazeBuffLevel field is set + */ + public boolean hasMazeBuffLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 maze_buff_level = 14; + * @return this + */ + public SelectRogueBuffScRsp clearMazeBuffLevel() { + bitField0_ &= ~0x00000004; + mazeBuffLevel = 0; + return this; + } + + /** + * optional uint32 maze_buff_level = 14; + * @return the mazeBuffLevel + */ + public int getMazeBuffLevel() { + return mazeBuffLevel; + } + + /** + * optional uint32 maze_buff_level = 14; + * @param value the mazeBuffLevel to set + * @return this + */ + public SelectRogueBuffScRsp setMazeBuffLevel(final int value) { + bitField0_ |= 0x00000004; + mazeBuffLevel = value; + return this; + } + + /** + * optional .RogueBuffSelectInfo buff_select_info = 6; * @return whether the buffSelectInfo field is set */ public boolean hasBuffSelectInfo() { @@ -168,7 +168,7 @@ public final class SelectRogueBuffScRspOuterClass { } /** - * optional .RogueBuffSelectInfo buff_select_info = 2; + * optional .RogueBuffSelectInfo buff_select_info = 6; * @return this */ public SelectRogueBuffScRsp clearBuffSelectInfo() { @@ -178,7 +178,7 @@ public final class SelectRogueBuffScRspOuterClass { } /** - * optional .RogueBuffSelectInfo buff_select_info = 2; + * optional .RogueBuffSelectInfo buff_select_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class SelectRogueBuffScRspOuterClass { } /** - * optional .RogueBuffSelectInfo buff_select_info = 2; + * optional .RogueBuffSelectInfo buff_select_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class SelectRogueBuffScRspOuterClass { } /** - * optional .RogueBuffSelectInfo buff_select_info = 2; + * optional .RogueBuffSelectInfo buff_select_info = 6; * @param value the buffSelectInfo to set * @return this */ @@ -222,9 +222,9 @@ public final class SelectRogueBuffScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mazeBuffLevel = other.mazeBuffLevel; mazeBuffId = other.mazeBuffId; retcode = other.retcode; + mazeBuffLevel = other.mazeBuffLevel; buffSelectInfo.copyFrom(other.buffSelectInfo); } return this; @@ -236,15 +236,15 @@ public final class SelectRogueBuffScRspOuterClass { return this; } cachedSize = -1; - if (other.hasMazeBuffLevel()) { - setMazeBuffLevel(other.mazeBuffLevel); - } if (other.hasMazeBuffId()) { setMazeBuffId(other.mazeBuffId); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasMazeBuffLevel()) { + setMazeBuffLevel(other.mazeBuffLevel); + } if (other.hasBuffSelectInfo()) { getMutableBuffSelectInfo().mergeFrom(other.buffSelectInfo); } @@ -258,9 +258,9 @@ public final class SelectRogueBuffScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - mazeBuffLevel = 0; mazeBuffId = 0; retcode = 0; + mazeBuffLevel = 0; buffSelectInfo.clear(); return this; } @@ -286,28 +286,28 @@ public final class SelectRogueBuffScRspOuterClass { } SelectRogueBuffScRsp other = (SelectRogueBuffScRsp) o; return bitField0_ == other.bitField0_ - && (!hasMazeBuffLevel() || mazeBuffLevel == other.mazeBuffLevel) && (!hasMazeBuffId() || mazeBuffId == other.mazeBuffId) && (!hasRetcode() || retcode == other.retcode) + && (!hasMazeBuffLevel() || mazeBuffLevel == other.mazeBuffLevel) && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(mazeBuffLevel); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(mazeBuffId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(mazeBuffLevel); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 50); output.writeMessageNoTag(buffSelectInfo); } } @@ -316,14 +316,14 @@ public final class SelectRogueBuffScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mazeBuffLevel); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mazeBuffId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mazeBuffLevel); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); } @@ -337,34 +337,34 @@ public final class SelectRogueBuffScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // mazeBuffLevel - mazeBuffLevel = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 32: { // mazeBuffId mazeBuffId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { + case 56: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 112) { break; } } - case 18: { + case 112: { + // mazeBuffLevel + mazeBuffLevel = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { // buffSelectInfo input.readMessage(buffSelectInfo); bitField0_ |= 0x00000008; @@ -391,14 +391,14 @@ public final class SelectRogueBuffScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mazeBuffLevel, mazeBuffLevel); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.mazeBuffId, mazeBuffId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.mazeBuffLevel, mazeBuffLevel); + } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); } @@ -412,24 +412,12 @@ public final class SelectRogueBuffScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1204221426: - case 854643992: { - if (input.isAtField(FieldNames.mazeBuffLevel)) { - if (!input.trySkipNullValue()) { - mazeBuffLevel = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 144210285: case 896621575: { if (input.isAtField(FieldNames.mazeBuffId)) { if (!input.trySkipNullValue()) { mazeBuffId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -440,6 +428,18 @@ public final class SelectRogueBuffScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1204221426: + case 854643992: { + if (input.isAtField(FieldNames.mazeBuffLevel)) { + if (!input.trySkipNullValue()) { + mazeBuffLevel = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -512,12 +512,12 @@ public final class SelectRogueBuffScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mazeBuffLevel = FieldName.forField("mazeBuffLevel", "maze_buff_level"); - static final FieldName mazeBuffId = FieldName.forField("mazeBuffId", "maze_buff_id"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName mazeBuffLevel = FieldName.forField("mazeBuffLevel", "maze_buff_level"); + static final FieldName buffSelectInfo = FieldName.forField("buffSelectInfo", "buff_select_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java index 14a5d6c..d21183f 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java @@ -19,12 +19,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 COMHCIAONKJ = 4; - */ - private int cOMHCIAONKJ; - - /** - * optional uint32 dialogue_event_id = 15; + * optional uint32 dialogue_event_id = 5; */ private int dialogueEventId; @@ -39,62 +34,25 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 COMHCIAONKJ = 4; - * @return whether the cOMHCIAONKJ field is set + * optional uint32 dialogue_event_id = 5; + * @return whether the dialogueEventId field is set */ - public boolean hasCOMHCIAONKJ() { + public boolean hasDialogueEventId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 COMHCIAONKJ = 4; - * @return this - */ - public SelectRogueDialogueEventCsReq clearCOMHCIAONKJ() { - bitField0_ &= ~0x00000001; - cOMHCIAONKJ = 0; - return this; - } - - /** - * optional uint32 COMHCIAONKJ = 4; - * @return the cOMHCIAONKJ - */ - public int getCOMHCIAONKJ() { - return cOMHCIAONKJ; - } - - /** - * optional uint32 COMHCIAONKJ = 4; - * @param value the cOMHCIAONKJ to set - * @return this - */ - public SelectRogueDialogueEventCsReq setCOMHCIAONKJ(final int value) { - bitField0_ |= 0x00000001; - cOMHCIAONKJ = value; - return this; - } - - /** - * optional uint32 dialogue_event_id = 15; - * @return whether the dialogueEventId field is set - */ - public boolean hasDialogueEventId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 dialogue_event_id = 15; + * optional uint32 dialogue_event_id = 5; * @return this */ public SelectRogueDialogueEventCsReq clearDialogueEventId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; dialogueEventId = 0; return this; } /** - * optional uint32 dialogue_event_id = 15; + * optional uint32 dialogue_event_id = 5; * @return the dialogueEventId */ public int getDialogueEventId() { @@ -102,12 +60,12 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 dialogue_event_id = 15; + * optional uint32 dialogue_event_id = 5; * @param value the dialogueEventId to set * @return this */ public SelectRogueDialogueEventCsReq setDialogueEventId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; dialogueEventId = value; return this; } @@ -117,7 +75,6 @@ public final class SelectRogueDialogueEventCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - cOMHCIAONKJ = other.cOMHCIAONKJ; dialogueEventId = other.dialogueEventId; } return this; @@ -129,9 +86,6 @@ public final class SelectRogueDialogueEventCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasCOMHCIAONKJ()) { - setCOMHCIAONKJ(other.cOMHCIAONKJ); - } if (other.hasDialogueEventId()) { setDialogueEventId(other.dialogueEventId); } @@ -145,7 +99,6 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - cOMHCIAONKJ = 0; dialogueEventId = 0; return this; } @@ -170,18 +123,13 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } SelectRogueDialogueEventCsReq other = (SelectRogueDialogueEventCsReq) o; return bitField0_ == other.bitField0_ - && (!hasCOMHCIAONKJ() || cOMHCIAONKJ == other.cOMHCIAONKJ) && (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(cOMHCIAONKJ); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(dialogueEventId); } } @@ -190,9 +138,6 @@ public final class SelectRogueDialogueEventCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cOMHCIAONKJ); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId); } return size; @@ -205,19 +150,10 @@ public final class SelectRogueDialogueEventCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // cOMHCIAONKJ - cOMHCIAONKJ = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 40: { // dialogueEventId dialogueEventId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -241,9 +177,6 @@ public final class SelectRogueDialogueEventCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.cOMHCIAONKJ, cOMHCIAONKJ); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId); } output.endObject(); @@ -256,23 +189,12 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2097477198: { - if (input.isAtField(FieldNames.cOMHCIAONKJ)) { - if (!input.trySkipNullValue()) { - cOMHCIAONKJ = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 88389725: case 1671736167: { if (input.isAtField(FieldNames.dialogueEventId)) { if (!input.trySkipNullValue()) { dialogueEventId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -334,8 +256,6 @@ public final class SelectRogueDialogueEventCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName cOMHCIAONKJ = FieldName.forField("COMHCIAONKJ"); - static final FieldName dialogueEventId = FieldName.forField("dialogueEventId", "dialogue_event_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java index 68dfa43..bfb6851 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java @@ -19,17 +19,12 @@ public final class SelectRogueDialogueEventScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; */ private int retcode; /** - * 
-     * RogueDialogueEvent selected_dialogue_event = 14;
-     * ODKKECCOLLB JJNBIFDOLFH = 15;
-     *
- * - * optional uint32 dialogue_event_id = 10; + * optional uint32 dialogue_event_id = 12; */ private int dialogueEventId; @@ -44,7 +39,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +47,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return this */ public SelectRogueDialogueEventScRsp clearRetcode() { @@ -62,7 +57,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -70,7 +65,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -81,12 +76,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * 
-     * RogueDialogueEvent selected_dialogue_event = 14;
-     * ODKKECCOLLB JJNBIFDOLFH = 15;
-     *
- * - * optional uint32 dialogue_event_id = 10; + * optional uint32 dialogue_event_id = 12; * @return whether the dialogueEventId field is set */ public boolean hasDialogueEventId() { @@ -94,12 +84,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * 
-     * RogueDialogueEvent selected_dialogue_event = 14;
-     * ODKKECCOLLB JJNBIFDOLFH = 15;
-     *
- * - * optional uint32 dialogue_event_id = 10; + * optional uint32 dialogue_event_id = 12; * @return this */ public SelectRogueDialogueEventScRsp clearDialogueEventId() { @@ -109,12 +94,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * 
-     * RogueDialogueEvent selected_dialogue_event = 14;
-     * ODKKECCOLLB JJNBIFDOLFH = 15;
-     *
- * - * optional uint32 dialogue_event_id = 10; + * optional uint32 dialogue_event_id = 12; * @return the dialogueEventId */ public int getDialogueEventId() { @@ -122,12 +102,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * 
-     * RogueDialogueEvent selected_dialogue_event = 14;
-     * ODKKECCOLLB JJNBIFDOLFH = 15;
-     *
- * - * optional uint32 dialogue_event_id = 10; + * optional uint32 dialogue_event_id = 12; * @param value the dialogueEventId to set * @return this */ @@ -202,11 +177,11 @@ public final class SelectRogueDialogueEventScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(dialogueEventId); } } @@ -230,16 +205,16 @@ public final class SelectRogueDialogueEventScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 96) { break; } } - case 80: { + case 96: { // dialogueEventId dialogueEventId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueMiracleScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueMiracleScRspOuterClass.java index 76fe8f0..688d0a2 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueMiracleScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueMiracleScRspOuterClass.java @@ -19,19 +19,19 @@ public final class SelectRogueMiracleScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .RogueMiracleSelectInfo miracle_select_info = 2; + * optional .RogueMiracleSelectInfo miracle_select_info = 8; */ private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance(); /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 6; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 11; */ - private final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo achivedMiracleInfo = RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo.newInstance(); + private final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo rogueMiracleInfo = RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo.newInstance(); private SelectRogueMiracleScRsp() { } @@ -44,7 +44,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 12; * @return this */ public SelectRogueMiracleScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 2; + * optional .RogueMiracleSelectInfo miracle_select_info = 8; * @return whether the miracleSelectInfo field is set */ public boolean hasMiracleSelectInfo() { @@ -89,7 +89,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 2; + * optional .RogueMiracleSelectInfo miracle_select_info = 8; * @return this */ public SelectRogueMiracleScRsp clearMiracleSelectInfo() { @@ -99,7 +99,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 2; + * optional .RogueMiracleSelectInfo miracle_select_info = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -113,7 +113,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 2; + * optional .RogueMiracleSelectInfo miracle_select_info = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -127,7 +127,7 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional .RogueMiracleSelectInfo miracle_select_info = 2; + * optional .RogueMiracleSelectInfo miracle_select_info = 8; * @param value the miracleSelectInfo to set * @return this */ @@ -139,39 +139,39 @@ public final class SelectRogueMiracleScRspOuterClass { } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 6; - * @return whether the achivedMiracleInfo field is set + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 11; + * @return whether the rogueMiracleInfo field is set */ - public boolean hasAchivedMiracleInfo() { + public boolean hasRogueMiracleInfo() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 6; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 11; * @return this */ - public SelectRogueMiracleScRsp clearAchivedMiracleInfo() { + public SelectRogueMiracleScRsp clearRogueMiracleInfo() { bitField0_ &= ~0x00000004; - achivedMiracleInfo.clear(); + rogueMiracleInfo.clear(); return this; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 6; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableAchivedMiracleInfo()} if you want to modify it. + * Use {@link #getMutableRogueMiracleInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getAchivedMiracleInfo() { - return achivedMiracleInfo; + public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getRogueMiracleInfo() { + return rogueMiracleInfo; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 6; + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -179,21 +179,20 @@ public final class SelectRogueMiracleScRspOuterClass { * * @return internal storage object for modifications */ - public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getMutableAchivedMiracleInfo( - ) { + public RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo getMutableRogueMiracleInfo() { bitField0_ |= 0x00000004; - return achivedMiracleInfo; + return rogueMiracleInfo; } /** - * optional .RogueAchivedMiracleInfo achived_miracle_info = 6; - * @param value the achivedMiracleInfo to set + * optional .RogueAchivedMiracleInfo rogue_miracle_info = 11; + * @param value the rogueMiracleInfo to set * @return this */ - public SelectRogueMiracleScRsp setAchivedMiracleInfo( + public SelectRogueMiracleScRsp setRogueMiracleInfo( final RogueAchivedMiracleInfoOuterClass.RogueAchivedMiracleInfo value) { bitField0_ |= 0x00000004; - achivedMiracleInfo.copyFrom(value); + rogueMiracleInfo.copyFrom(value); return this; } @@ -204,7 +203,7 @@ public final class SelectRogueMiracleScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; miracleSelectInfo.copyFrom(other.miracleSelectInfo); - achivedMiracleInfo.copyFrom(other.achivedMiracleInfo); + rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); } return this; } @@ -221,8 +220,8 @@ public final class SelectRogueMiracleScRspOuterClass { if (other.hasMiracleSelectInfo()) { getMutableMiracleSelectInfo().mergeFrom(other.miracleSelectInfo); } - if (other.hasAchivedMiracleInfo()) { - getMutableAchivedMiracleInfo().mergeFrom(other.achivedMiracleInfo); + if (other.hasRogueMiracleInfo()) { + getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); } return this; } @@ -236,7 +235,7 @@ public final class SelectRogueMiracleScRspOuterClass { bitField0_ = 0; retcode = 0; miracleSelectInfo.clear(); - achivedMiracleInfo.clear(); + rogueMiracleInfo.clear(); return this; } @@ -248,7 +247,7 @@ public final class SelectRogueMiracleScRspOuterClass { cachedSize = -1; bitField0_ = 0; miracleSelectInfo.clearQuick(); - achivedMiracleInfo.clearQuick(); + rogueMiracleInfo.clearQuick(); return this; } @@ -264,22 +263,22 @@ public final class SelectRogueMiracleScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)) - && (!hasAchivedMiracleInfo() || achivedMiracleInfo.equals(other.achivedMiracleInfo)); + && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 66); output.writeMessageNoTag(miracleSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(achivedMiracleInfo); + output.writeRawByte((byte) 90); + output.writeMessageNoTag(rogueMiracleInfo); } } @@ -293,7 +292,7 @@ public final class SelectRogueMiracleScRspOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(achivedMiracleInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); } return size; } @@ -305,27 +304,27 @@ public final class SelectRogueMiracleScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 66) { break; } } - case 18: { + case 66: { // miracleSelectInfo input.readMessage(miracleSelectInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 90) { break; } } - case 50: { - // achivedMiracleInfo - input.readMessage(achivedMiracleInfo); + case 90: { + // rogueMiracleInfo + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -356,7 +355,7 @@ public final class SelectRogueMiracleScRspOuterClass { output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.achivedMiracleInfo, achivedMiracleInfo); + output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); } output.endObject(); } @@ -391,11 +390,11 @@ public final class SelectRogueMiracleScRspOuterClass { } break; } - case -213623475: - case -431790391: { - if (input.isAtField(FieldNames.achivedMiracleInfo)) { + case -452511099: + case 1925436929: { + if (input.isAtField(FieldNames.rogueMiracleInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(achivedMiracleInfo); + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000004; } } else { @@ -460,7 +459,7 @@ public final class SelectRogueMiracleScRspOuterClass { static final FieldName miracleSelectInfo = FieldName.forField("miracleSelectInfo", "miracle_select_info"); - static final FieldName achivedMiracleInfo = FieldName.forField("achivedMiracleInfo", "achived_miracle_info"); + static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); } } } diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java index 41ba7a8..2df252f 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java @@ -9,15 +9,21 @@ import emu.lunarcore.data.excel.RogueAreaExcel; import emu.lunarcore.data.excel.RogueMapExcel; import emu.lunarcore.game.battle.Battle; import emu.lunarcore.game.player.Player; +import emu.lunarcore.game.player.lineup.PlayerLineup; +import emu.lunarcore.proto.AvatarTypeOuterClass.AvatarType; import emu.lunarcore.proto.BattleEndStatusOuterClass.BattleEndStatus; import emu.lunarcore.proto.BattleStatisticsOuterClass.BattleStatistics; +import emu.lunarcore.proto.ExtraLineupTypeOuterClass.ExtraLineupType; import emu.lunarcore.proto.RogueAvatarInfoOuterClass.RogueAvatarInfo; import emu.lunarcore.proto.RogueBuffInfoOuterClass.RogueBuffInfo; import emu.lunarcore.proto.RogueBuffSourceOuterClass.RogueBuffSource; import emu.lunarcore.proto.RogueCurrentInfoOuterClass.RogueCurrentInfo; +import emu.lunarcore.proto.RogueFinishInfoOuterClass.RogueFinishInfo; import emu.lunarcore.proto.RogueMapInfoOuterClass.RogueMapInfo; import emu.lunarcore.proto.RogueMiracleInfoOuterClass.RogueMiracleInfo; import emu.lunarcore.proto.RogueMiracleSourceOuterClass.RogueMiracleSource; +import emu.lunarcore.proto.RogueRecordAvatarOuterClass.RogueRecordAvatar; +import emu.lunarcore.proto.RogueRecordInfoOuterClass.RogueRecordInfo; import emu.lunarcore.proto.RogueRoomStatusOuterClass.RogueRoomStatus; import emu.lunarcore.proto.RogueStatusOuterClass.RogueStatus; import emu.lunarcore.server.packet.send.*; @@ -46,6 +52,7 @@ public class RogueInstance { private int aeonId; private int aeonBuffType; + private boolean isWin; @Deprecated // Morphia only! public RogueInstance() {} @@ -324,13 +331,48 @@ public class RogueInstance { } // Set flag for this so it gets serialized - proto.getMutableAchivedMiracleInfo(); + proto.getMutableRogueMiracleInfo(); for (var miracle : this.getMiracles().values()) { - proto.getMutableAchivedMiracleInfo().addRogueMiracleList(miracle.toProto()); + proto.getMutableRogueMiracleInfo().addRogueMiracleList(miracle.toProto()); } return proto; } + + public RogueFinishInfo toFinishInfoProto() { + // Rogue record info + var recordInfo = RogueRecordInfo.newInstance(); + + for (var buff : this.getBuffs().values()) { + recordInfo.addBuffList(buff.toProto()); + } + + for (var miracle : this.getMiracles().values()) { + recordInfo.addRogueMiracleList(miracle.getId()); + } + + PlayerLineup lineup = getPlayer().getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_ROGUE_VALUE); + if (lineup != null) { + for (int i = 0; i < lineup.getAvatars().size(); i++) { + var recordAvatar = RogueRecordAvatar.newInstance() + .setId(lineup.getAvatars().get(i)) + .setSlot(i) + .setAvatarType(AvatarType.AVATAR_FORMAL_TYPE); + + recordInfo.addAvatarList(recordAvatar); + } + } + + // Create rogue finish info + var proto = RogueFinishInfo.newInstance() + .setAreaId(this.getAreaId()) + .setIsWin(this.isWin()) + .setPassRoomCount(this.getCurrentSiteId()) + .setReachRoomCount(this.getCurrentRoomProgress()) + .setRecordInfo(recordInfo); + + return proto; + } } \ No newline at end of file diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java index c124b78..d096d0a 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java @@ -23,8 +23,9 @@ import emu.lunarcore.proto.RogueTalentInfoOuterClass.RogueTalentInfo; import emu.lunarcore.proto.RogueTalentOuterClass.RogueTalent; import emu.lunarcore.proto.RogueTalentStatusOuterClass.RogueTalentStatus; import emu.lunarcore.server.packet.CmdId; +import emu.lunarcore.server.packet.send.PacketLeaveRogueScRsp; import emu.lunarcore.server.packet.send.PacketStartRogueScRsp; - +import emu.lunarcore.server.packet.send.PacketSyncRogueFinishScNotify; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; import lombok.Getter; @@ -126,15 +127,34 @@ public class RogueManager extends BasePlayerManager { getPlayer().sendPacket(new PacketStartRogueScRsp(getPlayer())); } + public void leaveRogue() { + if (getPlayer().getRogueInstance() == null) { + getPlayer().getSession().send(CmdId.LeaveRogueScRsp); + return; + } + + // Clear rogue instance + getPlayer().setRogueInstance(null); + + // Leave scene + getPlayer().getLineupManager().setCurrentExtraLineup(0, false); + getPlayer().enterScene(GameConstants.ROGUE_ENTRANCE, 0, false); // Make sure we dont send an enter scene packet here + + // Send packet + getPlayer().sendPacket(new PacketLeaveRogueScRsp(this.getPlayer())); + } + public void quitRogue() { if (getPlayer().getRogueInstance() == null) { getPlayer().getSession().send(CmdId.QuitRogueScRsp); return; } - getPlayer().setRogueInstance(null); - getPlayer().enterScene(GameConstants.ROGUE_ENTRANCE, 0, true); // Test getPlayer().getSession().send(CmdId.QuitRogueScRsp); + getPlayer().getSession().send(new PacketSyncRogueFinishScNotify(getPlayer())); + + // This isnt correct behavior, but it does the job + this.leaveRogue(); } public RogueInfo toProto() { @@ -163,7 +183,7 @@ public class RogueManager extends BasePlayerManager { .setRogueSeasonInfo(season); var aeonInfo = RogueAeonInfo.newInstance() - .setUnlockedAeonNum(GameData.getRogueAeonExcelMap().size()); + .setUnlockAeonNum(GameData.getRogueAeonExcelMap().size()); for (var aeonExcel : GameData.getRogueAeonExcelMap().values()) { aeonInfo.addAeonIdList(aeonExcel.getAeonID()); @@ -174,7 +194,6 @@ public class RogueManager extends BasePlayerManager { .setRogueAeonInfo(aeonInfo) .setRogueData(data) .setRogueVirtualItemInfo(getPlayer().toRogueVirtualItemsProto()) - .setTalentPoints(getPlayer().getTalentPoints()) .setSeasonId(seasonId) .setBeginTime(beginTime) .setEndTime(endTime); diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerLeaveRogueCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerLeaveRogueCsReq.java index 3379b6c..faca8a4 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerLeaveRogueCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerLeaveRogueCsReq.java @@ -10,7 +10,7 @@ public class HandlerLeaveRogueCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { - session.send(CmdId.LeaveRogueScRsp); + session.getPlayer().getRogueManager().leaveRogue(); } } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketLeaveRogueScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketLeaveRogueScRsp.java new file mode 100644 index 0000000..cd63ced --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketLeaveRogueScRsp.java @@ -0,0 +1,20 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.game.player.Player; +import emu.lunarcore.proto.LeaveRogueScRspOuterClass.LeaveRogueScRsp; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketLeaveRogueScRsp extends BasePacket { + + public PacketLeaveRogueScRsp(Player player) { + super(CmdId.LeaveRogueScRsp); + + var data = LeaveRogueScRsp.newInstance() + .setLineup(player.getCurrentLineup().toProto()) + .setRogueInfo(player.getRogueManager().toProto()) + .setScene(player.getScene().toProto()); + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketRollRogueBuffScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketRollRogueBuffScRsp.java index 6f40d1e..2961f16 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketRollRogueBuffScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketRollRogueBuffScRsp.java @@ -13,7 +13,7 @@ public class PacketRollRogueBuffScRsp extends BasePacket { var data = RollRogueBuffScRsp.newInstance(); if (selectMenu != null) { - data.setRogueBuffSelectInfo(selectMenu.toProto()); + data.setBuffSelectInfo(selectMenu.toProto()); } else { data.setRetcode(1); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueFinishScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueFinishScNotify.java new file mode 100644 index 0000000..d4558dd --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueFinishScNotify.java @@ -0,0 +1,21 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.game.player.Player; +import emu.lunarcore.proto.SyncRogueFinishScNotifyOuterClass.SyncRogueFinishScNotify; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketSyncRogueFinishScNotify extends BasePacket { + + public PacketSyncRogueFinishScNotify(Player player) { + super(CmdId.SyncRogueFinishScNotify); + + var data = SyncRogueFinishScNotify.newInstance(); + + if (player.getRogueInstance() != null) { + data.setFinishInfo(player.getRogueInstance().toFinishInfoProto()); + } + + this.setData(data); + } +}